Support x86_64-*-linux-gnux32

gas/

	* configure.tgt: Support x86_64-*-linux-gnux32.

ld/

	* configure.tgt: Support x86_64-*-linux-gnux32.

ld/testsuite/

	* ld-elf/eh1.d: Skip x86_64-*-linux-gnux32.
	* ld-elf/eh2.d: Likewise.
	* ld-elf/eh3.d: Likewise.
	* ld-elf/eh4.d: Likewise.

	* ld-elfvsb/elfvsb.exp: Xfail x86_64-*-linux-gnux32.
	* ld-shared/shared.exp: Likewise.

	* ld-ifunc/ifunc-3a-x86.d: Support x86_64-*-linux-gnux32.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8ea8296a72d08c7e94070471c106081c13b683dc..d33b4340a0593246beb83aac578b98b419845cab 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-04  H.J. Lu  <[email protected]>
+
+       * configure.tgt: Support x86_64-*-linux-gnux32.
+
 2012-05-04  H.J. Lu  <[email protected]>
 
        * config/tc-i386.c (match_template): Add `instruction' to

diff --git a/gas/configure.tgt b/gas/configure.tgt
index 99de3d74c40adf37c09ad55be5f2a5322cec1745..e07bc553e18336c308cb406317194844b5b92136 100644 (file)
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -205,7 +205,10 @@ case ${generic_target} in
   i386-*-linux*aout*)                  fmt=aout em=linux ;;
   i386-*-linux*oldld)                  fmt=aout em=linux ;;
   i386-*-linux*coff*)                  fmt=coff em=linux ;;
-  i386-*-linux-*)                      fmt=elf em=linux ;;
+  i386-*-linux-*)                      fmt=elf em=linux
+    case ${cpu}-${os} in
+      x86_64*-linux-gnux32)            arch=x86_64:32 ;;
+    esac ;;
   i386-*-lynxos*)                      fmt=elf em=lynx ;;
   i386-*-sysv[45]*)                    fmt=elf ;;
   i386-*-solaris*)                     fmt=elf em=solaris ;;

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ca5ae3408a72872c127d2b03947dcd96194283ab..c80b07f416ea62272024bbaf3bef600f669a37c9 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-04  H.J. Lu  <[email protected]>
+
+       * configure.tgt: Support x86_64-*-linux-gnux32.
+
 2012-05-03  Sean Keys  <[email protected]>
 
        * Makefile.am (ALL_EMULATIONS): Added new emulation for XGATE

diff --git a/ld/configure.tgt b/ld/configure.tgt
index d7ad3baaac73f7f8b5145c361bdd0161ba12be1b..4171d8c9923f8efbc5a70af1c1c32a6746084c1f 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -204,6 +204,11 @@ i[3-7]86-*-linux-*)        targ_emul=elf_i386
                        targ64_extra_libpath=elf_x86_64
                        targ_extra_libpath=elf32_x86_64
                        tdir_i386linux=${targ_alias}aout ;;
+x86_64-*-linux-gnux32) targ_emul=elf32_x86_64
+                       targ_extra_emuls="elf_x86_64 elf_i386 i386linux elf_l1om"
+                       targ_extra_libpath="elf_i386 elf_x86_64 elf_l1om"
+                       tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
+                       tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
 x86_64-*-linux-*)      targ_emul=elf_x86_64
                        targ_extra_emuls="elf32_x86_64 elf_i386 i386linux elf_l1om elf_k1om"
                        targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om"

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 616101973a297ad9b4ab844beea29b82b3d476ec..46415b8e75c90158228903c5072bd76bf24d0fb7 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2012-05-04  H.J. Lu  <[email protected]>
+
+       * ld-elf/eh1.d: Skip x86_64-*-linux-gnux32.
+       * ld-elf/eh2.d: Likewise.
+       * ld-elf/eh3.d: Likewise.
+       * ld-elf/eh4.d: Likewise.
+
+       * ld-elfvsb/elfvsb.exp: Xfail x86_64-*-linux-gnux32.
+       * ld-shared/shared.exp: Likewise.
+
+       * ld-ifunc/ifunc-3a-x86.d: Support x86_64-*-linux-gnux32.
+
 2012-04-24  Roland McGrath  <[email protected]>
 
        * ld-x86-64/plt-nacl.pd: Fix expected nop padding.

diff --git a/ld/testsuite/ld-elf/eh1.d b/ld/testsuite/ld-elf/eh1.d
index 4455b0d9cb9c069d3bdf85375fa3ac034fdde778..0fa41465a18ea6d1913a3097eadfe6689966c7da 100644 (file)
--- a/ld/testsuite/ld-elf/eh1.d
+++ b/ld/testsuite/ld-elf/eh1.d
@@ -3,6 +3,7 @@
 #as: --64
 #ld: -melf_x86_64 -Ttext 0x400078
 #readelf: -wf
+#notarget: x86_64-*-linux-gnux32
 #target: x86_64-*-*
 
 Contents of the .eh_frame section:

diff --git a/ld/testsuite/ld-elf/eh2.d b/ld/testsuite/ld-elf/eh2.d
index c5b5a73a33fb9c0c9865fdd07462d8b23e35c1d5..c63abb5b56d8db6dff6b01f9e469d3fa03611bf5 100644 (file)
--- a/ld/testsuite/ld-elf/eh2.d
+++ b/ld/testsuite/ld-elf/eh2.d
@@ -3,6 +3,7 @@
 #as: --64
 #ld: -melf_x86_64 -Ttext 0x400078
 #readelf: -wf
+#notarget: x86_64-*-linux-gnux32
 #target: x86_64-*-*
 
 Contents of the .eh_frame section:

diff --git a/ld/testsuite/ld-elf/eh3.d b/ld/testsuite/ld-elf/eh3.d
index b3bd7567c4da052a6850f7700b0381f3eaf083d4..3b9ad6405b0addfbedae6674197cd8dee85a7468 100644 (file)
--- a/ld/testsuite/ld-elf/eh3.d
+++ b/ld/testsuite/ld-elf/eh3.d
@@ -3,6 +3,7 @@
 #as: --64
 #ld: -melf_x86_64 -Ttext 0x400078
 #readelf: -wf
+#notarget: x86_64-*-linux-gnux32
 #target: x86_64-*-*
 
 Contents of the .eh_frame section:

diff --git a/ld/testsuite/ld-elf/eh4.d b/ld/testsuite/ld-elf/eh4.d
index ad4b00807ff05e5b3b5645c09c88e1232cf6a430..b482d038fd1a098ecd69a2a2ef997c708a630bac 100644 (file)
--- a/ld/testsuite/ld-elf/eh4.d
+++ b/ld/testsuite/ld-elf/eh4.d
@@ -3,6 +3,7 @@
 #as: --64
 #ld: -melf_x86_64 -shared -Ttext 0x400
 #readelf: -wf
+#notarget: x86_64-*-linux-gnux32
 #target: x86_64-*-*
 
 Contents of the .eh_frame section:

diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp
index e2c1b4cd5fcb6f004bc0e007461dad31d96b99c3..5d97cc85abaa33847d8041eed300b4734bd00ff0 100644 (file)
--- a/ld/testsuite/ld-elfvsb/elfvsb.exp
+++ b/ld/testsuite/ld-elfvsb/elfvsb.exp
@@ -308,6 +308,7 @@ proc visibility_run {visibility} {
            if { [is_elf64 $tmpdir/mainnp.o] } {
                setup_xfail "x86_64-*-linux*"
            }
+           setup_xfail "x86_64-*-linux-gnux32"
            if { ![istarget hppa*64*-*-linux*] } {
                setup_xfail "hppa*-*-linux*"
            }
@@ -351,6 +352,7 @@ proc visibility_run {visibility} {
            if { [is_elf64 $tmpdir/mainnp.o] } {
                setup_xfail "x86_64-*-linux*"
            }
+           setup_xfail "x86_64-*-linux-gnux32"
            if { ![istarget hppa*64*-*-linux*] } {
                setup_xfail "hppa*-*-linux*"
            }
@@ -425,6 +427,7 @@ proc visibility_run {visibility} {
                if { [is_elf64 $tmpdir/mainp.o] } {
                    setup_xfail "x86_64-*-linux*"
                }
+               setup_xfail "x86_64-*-linux-gnux32"
                if { ![istarget hppa*64*-*-linux*] } {
                    setup_xfail "hppa*-*-linux*"
                }

diff --git a/ld/testsuite/ld-ifunc/ifunc-3a-x86.d b/ld/testsuite/ld-ifunc/ifunc-3a-x86.d
index 24be6391aa0e9b4f1b0bb484cb2f5e355778a5bb..3ff80241dedc41c9b3178ec6c111f2c7d6cb444f 100644 (file)
--- a/ld/testsuite/ld-ifunc/ifunc-3a-x86.d
+++ b/ld/testsuite/ld-ifunc/ifunc-3a-x86.d
@@ -4,5 +4,5 @@
 #target: x86_64-*-* i?86-*-*
 
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x1b0|\+0x240|)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x1b0|\+0x240|\+0x1a0|)@plt>
 #pass

diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp
index b5ada605c0954d5d3926e7b1f0b94fd5813502c8..7ec304b0a5bd3484fd9d5c710222251b91c2984e 100644 (file)
--- a/ld/testsuite/ld-shared/shared.exp
+++ b/ld/testsuite/ld-shared/shared.exp
@@ -240,6 +240,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o]
        if { [is_elf64 $tmpdir/mainnp.o] } {
            setup_xfail "x86_64-*-linux*"
        }
+       setup_xfail "x86_64-*-linux-gnux32"
        setup_xfail "s390x-*-linux*"
        if [ string match $shared_needs_pic "yes" ] {
            setup_xfail "arm*-*-linux*"
@@ -265,6 +266,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o]
        if { [is_elf64 $tmpdir/mainnp.o] } {
            setup_xfail "x86_64-*-linux*"
        }
+       setup_xfail "x86_64-*-linux-gnux32"
        setup_xfail "s390x-*-linux*"
        if [ string match $shared_needs_pic "yes" ] {
            setup_xfail "arm*-*-linux*"
@@ -320,6 +322,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/m
            if { [is_elf64 $tmpdir/mainp.o] } {
                setup_xfail "x86_64-*-linux*"
            }
+           setup_xfail "x86_64-*-linux-gnux32"
            setup_xfail "s390x-*-linux*"
            if [ string match $shared_needs_pic "yes" ] {
                setup_xfail "arm*-*-linux*"