diff mbox series

[v4,1/1] gcc: config: microblaze: fix cpu version check

Message ID 20231026203722.3596212-1-neal.frager@amd.com
State Superseded
Headers show
Series [v4,1/1] gcc: config: microblaze: fix cpu version check | expand

Commit Message

Frager, Neal Oct. 26, 2023, 8:37 p.m. UTC 
The MICROBLAZE_VERSION_COMPARE was incorrectly using strcasecmp
instead of strverscmp to check the mcpu version against feature
options.  By simply changing the define to use strverscmp,
the new version 10.0 is treated correctly as a higher version
than previous versions.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
 - No need to create a new microblaze specific version check
   routine as strverscmp is the correct solution.
V2->V3:
 - Changed mcpu define for microblaze isa testsuite examples.
V3->V4:
 - Added ChangeLog
---
 gcc/ChangeLog                                              | 4 ++++
 gcc/config/microblaze/microblaze.cc                        | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/bshift.c           | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/div.c              | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c            | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c            | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c            | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c            | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/fcvt.c             | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/float.c            | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c            | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c  | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c       | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/mul.c              | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/mulh.c             | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c           | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/nofloat.c          | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/pcmp.c             | 2 +-
 gcc/testsuite/gcc.target/microblaze/isa/vanilla.c          | 2 +-
 gcc/testsuite/gcc.target/microblaze/microblaze.exp         | 2 +-
 21 files changed, 24 insertions(+), 20 deletions(-)

Comments

Michael Eager Oct. 29, 2023, 11:05 p.m. UTC | #1 
On 10/26/23 13:37, Neal Frager wrote:
> The MICROBLAZE_VERSION_COMPARE was incorrectly using strcasecmp
> instead of strverscmp to check the mcpu version against feature
> options.  By simply changing the define to use strverscmp,
> the new version 10.0 is treated correctly as a higher version
> than previous versions.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> ---
> V1->V2:
>   - No need to create a new microblaze specific version check
>     routine as strverscmp is the correct solution.
> V2->V3:
>   - Changed mcpu define for microblaze isa testsuite examples.
> V3->V4:
>   - Added ChangeLog
> ---
>   gcc/ChangeLog                                              | 4 ++++
>   gcc/config/microblaze/microblaze.cc                        | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/bshift.c           | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/div.c              | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c            | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c            | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c            | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c            | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/fcvt.c             | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/float.c            | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c            | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c  | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c       | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/mul.c              | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/mulh.c             | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c           | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/nofloat.c          | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/pcmp.c             | 2 +-
>   gcc/testsuite/gcc.target/microblaze/isa/vanilla.c          | 2 +-
>   gcc/testsuite/gcc.target/microblaze/microblaze.exp         | 2 +-
>   21 files changed, 24 insertions(+), 20 deletions(-)
> 
> diff --git a/gcc/ChangeLog b/gcc/ChangeLog
> index d50cd42a7d4..d5fee35bda4 100644
> --- a/gcc/ChangeLog
> +++ b/gcc/ChangeLog
> @@ -1,3 +1,7 @@
> +2023-10-26  Neal Frager  <neal.frager@amd.com>
> +
> +	* config/microblaze/microblaze.cc: Fix mcpu version check.

gcc/testsuite/ChangeLog?


> +
>   2023-10-25  Iain Sandoe  <iain@sandoe.co.uk>
>   
>   	* config/darwin.cc (darwin_override_options): Handle fPIE.
> diff --git a/gcc/config/microblaze/microblaze.cc b/gcc/config/microblaze/microblaze.cc
> index c9f6c4198cf..60ad55120d2 100644
> --- a/gcc/config/microblaze/microblaze.cc
> +++ b/gcc/config/microblaze/microblaze.cc
> @@ -56,7 +56,7 @@
>   /* This file should be included last.  */
>   #include "target-def.h"
>   
> -#define MICROBLAZE_VERSION_COMPARE(VA,VB) strcasecmp (VA, VB)
> +#define MICROBLAZE_VERSION_COMPARE(VA,VB) strverscmp (VA, VB)
>   
>   /* Classifies an address.
>   
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/bshift.c b/gcc/testsuite/gcc.target/microblaze/isa/bshift.c
> index 64cf1e2e59e..664586bff9f 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/bshift.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/bshift.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift" } */
>   
>   volatile int m1, m2, m3;
>   volatile unsigned int u1, u2, u3;
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/div.c b/gcc/testsuite/gcc.target/microblaze/isa/div.c
> index 25ee42ce5c8..783e7c0f684 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/div.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/div.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-div" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-div" } */
>   
>   volatile int m1, m2, m3;
>   volatile long l1, l2;
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c
> index 4041a241391..b6202e168d6 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
>   
>   volatile float f1, f2, f3;
>   
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c
> index 3902b839db9..4386c6e6cc3 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
>   
>   volatile float f1, f2, f3;
>   
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c
> index 8555974dda5..b414e48fe1b 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
>   
>   volatile float f1, f2, f3;
>   
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c
> index 79cc5f9dd8e..ff137012df4 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
>   
>   void float_func(float f1, float f2, float f3)
>   {
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c b/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c
> index ee057c1b6ac..90fd45bd3b3 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float -mxl-float-convert" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float -mxl-float-convert" } */
>   
>   int float_func (float f)
>   {
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/float.c b/gcc/testsuite/gcc.target/microblaze/isa/float.c
> index f5ef3186cdd..212435d6435 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/float.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/float.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
>   
>   volatile float f1, f2, f3;
>   
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c b/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c
> index 4c2466e4a55..834767d7a40 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float -mxl-float-sqrt" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float -mxl-float-sqrt" } */
>   #include <math.h>
>   
>   float sqrt_func (float f)
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c
> index ce186314e6a..2720ad38f57 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare" } */
>   
>   volatile int m1, m2, m3;
>   volatile unsigned int u1, u2, u3;
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c
> index 76d174ec7c3..59a17c79bbe 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul" } */
>   
>   volatile int m1, m2, m3;
>   volatile unsigned int u1, u2, u3;
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul.c b/gcc/testsuite/gcc.target/microblaze/isa/mul.c
> index d2a6bec61e2..e4e330a0d0c 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/mul.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/mul.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-mul" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-mul" } */
>   
>   volatile int m1, m2, m3;
>   volatile long l1, l2;
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c
> index a15983af117..0f962030fdd 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare -mxl-multiply-high" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare -mxl-multiply-high" } */
>   
>   volatile int m1, m2, m3;
>   volatile unsigned int u1, u2, u3;
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mulh.c b/gcc/testsuite/gcc.target/microblaze/isa/mulh.c
> index 6e0cc3ac470..da28e8c4d1e 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/mulh.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/mulh.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-mul -mxl-multiply-high" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-mul -mxl-multiply-high" } */
>   
>   volatile int m1, m2, m3;
>   volatile unsigned int u1, u2, u3;
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c
> index ebfb170ecee..86910fc347a 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a " } */
> +/* { dg-options "-O3 -mcpu=v10.0" } */
>   
>   volatile float f1, f2, f3;
>   
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c b/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c
> index 647da3cfe24..b1f0268715d 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -msoft-float" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -msoft-float" } */
>   
>   volatile float f1, f2, f3;
>   
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c
> index aea79572103..d9e5793f6f5 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-pattern-compare" } */
> +/* { dg-options "-O3 -mcpu=v10.0 -mxl-pattern-compare" } */
>   
>   volatile int m1, m2, m3;
>   volatile long l1, l2;
> diff --git a/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c b/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c
> index 1d6ba807b12..35824b6d077 100644
> --- a/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c
> +++ b/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c
> @@ -1,4 +1,4 @@
> -/* { dg-options "-O3 -mcpu=v6.00.a -mcpu=v6.00.a" } */
> +/* { dg-options "-O3 -mcpu=v10.0" } */
>   
>   volatile int m1, m2, m3;
>   volatile long l1, l2;
> diff --git a/gcc/testsuite/gcc.target/microblaze/microblaze.exp b/gcc/testsuite/gcc.target/microblaze/microblaze.exp
> index 1c7b0e23353..33979ae5e42 100644
> --- a/gcc/testsuite/gcc.target/microblaze/microblaze.exp
> +++ b/gcc/testsuite/gcc.target/microblaze/microblaze.exp
> @@ -49,7 +49,7 @@ dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/isa/*.\[cSi\]]] \
>   ${default_c_flags} ""
>   
>   gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/others/*.\[cSi\]]] \
> -    "" "-mcpu=v6.00.a"
> +    "" "-mcpu=v10.0"
>   
>   
>   # All done.
diff mbox series

Patch

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d50cd42a7d4..d5fee35bda4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@ 
+2023-10-26  Neal Frager  <neal.frager@amd.com>
+
+	* config/microblaze/microblaze.cc: Fix mcpu version check.
+
 2023-10-25  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.cc (darwin_override_options): Handle fPIE.
diff --git a/gcc/config/microblaze/microblaze.cc b/gcc/config/microblaze/microblaze.cc
index c9f6c4198cf..60ad55120d2 100644
--- a/gcc/config/microblaze/microblaze.cc
+++ b/gcc/config/microblaze/microblaze.cc
@@ -56,7 +56,7 @@ 
 /* This file should be included last.  */
 #include "target-def.h"
 
-#define MICROBLAZE_VERSION_COMPARE(VA,VB) strcasecmp (VA, VB)
+#define MICROBLAZE_VERSION_COMPARE(VA,VB) strverscmp (VA, VB)
 
 /* Classifies an address.
 
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/bshift.c b/gcc/testsuite/gcc.target/microblaze/isa/bshift.c
index 64cf1e2e59e..664586bff9f 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/bshift.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/bshift.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift" } */
 
 volatile int m1, m2, m3;
 volatile unsigned int u1, u2, u3;
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/div.c b/gcc/testsuite/gcc.target/microblaze/isa/div.c
index 25ee42ce5c8..783e7c0f684 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/div.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/div.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-div" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-div" } */
 
 volatile int m1, m2, m3;
 volatile long l1, l2;
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c
index 4041a241391..b6202e168d6 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
 
 volatile float f1, f2, f3;
 
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c
index 3902b839db9..4386c6e6cc3 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
 
 volatile float f1, f2, f3;
 
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c
index 8555974dda5..b414e48fe1b 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
 
 volatile float f1, f2, f3;
 
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c
index 79cc5f9dd8e..ff137012df4 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
 
 void float_func(float f1, float f2, float f3)
 {
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c b/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c
index ee057c1b6ac..90fd45bd3b3 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float -mxl-float-convert" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mhard-float -mxl-float-convert" } */
 
 int float_func (float f) 
 {
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/float.c b/gcc/testsuite/gcc.target/microblaze/isa/float.c
index f5ef3186cdd..212435d6435 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/float.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/float.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */
 
 volatile float f1, f2, f3;
 
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c b/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c
index 4c2466e4a55..834767d7a40 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float -mxl-float-sqrt" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mhard-float -mxl-float-sqrt" } */
 #include <math.h>
 
 float sqrt_func (float f) 
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c
index ce186314e6a..2720ad38f57 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare" } */
 
 volatile int m1, m2, m3;
 volatile unsigned int u1, u2, u3;
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c
index 76d174ec7c3..59a17c79bbe 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul" } */
 
 volatile int m1, m2, m3;
 volatile unsigned int u1, u2, u3;
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul.c b/gcc/testsuite/gcc.target/microblaze/isa/mul.c
index d2a6bec61e2..e4e330a0d0c 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/mul.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/mul.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-mul" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-mul" } */
 
 volatile int m1, m2, m3;
 volatile long l1, l2;
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c
index a15983af117..0f962030fdd 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare -mxl-multiply-high" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare -mxl-multiply-high" } */
 
 volatile int m1, m2, m3;
 volatile unsigned int u1, u2, u3;
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mulh.c b/gcc/testsuite/gcc.target/microblaze/isa/mulh.c
index 6e0cc3ac470..da28e8c4d1e 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/mulh.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/mulh.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-mul -mxl-multiply-high" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-mul -mxl-multiply-high" } */
 
 volatile int m1, m2, m3;
 volatile unsigned int u1, u2, u3;
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c
index ebfb170ecee..86910fc347a 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a " } */
+/* { dg-options "-O3 -mcpu=v10.0" } */
 
 volatile float f1, f2, f3;
 
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c b/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c
index 647da3cfe24..b1f0268715d 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -msoft-float" } */
+/* { dg-options "-O3 -mcpu=v10.0 -msoft-float" } */
 
 volatile float f1, f2, f3;
 
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c
index aea79572103..d9e5793f6f5 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mxl-pattern-compare" } */
+/* { dg-options "-O3 -mcpu=v10.0 -mxl-pattern-compare" } */
 
 volatile int m1, m2, m3;
 volatile long l1, l2;
diff --git a/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c b/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c
index 1d6ba807b12..35824b6d077 100644
--- a/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c
+++ b/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c
@@ -1,4 +1,4 @@ 
-/* { dg-options "-O3 -mcpu=v6.00.a -mcpu=v6.00.a" } */
+/* { dg-options "-O3 -mcpu=v10.0" } */
 
 volatile int m1, m2, m3;
 volatile long l1, l2;
diff --git a/gcc/testsuite/gcc.target/microblaze/microblaze.exp b/gcc/testsuite/gcc.target/microblaze/microblaze.exp
index 1c7b0e23353..33979ae5e42 100644
--- a/gcc/testsuite/gcc.target/microblaze/microblaze.exp
+++ b/gcc/testsuite/gcc.target/microblaze/microblaze.exp
@@ -49,7 +49,7 @@  dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/isa/*.\[cSi\]]] \
 ${default_c_flags} ""
 
 gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/others/*.\[cSi\]]] \
-    "" "-mcpu=v6.00.a"
+    "" "-mcpu=v10.0"
 
 
 # All done.