Accepting request 960251 from home:dirkmueller:Factory

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune 

- drop armv5tel, merge arm and armv6hl
- use --with-cpu rather than specifying --with-arch/--with-tune

OBS-URL: https://build.opensuse.org/request/show/960251
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc12?expand=0&rev=22

cross-aarch64-gcc12-bootstrap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-aarch64-gcc12-bootstrap.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-aarch64-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-aarch64-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-amdgcn-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-amdgcn-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-arm-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-arm-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-arm-none-gcc12-bootstrap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-arm-none-gcc12-bootstrap.spec

@@ -586,14 +586,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -606,24 +598,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-arm-none-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-arm-none-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-avr-gcc12-bootstrap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-avr-gcc12-bootstrap.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-avr-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-avr-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-epiphany-gcc12-bootstrap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-epiphany-gcc12-bootstrap.spec

@@ -586,14 +586,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -606,24 +598,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-epiphany-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-epiphany-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-hppa-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-hppa-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-m68k-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-m68k-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-mips-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-mips-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-nvptx-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-nvptx-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-ppc64-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-ppc64-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-ppc64le-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-ppc64le-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-riscv64-elf-gcc12-bootstrap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-riscv64-elf-gcc12-bootstrap.spec

@@ -586,14 +586,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -606,24 +598,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-riscv64-elf-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-riscv64-elf-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-riscv64-gcc12-bootstrap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-riscv64-gcc12-bootstrap.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-riscv64-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-riscv64-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-rx-gcc12-bootstrap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-rx-gcc12-bootstrap.spec

@@ -586,14 +586,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -606,24 +598,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-rx-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-rx-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-s390x-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-s390x-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-sparc-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-sparc-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-sparc64-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-sparc64-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

cross-x86_64-gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

cross-x86_64-gcc12.spec

@@ -585,14 +585,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -605,24 +597,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

gcc.spec.in

@@ -1457,14 +1457,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -1477,24 +1469,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \ 
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

gcc12-testresults.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

gcc12-testresults.spec

@@ -777,14 +777,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -797,24 +789,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \

gcc12.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  7 22:43:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop armv5tel, merge arm and armv6hl
+- use --with-cpu rather than specifying --with-arch/--with-tune 
+
 -------------------------------------------------------------------
 Mon Mar  7 11:00:49 UTC 2022 - Martin Liška <mliska@suse.cz>
 

gcc12.spec

@@ -2266,14 +2266,6 @@ amdgcn-amdhsa,\
 	--with-native-system-header-dir=/include \
 %endif
 %endif
-%if "%{TARGET_ARCH}" == "arm"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfp \
-	--disable-sjlj-exceptions \
-%endif
 %if "%{TARGET_ARCH}" == "arm-none"
 	--enable-multilib \
 	--with-multilib-list=aprofile,rmprofile \
@@ -2286,24 +2278,15 @@ amdgcn-amdhsa,\
 	--disable-threads \
 	--disable-tls \
 %endif
-%if "%{TARGET_ARCH}" == "armv5tel"
+%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-arch=armv5te \
+	--with-cpu=arm1176jzf-s \
-	--with-float=soft \
-	--with-mode=arm \
-	--with-abi=aapcs-linux \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl"
-        --with-arch=armv6zk \
-        --with-tune=arm1176jzf-s \
         --with-float=hard \
         --with-abi=aapcs-linux \
-        --with-fpu=vfp \
+        --with-fpu=vfpv2 \
         --disable-sjlj-exceptions \
 %endif
 %if "%{TARGET_ARCH}" == "armv7hl"
-	--with-arch=armv7-a \
+	--with-cpu=generic-armv7-a \
-	--with-tune=generic-armv7-a \
 	--with-float=hard \
 	--with-abi=aapcs-linux \
 	--with-fpu=vfpv3-d16 \