From 63281f61cb84757926b834904054e39a6df5541b Mon Sep 17 00:00:00 2001
From: Dominik Vogt <vogt@linux.vnet.ibm.com>
Date: Fri, 24 Jul 2015 11:19:59 +0000
Subject: [PATCH] S390 -march=native related fixes

gcc/ChangeLog:

	* config/s390/s390.h: S390: Do not define EXTRA_SPEC_FUNCTIONS when
	cross compiling.

From-SVN: r226144
---
 gcc/ChangeLog          | 5 +++++
 gcc/config/s390/s390.h | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f8ec696e7b..3de4f6bd894 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-24  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	* config/s390/s390.h: S390: Do not define EXTRA_SPEC_FUNCTIONS
+	when cross compiling.
+
 2015-07-24  Richard Biener  <rguenther@suse.de>
 
 	* fold-const.c (maybe_canonicalize_comparison_1): Move
diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index 85a0d1af65a..f18b97323b3 100644
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -126,6 +126,7 @@ enum processor_flags
   { "arch", "%{!march=*:-march=%(VALUE)}" },			\
   { "tune", "%{!mtune=*:-mtune=%(VALUE)}" }
 
+#ifdef __s390__
 extern const char *s390_host_detect_local_cpu (int argc, const char **argv);
 # define EXTRA_SPEC_FUNCTIONS \
   { "local_cpu_detect", s390_host_detect_local_cpu },
@@ -133,6 +134,9 @@ extern const char *s390_host_detect_local_cpu (int argc, const char **argv);
 # define MARCH_MTUNE_NATIVE_SPECS				\
   " %{march=native:%<march=native %:local_cpu_detect(arch)}"	\
   " %{mtune=native:%<mtune=native %:local_cpu_detect(tune)}"
+#else
+# define MARCH_MTUNE_NATIVE_SPECS ""
+#endif
 
 /* Defaulting rules.  */
 #ifdef DEFAULT_TARGET_64BIT
-- 
2.30.2