From: Edmar Wienskoski <edmar@freescale.com>
Date: Wed, 11 Jun 2008 20:02:55 +0000 (+0000)
Subject: re PR target/36425 (Option -mno-isel not working)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=567f0b17912a7d55ec333eb93b74f82e7a4f8761;p=gcc.git

re PR target/36425 (Option -mno-isel not working)

2008-06-11  Edmar Wienskoski  <edmar@freescale.com>

	PR target/36425
	* config/rs6000/rs6000.c (rs6000_override_options): Set
	rs6000_isel conditionally to the absence of comand line
	override.
	* config/rs6000/linuxspe.h (SUBSUBTARGET_OVERRIDE_OPTIONS):
	Remove duplicate rs6000_isel setting.
	* config/rs6000/eabispe.h: Ditto.

testsuite:
2008-06-11  Edmar Wienskoski  <edmar@freescale.com>

	* gcc.target/powerpc/e500-1.c: New test case to verify
	mno-isel option.

From-SVN: r136681
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 95a86b0d398..d66d335dad9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-11  Edmar Wienskoski  <edmar@freescale.com>
+
+	PR target/36425
+	* config/rs6000/rs6000.c (rs6000_override_options): Set
+	rs6000_isel conditionally to the absence of comand line
+	override.
+	* config/rs6000/linuxspe.h (SUBSUBTARGET_OVERRIDE_OPTIONS):
+	Remove duplicate rs6000_isel setting.
+	* config/rs6000/eabispe.h: Ditto.
+
 2008-06-11  Richard Guenther  <rguenther@suse.de>
 
 	* alias.c (get_alias_set): Use the element alias-set for arrays.
diff --git a/gcc/config/rs6000/eabispe.h b/gcc/config/rs6000/eabispe.h
index c3a3f2b4e53..ae14651deba 100644
--- a/gcc/config/rs6000/eabispe.h
+++ b/gcc/config/rs6000/eabispe.h
@@ -37,8 +37,6 @@
     rs6000_float_gprs = 1; \
   if (!rs6000_explicit_options.spe) \
     rs6000_spe = 1; \
-  if (!rs6000_explicit_options.isel) \
-    rs6000_isel = 1; \
   if (target_flags & MASK_64BIT) \
     error ("-m64 not supported in this configuration")
 
diff --git a/gcc/config/rs6000/linuxspe.h b/gcc/config/rs6000/linuxspe.h
index c526cf8dce4..bcc403e2a3c 100644
--- a/gcc/config/rs6000/linuxspe.h
+++ b/gcc/config/rs6000/linuxspe.h
@@ -36,8 +36,6 @@
     rs6000_float_gprs = 1; \
   if (!rs6000_explicit_options.spe) \
     rs6000_spe = 1; \
-  if (!rs6000_explicit_options.isel) \
-    rs6000_isel = 1; \
   if (target_flags & MASK_64BIT) \
     error ("-m64 not supported in this configuration")
 
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index dcbccbca38e..66e4b51773d 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1553,7 +1553,7 @@ rs6000_override_options (const char *default_cpu)
 	}
     }
 
-  if (TARGET_E500)
+  if (TARGET_E500 && !rs6000_explicit_options.isel)
     rs6000_isel = 1;
 
   if (rs6000_cpu == PROCESSOR_PPCE300C2 || rs6000_cpu == PROCESSOR_PPCE300C3)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 08bd74ca624..dfbe10d872c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-11  Edmar Wienskoski  <edmar@freescale.com>
+
+	PR target/36425
+	* gcc.target/powerpc/e500-1.c: New test case to verify
+	mno-isel option.
+
 2008-06-11  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/specs/varsize_copy.ad[sb]: New test.
diff --git a/gcc/testsuite/gcc.target/powerpc/e500-1.c b/gcc/testsuite/gcc.target/powerpc/e500-1.c
new file mode 100644
index 00000000000..76a0e4a2205
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/e500-1.c
@@ -0,0 +1,14 @@
+/* Test functioning of command option -mno-isel */
+/* { dg-do compile { target powerpc*-*-linux* } } */
+/* { dg-options "-O2 -mno-isel" } */
+
+/* { dg-final { scan-assembler-not "isel" } } */
+
+int
+foo (int x, int y)
+{
+  if (x < y)
+    return x;
+  else
+    return y;
+}