From 26ac30e1481e2f80097a2dcfcb345fa618889522 Mon Sep 17 00:00:00 2001
From: dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 12 Aug 2007 02:46:54 +0000
Subject: [PATCH] 2007-08-11  David Edelsohn  <edelsohn@gnu.org>            
 Segher Boessenkool  <segher@kernel.crashing.org>

        * config/rs6000/rs6000.h (CC1_CPU_SPEC): Define as empty string if
        HAVE_LOCAL_CPU_DETECT not defined.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127370 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog              | 6 ++++++
 gcc/config/rs6000/rs6000.h | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 834db67..db73703 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-11  David Edelsohn  <edelsohn@gnu.org>
+	    Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* config/rs6000/rs6000.h (CC1_CPU_SPEC): Define as empty string if
+	HAVE_LOCAL_CPU_DETECT not defined.
+
 2007-08-11  Jan Hubicka  <jh@suse.cz>
 
 	* cgraphunit.c (record_cdtor_fn): Declare all cdtors always inlined.
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 5f34c80..4ba955f 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -149,10 +149,14 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
 #define HAVE_LOCAL_CPU_DETECT
 #endif
 
-#if !defined (CC1_CPU_SPEC) && defined (HAVE_LOCAL_CPU_DETECT)
+#ifndef CC1_CPU_SPEC
+#ifdef HAVE_LOCAL_CPU_DETECT
 #define CC1_CPU_SPEC \
 "%{mcpu=native:%<mcpu=native %:local_cpu_detect(cpu)} \
  %{mtune=native:%<mtune=native %:local_cpu_detect(tune)}"
+#else
+#define CC1_CPU_SPEC ""
+#endif
 #endif
 
 /* Architecture type.  */
-- 
2.7.4