From b32711aa6a4284f54a5293c6cd62692f58401084 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Fri, 21 Apr 2000 22:17:28 +0000 Subject: [PATCH] A misc IA-64 ELF patch I missed in the first pass. * testsuite/ld-scripts/phdrs.exp: IA-64 is 64-bit ELF too. --- ld/testsuite/ChangeLog | 4 ++++ ld/testsuite/ld-scripts/phdrs.exp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index c07f18eb48..ae88ca1cb4 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +Fri Apr 21 15:16:07 2000 Richard Henderson + + * testsuite/ld-scripts/phdrs.exp: IA-64 is 64-bit ELF too. + 2000-04-12 Alan Modra * ld-selective/3.cc (_start): Add cheat for gcc-2.95.2 failure. diff --git a/ld/testsuite/ld-scripts/phdrs.exp b/ld/testsuite/ld-scripts/phdrs.exp index 5a37fa0e1f..b845d6876b 100644 --- a/ld/testsuite/ld-scripts/phdrs.exp +++ b/ld/testsuite/ld-scripts/phdrs.exp @@ -31,7 +31,7 @@ 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-.*" # On a 64 bit ELF format, we need different numbers. -if { [istarget alpha*-*-*] } then { +if { [istarget alpha*-*-*] || [istarget "ia64*-*-*"] } 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-.*" }