From 2562953678f04d6574d5dffdbc41242e5b487ff5 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 21 Feb 2005 08:18:49 +0000 Subject: [PATCH] * ld-elf/warn1.d: Specify -Ttext. * ld-scripts/align.exp (align2a, align2b: Don't run on aout targets. * ld-scripts/align2.t: Discard all but .text and .data. * ld-scripts/align2a.d: Accept non-readonly for coff. * ld-scripts/align2b.d: Likewise. * lib/ld-lib.exp (is_aout_format): New function. --- ld/testsuite/ChangeLog | 9 +++++++++ ld/testsuite/ld-elf/warn1.d | 2 +- ld/testsuite/ld-scripts/align.exp | 6 ++++-- ld/testsuite/ld-scripts/align2.t | 1 + ld/testsuite/ld-scripts/align2a.d | 2 +- ld/testsuite/ld-scripts/align2b.d | 2 +- ld/testsuite/lib/ld-lib.exp | 34 ++++++++++++++++++++++++++++++++-- 7 files changed, 49 insertions(+), 7 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index c85a57e..5148685 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2005-02-21 Alan Modra + + * ld-elf/warn1.d: Specify -Ttext. + * ld-scripts/align.exp (align2a, align2b: Don't run on aout targets. + * ld-scripts/align2.t: Discard all but .text and .data. + * ld-scripts/align2a.d: Accept non-readonly for coff. + * ld-scripts/align2b.d: Likewise. + * lib/ld-lib.exp (is_aout_format): New function. + 2005-02-18 Alan Modra * ld-scripts/align2a.d: Don't assume anything about section diff --git a/ld/testsuite/ld-elf/warn1.d b/ld/testsuite/ld-elf/warn1.d index 7301509..80f32b9 100644 --- a/ld/testsuite/ld-elf/warn1.d +++ b/ld/testsuite/ld-elf/warn1.d @@ -1,7 +1,7 @@ #source: start.s #source: symbol1ref.s #source: symbol1w.s -#ld: +#ld: -Ttext 0x1000 #warning: ^[^\\n]*\): warning: witty one-liner$ #readelf: -s #notarget: "sparc64-*-solaris2*" "sparcv9-*-solaris2*" diff --git a/ld/testsuite/ld-scripts/align.exp b/ld/testsuite/ld-scripts/align.exp index dbaaaf3..5d4cd43 100644 --- a/ld/testsuite/ld-scripts/align.exp +++ b/ld/testsuite/ld-scripts/align.exp @@ -35,6 +35,8 @@ if ![ld_simple_link $ld tmpdir/align "-T $srcdir/$subdir/align.t tmpdir/align.o" pass $testname } -run_dump_test align2a -run_dump_test align2b +if ![is_aout_format] { + run_dump_test align2a + run_dump_test align2b +} run_dump_test align2c diff --git a/ld/testsuite/ld-scripts/align2.t b/ld/testsuite/ld-scripts/align2.t index 73818a8..d86f62a 100644 --- a/ld/testsuite/ld-scripts/align2.t +++ b/ld/testsuite/ld-scripts/align2.t @@ -3,4 +3,5 @@ SECTIONS .text : {*(.text)} . = ALIGN(data_align); .data : {*(.data)} + /DISCARD/ : {*(*)} } diff --git a/ld/testsuite/ld-scripts/align2a.d b/ld/testsuite/ld-scripts/align2a.d index 873cfe1..d45cf0e 100644 --- a/ld/testsuite/ld-scripts/align2a.d +++ b/ld/testsuite/ld-scripts/align2a.d @@ -6,7 +6,7 @@ Sections: Idx +Name +Size +VMA +LMA +File +off +Algn +0 +\.text +[^ ]* +0+ +0+ .* - +CONTENTS, +ALLOC, +LOAD, +READONLY, +CODE + +CONTENTS, +ALLOC, +LOAD,.* CODE +1 +\.data +[^ ]* +0+10 +0+10 .* +CONTENTS, +ALLOC, +LOAD, +DATA #pass diff --git a/ld/testsuite/ld-scripts/align2b.d b/ld/testsuite/ld-scripts/align2b.d index 457f04b..05d2a15 100644 --- a/ld/testsuite/ld-scripts/align2b.d +++ b/ld/testsuite/ld-scripts/align2b.d @@ -6,7 +6,7 @@ Sections: Idx +Name +Size +VMA +LMA +File off +Algn +0 +\.text +[^ ]* +0+ +0+ .* - +CONTENTS, +ALLOC, +LOAD, +READONLY, +CODE + +CONTENTS, +ALLOC, +LOAD,.* CODE +1 +\.data +[^ ]* +0+20 +0+20 .* +CONTENTS, +ALLOC, +LOAD, +DATA #pass diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index c36c2e5..dbc8662 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -1,6 +1,6 @@ # Support routines for LD testsuite. -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +# 2004, 2005 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -417,6 +417,36 @@ proc is_elf64 { binary_file } { } # +# is_aout_format +# true if the object format is known to be aout +proc is_aout_format {} { + if { [istarget *-*-*\[ab\]out*] \ + || [istarget *-*-linux*oldld*] \ + || [istarget *-*-msdos*] \ + || [istarget arm-*-netbsd] \ + || [istarget i?86-*-netbsd] \ + || [istarget i?86-*-mach*] \ + || [istarget i?86-*-vsta] \ + || [istarget pdp11-*-*] \ + || [istarget m68*-ericsson-ose] \ + || [istarget m68k-hp-bsd*] \ + || [istarget m68*-*-hpux*] \ + || [istarget m68*-*-netbsd] \ + || [istarget m68*-*-netbsd*4k*] \ + || [istarget m68k-sony-*] \ + || [istarget m68*-sun-sunos\[34\]*] \ + || [istarget m68*-wrs-vxworks*] \ + || [istarget ns32k-*-*] \ + || [istarget sparc*-*-netbsd] \ + || [istarget sparc-sun-sunos4*] \ + || [istarget vax-dec-ultrix*] \ + || [istarget vax-*-netbsd] } { + return 1 + } + return 0 +} + +# # is_pecoff_format # true if the object format is known to be PECOFF # -- 2.7.4