diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-16 20:09:40 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-16 20:09:40 +0000 |
| commit | d9f51b565e547f5b34951e5ca5699333a6c0bebe (patch) | |
| tree | 6aa632189c826787ca91e8b9e62b562488d45aa5 /libgomp | |
| parent | c085e9f9d037b15a3635887446267ee74a87fd0f (diff) | |
| download | gcc-d9f51b565e547f5b34951e5ca5699333a6c0bebe.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123887 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 7 | ||||
| -rw-r--r-- | libgomp/configure.tgt | 11 |
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 |