- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc11?expand=0&rev=338

cross-aarch64-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-aarch64-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-amdgcn-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-amdgcn-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-arm-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-arm-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-arm-none-gcc11-bootstrap.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-arm-none-gcc11-bootstrap.spec

@@ -140,6 +140,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -313,6 +314,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-arm-none-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-arm-none-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-avr-gcc11-bootstrap.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-avr-gcc11-bootstrap.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-avr-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-avr-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-epiphany-gcc11-bootstrap.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-epiphany-gcc11-bootstrap.spec

@@ -140,6 +140,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -313,6 +314,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-epiphany-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-epiphany-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-hppa-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-hppa-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-i386-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-i386-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-m68k-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-m68k-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-mips-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-mips-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-nvptx-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-nvptx-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-ppc64-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-ppc64-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-ppc64le-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-ppc64le-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-riscv64-elf-gcc11-bootstrap.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-riscv64-elf-gcc11-bootstrap.spec

@@ -140,6 +140,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -313,6 +314,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-riscv64-elf-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-riscv64-elf-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-riscv64-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-riscv64-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-rx-gcc11-bootstrap.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-rx-gcc11-bootstrap.spec

@@ -140,6 +140,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -313,6 +314,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-rx-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-rx-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-s390x-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-s390x-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-sparc-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-sparc-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-sparc64-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-sparc64-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

cross-x86_64-gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

cross-x86_64-gcc11.spec

@@ -139,6 +139,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -312,6 +313,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

gcc.spec.in

@@ -186,6 +186,16 @@
 %define selfconflict() otherproviders(%1)
 %endif
 
+# SRC-COMMON-BEGIN
+%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
+
+URL:          https://gcc.gnu.org/
+Version: 11.0.1+git10
+Release:      1
+%define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
+%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
+%define binsuffix -@base_ver@
+# SRC-COMMON-END
 
 Name:         gcc@base_ver@
 BuildRequires: xz
@@ -250,11 +260,11 @@ BuildRequires: dejagnu
 BuildRequires: expect
 BuildRequires: gdb
 %if %{build_nvptx}
-BuildRequires: cross-nvptx-gcc@base_ver@ = %{version}
+BuildRequires: cross-nvptx-gcc@base_ver@
 BuildRequires: cross-nvptx-newlib@base_ver@-devel
 %endif
 %if %{build_gcn}
-BuildRequires: cross-amdgcn-gcc@base_ver@ = %{version}
+BuildRequires: cross-amdgcn-gcc@base_ver@
 BuildRequires: cross-amdgcn-newlib@base_ver@-devel
 %endif
 %endif
@@ -289,17 +299,6 @@ BuildRequires: cross-amdgcn-newlib@base_ver@-devel
 %define build_primary_64bit 0
 %endif
 
-# SRC-COMMON-BEGIN
-%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
-
-URL:          https://gcc.gnu.org/
-Version: 11.0.1+git10
-Release:      1
-%define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
-%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
-%define binsuffix -@base_ver@
-# SRC-COMMON-END
-
 %if !0%{?building_testsuite:1}
 Requires: binutils glibc-devel
 Requires: cpp@base_ver@ = %{version}-%{release}
@@ -358,6 +357,7 @@ Patch17:	gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:	gcc10-amdgcn-llvm-as.patch
 Patch19:	gcc11-testsuite-fixes.patch
 Patch20:	gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:	gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:	gcc41-ppc32-retaddr.patch
 Patch52:	gcc10-foffload-default.patch
@@ -1162,6 +1162,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

gcc11-no-offload.patch

@@ -0,0 +1,126 @@
+libgomp/testsuite: Fix checks for dg-excess-errors
+
+For the tests modified below, the effective target line has to be effective
+when compiling for an offload target, except that variable-not-offloaded.c
+would compile with unified-share memory and pr86416-*.c if long double/float128
+is supported.
+The previous check used a run-time device ability check. This new variant
+now enables those dg- lines when _compiling_ for nvptx or gcn.
+
+libgomp/ChangeLog:
+
+	* testsuite/lib/libgomp.exp (offload_target_to_openacc_device_type):
+	New, based on check_effective_target_offload_target_nvptx.
+	(check_effective_target_offload_target_nvptx): Call it.
+	(check_effective_target_offload_target_amdgcn): New.
+	* testsuite/libgomp.c-c++-common/function-not-offloaded.c:
+	Require target offload_target_nvptx || offload_target_amdgcn.
+	* testsuite/libgomp.c-c++-common/variable-not-offloaded.c: Likewise.
+	* testsuite/libgomp.c/pr86416-1.c: Likewise.
+	* testsuite/libgomp.c/pr86416-2.c: Likewise.
+
+ libgomp/testsuite/lib/libgomp.exp                    | 20 ++++++++++++++++----
+ .../libgomp.c-c++-common/function-not-offloaded.c    |  2 +-
+ .../libgomp.c-c++-common/variable-not-offloaded.c    |  4 ++--
+ libgomp/testsuite/libgomp.c/pr86416-1.c              |  4 ++--
+ libgomp/testsuite/libgomp.c/pr86416-2.c              |  4 ++--
+ 5 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
+index 14dcfdfd00a..467cb3cf255 100644
+--- a/libgomp/testsuite/lib/libgomp.exp
++++ b/libgomp/testsuite/lib/libgomp.exp
+@@ -340,8 +340,10 @@ proc offload_target_to_openacc_device_type { offload_target } {
+     }
+ }
+ 
+-# Return 1 if compiling for offload target nvptx.
+-proc check_effective_target_offload_target_nvptx { } {
++# Return 1 if compiling for the specified offload target
++# Takes -foffload=... into account by checking OFFLOAD_TARGET_NAMES=
++# in the -v compiler output.
++proc libgomp_check_effective_target_offload_target { target_name } {
+     # Consider all actual options, including the flags passed to
+     # 'gcc-dg-runtest', or 'gfortran-dg-runtest' (see the 'libgomp.*/*.exp'
+     # files; in particular, '-foffload', 'libgomp.oacc-*/*.exp'), which don't
+@@ -354,13 +356,23 @@ proc check_effective_target_offload_target_nvptx { } {
+     set gcc_output [libgomp_target_compile "" "" "none" $options]
+     if [regexp "(?n)^OFFLOAD_TARGET_NAMES=(.*)" $gcc_output dummy offload_targets] {
+ 	verbose "compiling for offload targets: $offload_targets"
+-	return [string match "*:nvptx*:*" ":$offload_targets:"]
++	return [string match "*:$target_name*:*" ":$offload_targets:"]
+     }
+ 
+-    verbose "not compiling for any offload targets"
++    verbose "not compiling for $target_name offload target"
+     return 0
+ }
+ 
++# Return 1 if compiling for offload target nvptx.
++proc check_effective_target_offload_target_nvptx { } {
++    return [libgomp_check_effective_target_offload_target "nvptx"]
++}
++
++# Return 1 if compiling for offload target amdgcn
++proc check_effective_target_offload_target_amdgcn { } {
++    return [libgomp_check_effective_target_offload_target "amdgcn"]
++}
++
+ # Return 1 if offload device is available.
+ proc check_effective_target_offload_device { } {
+     return [check_runtime_nocache offload_device_available_ {
+diff --git a/libgomp/testsuite/libgomp.c-c++-common/function-not-offloaded.c b/libgomp/testsuite/libgomp.c-c++-common/function-not-offloaded.c
+index 9e59ef8864e..bc1ae68941a 100644
+--- a/libgomp/testsuite/libgomp.c-c++-common/function-not-offloaded.c
++++ b/libgomp/testsuite/libgomp.c-c++-common/function-not-offloaded.c
+@@ -1,5 +1,5 @@
+ /* { dg-do link } */
+-/* { dg-excess-errors "unresolved symbol foo, lto1, mkoffload and lto-wrapper fatal errors" { target offload_device_nonshared_as } } */
++/* { dg-excess-errors "unresolved symbol foo, lto1, mkoffload and lto-wrapper fatal errors" { target { offload_target_nvptx || offload_target_amdgcn } } } */
+ /* { dg-additional-sources "function-not-offloaded-aux.c" } */
+ 
+ #pragma omp declare target
+diff --git a/libgomp/testsuite/libgomp.c-c++-common/variable-not-offloaded.c b/libgomp/testsuite/libgomp.c-c++-common/variable-not-offloaded.c
+index bc4b916e9a4..fe2a8b26242 100644
+--- a/libgomp/testsuite/libgomp.c-c++-common/variable-not-offloaded.c
++++ b/libgomp/testsuite/libgomp.c-c++-common/variable-not-offloaded.c
+@@ -1,7 +1,7 @@
+ /* { dg-do link } */
+-/* { dg-excess-errors "lto1, mkoffload and lto-wrapper fatal errors" { target offload_device_nonshared_as } } */
++/* { dg-excess-errors "lto1, mkoffload and lto-wrapper fatal errors" { target { offload_target_nvptx || offload_target_amdgcn } } } */
+ 
+-int var; /* { dg-error "variable 'var' has been referenced in offloaded code but hasn't been marked to be included in the offloaded code" "" { target offload_device_nonshared_as } } */
++int var; /* { dg-error "variable 'var' has been referenced in offloaded code but hasn't been marked to be included in the offloaded code" "" { target { offload_target_nvptx || offload_target_amdgcn } } } */
+ 
+ #pragma omp declare target
+ void  __attribute__((noinline, noclone))
+diff --git a/libgomp/testsuite/libgomp.c/pr86416-1.c b/libgomp/testsuite/libgomp.c/pr86416-1.c
+index ad9370f78f3..6d3869264fd 100644
+--- a/libgomp/testsuite/libgomp.c/pr86416-1.c
++++ b/libgomp/testsuite/libgomp.c/pr86416-1.c
+@@ -2,8 +2,8 @@
+ /* { dg-require-effective-target large_long_double } */
+ 
+ /* PR middle-end/86416  */
+-/* { dg-error "bit-precision floating-point numbers unsupported .mode '.F'." "" { target offload_device } 0 }  */
+-/* { dg-excess-errors "Follow-up errors from mkoffload and lto-wrapper" { target offload_device } }  */
++/* { dg-error "bit-precision floating-point numbers unsupported .mode '.F'." "" { target { offload_target_nvptx || offload_target_amdgcn } } 0 }  */
++/* { dg-excess-errors "Follow-up errors from mkoffload and lto-wrapper" { target { offload_target_nvptx || offload_target_amdgcn } } }  */
+ 
+ #include <stdlib.h>  /* For abort. */
+ 
+diff --git a/libgomp/testsuite/libgomp.c/pr86416-2.c b/libgomp/testsuite/libgomp.c/pr86416-2.c
+index ec45e400f95..cffeb3f7107 100644
+--- a/libgomp/testsuite/libgomp.c/pr86416-2.c
++++ b/libgomp/testsuite/libgomp.c/pr86416-2.c
+@@ -2,8 +2,8 @@
+ /* { dg-add-options __float128 } */
+ 
+ /* PR middle-end/86416  */
+-/* { dg-error "bit-precision floating-point numbers unsupported .mode '.F'." "" { target offload_device } 0 }  */
+-/* { dg-excess-errors "Follow-up errors from mkoffload and lto-wrapper" { target offload_device } }  */
++/* { dg-error "bit-precision floating-point numbers unsupported .mode '.F'." "" { target { offload_target_nvptx || offload_target_amdgcn } } 0 }  */
++/* { dg-excess-errors "Follow-up errors from mkoffload and lto-wrapper" { target { offload_target_nvptx || offload_target_amdgcn } } }  */
+ 
+ #include <stdlib.h>  /* For abort. */
+ 

gcc11-testresults.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

gcc11-testresults.spec

@@ -203,6 +203,15 @@
 %define selfconflict() otherproviders(%1)
 %endif
 
+%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
+
+URL:            https://gcc.gnu.org/
+Version:        11.0.1+git10
+Release:        0
+%define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
+%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
+%define binsuffix -11
+
 Name:           gcc11-testresults
 BuildRequires:  xz
 %if %{suse_version} > 1500
@@ -266,11 +275,11 @@ BuildRequires:  dejagnu
 BuildRequires:  expect
 BuildRequires:  gdb
 %if %{build_nvptx}
-BuildRequires:  cross-nvptx-gcc11 = %{version}
+BuildRequires:  cross-nvptx-gcc11
 BuildRequires:  cross-nvptx-newlib11-devel
 %endif
 %if %{build_gcn}
-BuildRequires:  cross-amdgcn-gcc11 = %{version}
+BuildRequires:  cross-amdgcn-gcc11
 BuildRequires:  cross-amdgcn-newlib11-devel
 %endif
 %endif
@@ -305,15 +314,6 @@ BuildRequires:  cross-amdgcn-newlib11-devel
 %define build_primary_64bit 0
 %endif
 
-%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
-
-URL:            https://gcc.gnu.org/
-Version:        11.0.1+git10
-Release:        0
-%define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
-%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
-%define binsuffix -11
-
 %if !0%{?building_testsuite:1}
 Requires:       binutils
 Requires:       cpp11 = %{version}-%{release}
@@ -371,6 +371,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -501,6 +502,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1

gcc11.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 
-- Add gcc11-testsuite-fixes.patch and
+- Add gcc11-testsuite-fixes.patch, gcc11-no-offload.patch and
   gcc11-amdgcn-disable-hot-cold-partitioning.patch.
 - Enable gfortran for offload compilers.
 

gcc11.spec

@@ -185,6 +185,15 @@
 %define selfconflict() otherproviders(%1)
 %endif
 
+%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
+
+URL:            https://gcc.gnu.org/
+Version:        11.0.1+git10
+Release:        0
+%define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
+%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
+%define binsuffix -11
+
 Name:           gcc11
 BuildRequires:  xz
 %if %{suse_version} > 1500
@@ -248,11 +257,11 @@ BuildRequires:  dejagnu
 BuildRequires:  expect
 BuildRequires:  gdb
 %if %{build_nvptx}
-BuildRequires:  cross-nvptx-gcc11 = %{version}
+BuildRequires:  cross-nvptx-gcc11
 BuildRequires:  cross-nvptx-newlib11-devel
 %endif
 %if %{build_gcn}
-BuildRequires:  cross-amdgcn-gcc11 = %{version}
+BuildRequires:  cross-amdgcn-gcc11
 BuildRequires:  cross-amdgcn-newlib11-devel
 %endif
 %endif
@@ -287,15 +296,6 @@ BuildRequires:  cross-amdgcn-newlib11-devel
 %define build_primary_64bit 0
 %endif
 
-%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
-
-URL:            https://gcc.gnu.org/
-Version:        11.0.1+git10
-Release:        0
-%define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
-%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
-%define binsuffix -11
-
 %if !0%{?building_testsuite:1}
 Requires:       binutils
 Requires:       cpp11 = %{version}-%{release}
@@ -353,6 +353,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-testsuite-fixes.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc11-no-offload.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -1920,6 +1921,7 @@ ln -s newlib-4.1.0/newlib .
 %endif
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch51
 %patch52 -p1
 %patch60 -p1