This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Fix phdrs tests
- To: binutils at sources dot redhat dot com
- Subject: Fix phdrs tests
- From: Andreas Jaeger <aj at suse dot de>
- Date: 30 Apr 2001 11:24:31 +0200
The ld test phdrs failed for me on x86-64 since MAXPAGESIZE was
greater than 0x80000 :-(. Andreas Schwab actually fixed this problem.
Here's a patch that also fixes the test for s390x.
Ok to commit?
Andreas
2001-04-30 Andreas Jaeger <aj@suse.de>, Andreas Schwab <schwab@suse.de>
* ld-scripts/phdrs.exp: Fix regexp, s390x is 64 bit platform.
* ld-scripts/phdrs.t: Use startaddress that's greater than
any MAXPAGESIZE used.
============================================================
Index: ld/testsuite/ld-scripts/phdrs.exp
--- ld/testsuite/ld-scripts/phdrs.exp 2001/04/28 16:14:39 1.6
+++ ld/testsuite/ld-scripts/phdrs.exp 2001/04/30 09:22:30
@@ -44,13 +44,14 @@
}
set phdrs_regexp \
-".*Program Header:.*PHDR *off *0x00*34 *vaddr *0x00*80034 *paddr *0x00*80034.*filesz *0x0\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* flags r--.*LOAD *off *0x00* *vaddr *0x00*80000 *paddr *0x00*80000.*filesz *0x00*\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* *flags r-x.*LOAD *off *0x0\[0-9a-f\]* *vaddr *0x00*80*\[0-9a-f\]* *paddr *0x00*80*\[0-9a-f\]*.*filesz *0x0\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* *flags *rw-.*"
+".*Program Header:.*PHDR *off *0x00*34 *vaddr *0x00*800034 *paddr *0x00*800034.*filesz *0x0\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* flags r--.*LOAD *off *0x00* *vaddr *0x00*800000 *paddr *0x00*800000.*filesz *0x00*\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* *flags r-x.*LOAD *off *0x0\[0-9a-f\]* *vaddr *0x00*80*\[0-9a-f\]* *paddr *0x00*80*\[0-9a-f\]*.*filesz *0x0\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* *flags *rw-.*"
# On a 64 bit ELF format, we need different numbers.
if { [istarget alpha*-*-*] || [istarget "ia64*-*-*"]
- || [istarget "hppa*64*-*-*"] || [istarget "x86_64*-*-*"] } then {
+ || [istarget "hppa*64*-*-*"] || [istarget "x86_64*-*-*"]
+ || [istarget "s390x*-*-*"]} then {
set phdrs_regexp \
-".*Program Header:.*PHDR *off *0x00*40 *vaddr *0x00*80040 *paddr *0x00*80040.*filesz *0x0\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* flags r--.*LOAD *off *0x00* *vaddr *0x00*80000 *paddr *0x00*80000.*filesz *0x00*\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* *flags r-x.*LOAD *off *0x0\[0-9a-f\]* *vaddr *0x00*80*\[0-9a-f\]* *paddr *0x00*80*\[0-9a-f\]*.*filesz *0x0\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* *flags *rw-.*"
+".*Program Header:.*PHDR *off *0x00*40 *vaddr *0x00*800040 *paddr *0x00*800040.*filesz *0x0\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* flags r--.*LOAD *off *0x00* *vaddr *0x00*800000 *paddr *0x00*800000.*filesz *0x00*\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* *flags r-x.*LOAD *off *0x0\[0-9a-f\]* *vaddr *0x00*80*\[0-9a-f\]* *paddr *0x00*80*\[0-9a-f\]*.*filesz *0x0\[0-9a-f\]* *memsz *0x0\[0-9a-f\]* *flags *rw-.*"
}
if ![ld_simple_link $ld tmpdir/phdrs "-T $srcdir/$subdir/phdrs.t tmpdir/phdrs.o"] {
============================================================
Index: ld/testsuite/ld-scripts/phdrs.t
--- ld/testsuite/ld-scripts/phdrs.t 2000/03/14 01:40:30 1.2
+++ ld/testsuite/ld-scripts/phdrs.t 2001/04/30 09:22:30
@@ -7,7 +7,9 @@
SECTIONS
{
- . = 0x80000 + SIZEOF_HEADERS;
+ /* This test will fail on architectures where the startaddress below
+ is less than the constant MAXPAGESIZE. */
+ . = 0x8000000 + SIZEOF_HEADERS;
.text : { *(.text) } :text
.data : { *(.data) } :data
/DISCARD/ : { *(.*) }
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj