From ade78dba78cd284ca34c045657f4f549da99993f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 20 Jun 2011 13:23:22 +0000 Subject: Revert x86_64-x32-* change. gas/ 2011-06-20 H.J. Lu * configure.tgt: Revert x32 change. ld/ 2011-06-20 H.J. Lu * configure.tgt: Revert x32 change. ld/testsuite/ 2011-06-20 H.J. Lu * ld-elf/eh1.d: Revert x32 change. * ld-elf/eh2.d: Likewise. * ld-elf/eh3.d: Likewise. * ld-elf/eh4.d: Likewise. --- ld/ChangeLog | 4 ++++ ld/configure.tgt | 5 ----- ld/testsuite/ChangeLog | 7 +++++++ ld/testsuite/ld-elf/eh1.d | 1 - ld/testsuite/ld-elf/eh2.d | 1 - ld/testsuite/ld-elf/eh3.d | 1 - ld/testsuite/ld-elf/eh4.d | 1 - 7 files changed, 11 insertions(+), 9 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index 6748fa3..407cc2d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2011-06-20 H.J. Lu + + * configure.tgt: Revert x32 change. + 2011-06-20 Jakub Jelinek PR ld/12570 diff --git a/ld/configure.tgt b/ld/configure.tgt index dd05975..f35298c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -190,11 +190,6 @@ 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-x32-linux-*) 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" targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om" diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 39b06b7..87fd182 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-06-20 H.J. Lu + + * ld-elf/eh1.d: Revert x32 change. + * ld-elf/eh2.d: Likewise. + * ld-elf/eh3.d: Likewise. + * ld-elf/eh4.d: Likewise. + 2011-06-20 Jakub Jelinek PR ld/12570 diff --git a/ld/testsuite/ld-elf/eh1.d b/ld/testsuite/ld-elf/eh1.d index 4275de1..f0874f7 100644 --- a/ld/testsuite/ld-elf/eh1.d +++ b/ld/testsuite/ld-elf/eh1.d @@ -2,7 +2,6 @@ #source: eh1a.s #ld: #readelf: -wf -#notarget: x86_64-x32-* #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 a7372f0..1a05d7f 100644 --- a/ld/testsuite/ld-elf/eh2.d +++ b/ld/testsuite/ld-elf/eh2.d @@ -2,7 +2,6 @@ #source: eh2a.s #ld: #readelf: -wf -#notarget: x86_64-x32-* #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 a9777a2..1f76b8c 100644 --- a/ld/testsuite/ld-elf/eh3.d +++ b/ld/testsuite/ld-elf/eh3.d @@ -2,7 +2,6 @@ #source: eh3a.s #ld: #readelf: -wf -#notarget: x86_64-x32-* #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 b568f32..b8f9865 100644 --- a/ld/testsuite/ld-elf/eh4.d +++ b/ld/testsuite/ld-elf/eh4.d @@ -2,7 +2,6 @@ #source: eh4a.s #ld: -shared #readelf: -wf -#notarget: x86_64-x32-* #target: x86_64-*-* Contents of the .eh_frame section: -- cgit v1.1