diff options
Diffstat (limited to 'ld')
-rw-r--r-- | ld/testsuite/ChangeLog | 9 | ||||
-rw-r--r-- | ld/testsuite/ld-x86-64/ilp32-1.d | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-x86-64/ilp32-2.d | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-x86-64/ilp32-3.d | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-x86-64/ilp32-4.d | 2 | ||||
-rw-r--r-- | ld/testsuite/ld-x86-64/ilp32-5.d | 2 | ||||
-rw-r--r-- | ld/testsuite/ld-x86-64/x86-64.exp | 4 |
7 files changed, 19 insertions, 10 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 897e3db..498de82 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,5 +1,14 @@ 2011-01-14 H.J. Lu <hongjiu.lu@intel.com> + * ld-x86-64/ilp32-1.d: Replace --n32 with --x32. + * ld-x86-64/ilp32-2.d: Likewise. + * ld-x86-64/ilp32-3.d: Likewise. + * ld-x86-64/ilp32-4.d: Likewise. + * ld-x86-64/ilp32-5.d: Likewise. + * ld-x86-64/x86-64.exp: Likewise. + +2011-01-14 H.J. Lu <hongjiu.lu@intel.com> + * ld-x86-64/ilp32-5.d: New. * ld-x86-64/ilp32-5.s: Likewise. diff --git a/ld/testsuite/ld-x86-64/ilp32-1.d b/ld/testsuite/ld-x86-64/ilp32-1.d index 394d051..aa3b934 100644 --- a/ld/testsuite/ld-x86-64/ilp32-1.d +++ b/ld/testsuite/ld-x86-64/ilp32-1.d @@ -1,6 +1,6 @@ #source: dummy.s -#as: --n32 -#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foon32.o +#as: --x32 +#ld: -m elf32_x86_64 tmpdir/startx32.o tmpdir/foox32.o #readelf: -h ELF Header: diff --git a/ld/testsuite/ld-x86-64/ilp32-2.d b/ld/testsuite/ld-x86-64/ilp32-2.d index 405d509..19fc671 100644 --- a/ld/testsuite/ld-x86-64/ilp32-2.d +++ b/ld/testsuite/ld-x86-64/ilp32-2.d @@ -1,4 +1,4 @@ #source: dummy.s -#as: --n32 -#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foo32.o +#as: --x32 +#ld: -m elf32_x86_64 tmpdir/startx32.o tmpdir/foo32.o #error: .*i386 architecture of input file `tmpdir/foo32.o' is incompatible with i386:x64-32 output diff --git a/ld/testsuite/ld-x86-64/ilp32-3.d b/ld/testsuite/ld-x86-64/ilp32-3.d index d611181..fdd9065 100644 --- a/ld/testsuite/ld-x86-64/ilp32-3.d +++ b/ld/testsuite/ld-x86-64/ilp32-3.d @@ -1,4 +1,4 @@ #source: dummy.s -#as: --n32 -#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foo64.o +#as: --x32 +#ld: -m elf32_x86_64 tmpdir/startx32.o tmpdir/foo64.o #error: .*i386:x86-64 architecture of input file `tmpdir/foo64.o' is incompatible with i386:x64-32 output diff --git a/ld/testsuite/ld-x86-64/ilp32-4.d b/ld/testsuite/ld-x86-64/ilp32-4.d index 24fe4c5..e7bfe4e 100644 --- a/ld/testsuite/ld-x86-64/ilp32-4.d +++ b/ld/testsuite/ld-x86-64/ilp32-4.d @@ -1,5 +1,5 @@ #source: start.s -#as: --n32 +#as: --x32 #ld: -m elf32_x86_64 -shared #readelf: -d -S --wide diff --git a/ld/testsuite/ld-x86-64/ilp32-5.d b/ld/testsuite/ld-x86-64/ilp32-5.d index 8f5025e..e4673e5 100644 --- a/ld/testsuite/ld-x86-64/ilp32-5.d +++ b/ld/testsuite/ld-x86-64/ilp32-5.d @@ -1,4 +1,4 @@ -#as: --n32 +#as: --x32 #ld: -m elf32_x86_64 -shared #readelf: -r --wide diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index e69ade6..a82a56f 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -141,7 +141,7 @@ if { ![istarget "x86_64-*-linux*"] } { return } -if ![ld_assemble $as "--n32 $srcdir/$subdir/start.s" tmpdir/startn32.o] { +if ![ld_assemble $as "--x32 $srcdir/$subdir/start.s" tmpdir/startx32.o] { unresolved "Build ILP32 start.o" return } @@ -156,7 +156,7 @@ if ![ld_assemble $as "--64 $srcdir/$subdir/start.s" tmpdir/start64.o] { return } -if ![ld_assemble $as "--n32 $srcdir/$subdir/foo.s" tmpdir/foon32.o] { +if ![ld_assemble $as "--x32 $srcdir/$subdir/foo.s" tmpdir/foox32.o] { unresolved "Build ILP32 foo.o" return } |