From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 20 Apr 2016 14:41:55 +0000 (+0000)
Subject: Don't build 32-bit libatomic with -march=i486 on x86-64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04b7dfa734e345725755fbd4bfb2079fd40dcc9b;p=thirdparty%2Fgcc.git

Don't build 32-bit libatomic with -march=i486 on x86-64

Gcc uses the same -march= for both -m32 and -m64 on x86-64 unless
--with-arch-32= is used.  There is no need for -march=i486 to compile
32-bit libatomic on x86-64.

	PR target/70454
	* configure.tgt (XCFLAGS): Don't add -march=i486 to compile
	32-bit x86 target library on x86-64.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235287 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index f476a6fa8b43..70a7f7ceca1f 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/70454
+	* configure.tgt (XCFLAGS): Don't add -march=i486 to compile
+	32-bit x86 target library on x86-64.
+
 2016-01-06  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
 	PR other/67627
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index c5470d7ef8c3..49233a4f45ae 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -81,14 +81,8 @@ case "${target_cpu}" in
 	try_ifunc=yes
 	;;
   x86_64)
-	case " ${CC} ${CFLAGS} " in
-	  *" -m32 "*)
-	    XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
-	    XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
-	    ;;
-	  *)
-	    ;;
-	esac
+	# x86_64 compiler passes -march=x86_64 by default when building
+	# 32bit target libraries.
 	ARCH=x86
 	# ??? Detect when -mcx16 is already enabled.
 	try_ifunc=yes