libgomp bootstrap failure on i486-linux with --enable-targets=all

[Matthias Klose]

current trunk, configured for --enable-targets=all i486-linux-gnu
fails to build in libgomp, calling -m64 -arch=i486.  The applied patch
only adds these flags when not building for -m64.

Are the i486 specific flags needed at all now that the default is to
tune for generic?

When running the testsuite with RUNTESTFLAGS="--target_board=unix\{,-m64\}"
the tests fail for the -m64 case. The patch below just disables the
-march flag (which may not be the best solution).

  Matthias

2006-12-12  Matthias Klose  <doko@debian.org>

	* configure.tgt (i[456]86-*-linux*): Only add ia32 specific
	flags if not building with -m64.


--- libgomp/configure.tgt.orig	2006-06-07 14:43:22.000000000 +0200
+++ libgomp/configure.tgt	2006-10-01 13:47:01.955690500 +0200
@@ -44,9 +44,14 @@
     # 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


--- libgomp/testsuite/lib/libgomp-dg.exp.orig	2006-04-10 23:23:11.000000000 +0200
+++ libgomp/testsuite/lib/libgomp-dg.exp	2006-10-01 13:47:01.955690500 +0200
@@ -130,9 +130,10 @@
     }
 
     # We use atomic operations in the testcases to validate results.
-    if [istarget i?86-*-*] {
-	lappend ALWAYS_CFLAGS "additional_flags=-march=i486"
-    }
+    # Debian: configured for i486, breaks testsuite with -m64.
+    #if [istarget i?86-*-*] {
+    #	lappend ALWAYS_CFLAGS "additional_flags=-march=i486"
+    #}
     if [istarget sparc*-*-*] {
 	lappend ALWAYS_CFLAGS "additional_flags=-mcpu=v9"
     }