summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klose <doko@debian.org>2007-04-16 20:09:40 +0000
committerMatthias Klose <doko@gcc.gnu.org>2007-04-16 20:09:40 +0000
commitb3b08ba044f1e1c1f69047a7a7c023181aaf71c1 (patch)
tree6aa632189c826787ca91e8b9e62b562488d45aa5
parent52d412e76f503ec4f2911a2582a53e524a70dbf6 (diff)
downloadgcc-b3b08ba044f1e1c1f69047a7a7c023181aaf71c1.tar.gz
configure.tgt (i[456]86-*-linux*): Only add ia32 specific flags if not building with -m64.
2007-04-16 Matthias Klose <doko@debian.org> * configure.tgt (i[456]86-*-linux*): Only add ia32 specific flags if not building with -m64. * testsuite/lib/libgomp-dg.exp (libgomp_init): Don't add -march flag for i?86-*-* targets, if current target matches -m64. From-SVN: r123887
-rw-r--r--libgomp/ChangeLog7
-rw-r--r--libgomp/configure.tgt11
2 files changed, 15 insertions, 3 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 32976762b7e..8ad5361bfc3 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-16 Matthias Klose <doko@debian.org>
+
+ * configure.tgt (i[456]86-*-linux*): Only add ia32 specific
+ flags if not building with -m64.
+ * testsuite/lib/libgomp-dg.exp (libgomp_init): Don't add -march
+ flag for i?86-*-* targets, if current target matches -m64.
+
2007-04-14 Steve Ellcey <sje@cup.hp.com>
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS.
diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
index 89bae02e80a..4790d66d8c6 100644
--- a/libgomp/configure.tgt
+++ b/libgomp/configure.tgt
@@ -49,9 +49,14 @@ if test $enable_linux_futex = yes; then
# Note that bare i386 is not included here. We need cmpxchg.
i[456]86-*-linux*)
config_path="linux/x86 linux posix"
- if test -z "$with_arch"; then
- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
- fi
+ case " ${CC} ${CFLAGS} " in
+ *" -m64 "*)
+ ;;
+ *)
+ if test -z "$with_arch"; then
+ XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
+ fi
+ esac
;;
# Similar jiggery-pokery for x86_64 multilibs, except here we