From 4a3dc54359e79df0cb556cd5b4ab5c1bc91019b5 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 2 Mar 2006 08:50:04 +0000 Subject: bfd/ * elf32-ppc.c (ppc_elf_plt_type): New enumeration. (ppc_elf_link_hash_table): Replace old_got and new_got with plt_type and can_use_new_plt. (ppc_elf_create_dynamic_sections): Add SEC_HAS_CONTENTS, SEC_LOAD and SEC_READONLY to the VxWorks .plt flags. (ppc_elf_check_relocs): Set can_use_new_plt instead of new_plt. Move from plt_type == PLT_UNSET to PLT_OLD instead of setting old_plt. (ppc_elf_select_plt_layout): Move from plt_type == PLT_UNSET to either plt_type == PLT_OLD or plt_type == PLT_NEW. Assert that this function should not be called for VxWorks targets. (ppc_elf_tls_setup): Use plt_type instead of old_got. (allocate_got): Likewise. Rearrange so that max_before_header is only used for PLT_OLD and PLT_NEW. (allocate_dynrelocs): Use plt_type instead of old_got and is_vxworks. (ppc_elf_size_dynamic_sections): Likewise. (ppc_elf_relax_section): Likewise. (ppc_elf_relocate_section): Likewise. (ppc_elf_finish_dynamic_symbol): Likewise. (ppc_elf_vxworks_link_hash_table_create): Initialize plt_type. ld/ * emulparams/elf32ppccommon.sh: New file, extracted from... * emulparams/elf32ppc.sh: ...here. * emulparams/elf32ppcvxworks.sh: Include elf32ppccommon.sh instead of elf32ppc.sh. (BSS_PLT): Remove override. * Makefile.am (eelf32lppc.c): Depend on elf32ppccommons.h. (eelf32lppcnto.c, eelf32lppcsim.c, eelf32ppcnto.c): Likewise. (eelf32ppc.c, eelf32ppc_fbsd.c, eelf32ppcsimm): Likewise. (eelf32ppclinux.c): Likewise. (eelf32ppcvxworks.c): Likewise. Add missing vxworks.sh dependency. * Makefile.in: Regenerate. ld/testsuite/ * ld-powerpc/vxworks1-lib.s, ld-powerpc/vxworks1-lib.dd, * ld-powerpc/vxworks1-lib.rd, ld-powerpc/vxworks1.s, * ld-powerpc/vxworks1.dd, ld-powerpc/vxworks1.rd, * ld-powerpc/vxworks1.ld, ld-powerpc/vxworks1.sd: New test. * ld-powerpc/powerpc.exp: Run it. --- ld/testsuite/ChangeLog | 8 +++++ ld/testsuite/ld-powerpc/powerpc.exp | 19 +++++++++++ ld/testsuite/ld-powerpc/vxworks1-lib.dd | 56 +++++++++++++++++++++++++++++++++ ld/testsuite/ld-powerpc/vxworks1-lib.rd | 12 +++++++ ld/testsuite/ld-powerpc/vxworks1-lib.s | 35 +++++++++++++++++++++ ld/testsuite/ld-powerpc/vxworks1-lib.sd | 12 +++++++ ld/testsuite/ld-powerpc/vxworks1.dd | 48 ++++++++++++++++++++++++++++ ld/testsuite/ld-powerpc/vxworks1.ld | 27 ++++++++++++++++ ld/testsuite/ld-powerpc/vxworks1.rd | 22 +++++++++++++ ld/testsuite/ld-powerpc/vxworks1.s | 14 +++++++++ 10 files changed, 253 insertions(+) create mode 100644 ld/testsuite/ld-powerpc/vxworks1-lib.dd create mode 100644 ld/testsuite/ld-powerpc/vxworks1-lib.rd create mode 100644 ld/testsuite/ld-powerpc/vxworks1-lib.s create mode 100644 ld/testsuite/ld-powerpc/vxworks1-lib.sd create mode 100644 ld/testsuite/ld-powerpc/vxworks1.dd create mode 100644 ld/testsuite/ld-powerpc/vxworks1.ld create mode 100644 ld/testsuite/ld-powerpc/vxworks1.rd create mode 100644 ld/testsuite/ld-powerpc/vxworks1.s (limited to 'ld/testsuite') diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index c9f4395..5c2bcb6 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2006-03-02 Richard Sandiford + + * ld-powerpc/vxworks1-lib.s, ld-powerpc/vxworks1-lib.dd, + * ld-powerpc/vxworks1-lib.rd, ld-powerpc/vxworks1.s, + * ld-powerpc/vxworks1.dd, ld-powerpc/vxworks1.rd, + * ld-powerpc/vxworks1.ld, ld-powerpc/vxworks1.sd: New test. + * ld-powerpc/powerpc.exp: Run it. + 2006-02-28 Richard Sandiford * ld-i386/vxworks1-lib.s, ld-i386/vxworks1-lib.dd, diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp index e43a295..5cfb313 100644 --- a/ld/testsuite/ld-powerpc/powerpc.exp +++ b/ld/testsuite/ld-powerpc/powerpc.exp @@ -20,6 +20,25 @@ if { ![istarget "powerpc*-*-*"] } { return } +if {[istarget "*-*-vxworks"]} { + set ppcvxtests { + {"VxWorks shared library test 1 (default script)" "-shared" + "-mregnames" {vxworks1-lib.s} + {{readelf --segments vxworks1-lib.sd}} + "libvxworks1.so"} + {"VxWorks shared library test 1" "-shared -Tvxworks1.ld" + "-mregnames" {vxworks1-lib.s} + {{readelf --relocs vxworks1-lib.rd} {objdump -dr vxworks1-lib.dd}} + "libvxworks1.so"} + {"VxWorks dynamic executable test 1" \ + "tmpdir/libvxworks1.so -Tvxworks1.ld -q" "-mregnames" {vxworks1.s} + {{readelf --relocs vxworks1.rd} {objdump -dr vxworks1.dd}} + "vxworks1"} + } + run_ld_link_tests $ppcvxtests + return +} + # powerpc ELF only at the moment. if { [istarget "*-*-macos*"] || [istarget "*-*-netware*"] diff --git a/ld/testsuite/ld-powerpc/vxworks1-lib.dd b/ld/testsuite/ld-powerpc/vxworks1-lib.dd new file mode 100644 index 0000000..1c1861e --- /dev/null +++ b/ld/testsuite/ld-powerpc/vxworks1-lib.dd @@ -0,0 +1,56 @@ + +.*: file format .* + +Disassembly of section \.plt: + +00080800 <_PROCEDURE_LINKAGE_TABLE_>: + 80800: 81 9e 00 08 lwz r12,8\(r30\) + 80804: 7d 89 03 a6 mtctr r12 + 80808: 81 9e 00 04 lwz r12,4\(r30\) + 8080c: 4e 80 04 20 bctr + 80810: 60 00 00 00 nop + 80814: 60 00 00 00 nop + 80818: 60 00 00 00 nop + 8081c: 60 00 00 00 nop + 80820: 3d 9e 00 00 addis r12,r30,0 + 80824: 81 8c 00 0c lwz r12,12\(r12\) + 80828: 7d 89 03 a6 mtctr r12 + 8082c: 4e 80 04 20 bctr + 80830: 39 60 00 00 li r11,0 + 80834: 4b ff ff cc b 80800 <_PROCEDURE_LINKAGE_TABLE_> + 80838: 60 00 00 00 nop + 8083c: 60 00 00 00 nop + 80840: 3d 9e 00 00 addis r12,r30,0 + 80844: 81 8c 00 10 lwz r12,16\(r12\) + 80848: 7d 89 03 a6 mtctr r12 + 8084c: 4e 80 04 20 bctr + 80850: 39 60 00 01 li r11,1 + 80854: 4b ff ff ac b 80800 <_PROCEDURE_LINKAGE_TABLE_> + 80858: 60 00 00 00 nop + 8085c: 60 00 00 00 nop +Disassembly of section \.text: + +00080c00 : + 80c00: 94 21 ff e8 stwu r1,-24\(r1\) + 80c04: 7c 08 02 a6 mflr r0 + 80c08: 90 01 00 1c stw r0,28\(r1\) + 80c0c: 3f c0 00 00 lis r30,0 + 80c10: 83 de 00 00 lwz r30,0\(r30\) + 80c14: 83 de 00 00 lwz r30,0\(r30\) + 80c18: 80 3e 00 14 lwz r1,20\(r30\) + 80c1c: 80 01 00 00 lwz r0,0\(r1\) + 80c20: 38 00 00 01 li r0,1 + 80c24: 90 01 00 00 stw r0,0\(r1\) + 80c28: 48 00 00 1d bl 80c44 + 80c2c: 4b ff fc 15 bl 80840 <_PROCEDURE_LINKAGE_TABLE_\+0x40> + 80c30: 4b ff fb f1 bl 80820 <_PROCEDURE_LINKAGE_TABLE_\+0x20> + 80c34: 80 01 00 1c lwz r0,28\(r1\) + 80c38: 7c 08 03 a6 mtlr r0 + 80c3c: 38 21 00 18 addi r1,r1,24 + 80c40: 4e 80 00 20 blr + +00080c44 : + 80c44: 4e 80 00 20 blr + +00080c48 : + 80c48: 4e 80 00 20 blr diff --git a/ld/testsuite/ld-powerpc/vxworks1-lib.rd b/ld/testsuite/ld-powerpc/vxworks1-lib.rd new file mode 100644 index 0000000..17087f1 --- /dev/null +++ b/ld/testsuite/ld-powerpc/vxworks1-lib.rd @@ -0,0 +1,12 @@ + +Relocation section '\.rela\.plt' at offset .* contains 2 entries: + Offset Info Type Sym\.Value Sym\. Name \+ Addend +0008140c .*15 R_PPC_JMP_SLOT 00000000 sexternal \+ 0 +00081410 .*15 R_PPC_JMP_SLOT 00080c48 sglobal \+ 0 + +Relocation section '\.rela\.dyn' at offset .* contains 4 entries: + Offset Info Type Sym\.Value Sym\. Name \+ Addend +00080c0e .*06 R_PPC_ADDR16_HA 00000000 __GOTT_BASE__ \+ 0 +00080c12 .*04 R_PPC_ADDR16_LO 00000000 __GOTT_BASE__ \+ 0 +00080c16 .*03 R_PPC_ADDR16 00000000 __GOTT_INDEX__ \+ 0 +00081414 .*14 R_PPC_GLOB_DAT 00081800 x \+ 0 diff --git a/ld/testsuite/ld-powerpc/vxworks1-lib.s b/ld/testsuite/ld-powerpc/vxworks1-lib.s new file mode 100644 index 0000000..8e286c1 --- /dev/null +++ b/ld/testsuite/ld-powerpc/vxworks1-lib.s @@ -0,0 +1,35 @@ + .text + .globl foo + .type foo, @function +foo: + stwu r1,-24(r1) + mflr r0 + stw r0,28(r1) + lis r30,__GOTT_BASE__@ha + lwz r30,__GOTT_BASE__@l(r30) + lwz r30,__GOTT_INDEX__(r30) + lwz r1,x@got(r30) + lwz r0,0(r1) + addi r0,r0,1 + stw r0,0(r1) + bl slocal + bl sglobal@plt + bl sexternal@plt + lwz r0,28(r1) + mtlr r0 + addi r1,r1,24 + blr + .size foo, .-foo + + .type slocal, @function +slocal: + blr + .size slocal, .-slocal + + .globl sglobal + .type sglobal, @function +sglobal: + blr + .size sglobal, .-sglobal + + .comm x,4,4 diff --git a/ld/testsuite/ld-powerpc/vxworks1-lib.sd b/ld/testsuite/ld-powerpc/vxworks1-lib.sd new file mode 100644 index 0000000..1d2ed5c --- /dev/null +++ b/ld/testsuite/ld-powerpc/vxworks1-lib.sd @@ -0,0 +1,12 @@ +#... +Program Headers: + Type .* Flg Align + LOAD .* R E 0x10000 + LOAD .* RW 0x10000 + DYNAMIC .* RW 0x4 + + Section to Segment mapping: + Segment Sections\.\.\. + 00 .* \.plt .* + 01 .* \.got .* + 02 .* \.dynamic $ diff --git a/ld/testsuite/ld-powerpc/vxworks1.dd b/ld/testsuite/ld-powerpc/vxworks1.dd new file mode 100644 index 0000000..e4c7b06 --- /dev/null +++ b/ld/testsuite/ld-powerpc/vxworks1.dd @@ -0,0 +1,48 @@ + +.*: file format .* + +Disassembly of section \.plt: + +00080800 <_PROCEDURE_LINKAGE_TABLE_>: + 80800: 3d 80 00 08 lis r12,8 + 80802: R_PPC_ADDR16_HA _GLOBAL_OFFSET_TABLE_ + 80804: 39 8c 14 00 addi r12,r12,5120 + 80806: R_PPC_ADDR16_LO _GLOBAL_OFFSET_TABLE_ + 80808: 80 0c 00 08 lwz r0,8\(r12\) + 8080c: 7c 09 03 a6 mtctr r0 + 80810: 81 8c 00 04 lwz r12,4\(r12\) + 80814: 4e 80 04 20 bctr + 80818: 60 00 00 00 nop + 8081c: 60 00 00 00 nop + 80820: 3d 80 00 08 lis r12,8 + 80822: R_PPC_ADDR16_HA _GLOBAL_OFFSET_TABLE_\+0xc + 80824: 81 8c 14 0c lwz r12,5132\(r12\) + 80826: R_PPC_ADDR16_LO _GLOBAL_OFFSET_TABLE_\+0xc + 80828: 7d 89 03 a6 mtctr r12 + 8082c: 4e 80 04 20 bctr + 80830: 39 60 00 00 li r11,0 + 80834: 4b ff ff cc b 80800 <_PROCEDURE_LINKAGE_TABLE_> + 80838: 60 00 00 00 nop + 8083c: 60 00 00 00 nop + 80840: 3d 80 00 08 lis r12,8 + 80842: R_PPC_ADDR16_HA _GLOBAL_OFFSET_TABLE_\+0x10 + 80844: 81 8c 14 10 lwz r12,5136\(r12\) + 80846: R_PPC_ADDR16_LO _GLOBAL_OFFSET_TABLE_\+0x10 + 80848: 7d 89 03 a6 mtctr r12 + 8084c: 4e 80 04 20 bctr + 80850: 39 60 00 01 li r11,1 + 80854: 4b ff ff ac b 80800 <_PROCEDURE_LINKAGE_TABLE_> + 80858: 60 00 00 00 nop + 8085c: 60 00 00 00 nop +Disassembly of section \.text: + +00080c00 <_start>: + 80c00: 4b ff fc 41 bl 80840 <_PROCEDURE_LINKAGE_TABLE_\+0x40> + 80c00: R_PPC_PLTREL24 \.plt\+0x40 + 80c04: 48 00 00 09 bl 80c0c + 80c04: R_PPC_PLTREL24 sexternal + 80c08: 4b ff fc 19 bl 80820 <_PROCEDURE_LINKAGE_TABLE_\+0x20> + 80c08: R_PPC_PLTREL24 \.plt\+0x20 + +00080c0c : + 80c0c: 4e 80 00 20 blr diff --git a/ld/testsuite/ld-powerpc/vxworks1.ld b/ld/testsuite/ld-powerpc/vxworks1.ld new file mode 100644 index 0000000..540e0eb --- /dev/null +++ b/ld/testsuite/ld-powerpc/vxworks1.ld @@ -0,0 +1,27 @@ +SECTIONS +{ + . = 0x80000; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + + . = ALIGN (0x400); + .rela.dyn : { *(.rela.dyn) } + .rela.plt : { *(.rela.plt) } + + . = ALIGN (0x400); + .plt : { *(.plt) } + + . = ALIGN (0x400); + .text : { *(.text) } + + . = ALIGN (0x1000); + .dynamic : { *(.dynamic) } + + . = ALIGN (0x400); + .got : { *(.got.plt) *(.got) } + + . = ALIGN (0x400); + .bss : { *(.bss) } +} diff --git a/ld/testsuite/ld-powerpc/vxworks1.rd b/ld/testsuite/ld-powerpc/vxworks1.rd new file mode 100644 index 0000000..fd14cfe --- /dev/null +++ b/ld/testsuite/ld-powerpc/vxworks1.rd @@ -0,0 +1,22 @@ + +Relocation section '\.rela\.plt' at offset .* contains 2 entries: + Offset Info Type Sym\.Value Sym\. Name \+ Addend +0008140c .*15 R_PPC_JMP_SLOT 00080820 sglobal \+ 0 +00081410 .*15 R_PPC_JMP_SLOT 00080840 foo \+ 0 + +Relocation section '\.rela\.text' at offset .* contains 3 entries: + Offset Info Type Sym\.Value Sym\. Name \+ Addend +00080c00 .*12 R_PPC_PLTREL24 00080800 \.plt \+ 40 +00080c04 .*12 R_PPC_PLTREL24 00080c0c sexternal \+ 0 +00080c08 .*12 R_PPC_PLTREL24 00080800 \.plt \+ 20 + +Relocation section '\.rela\.plt\.unloaded' at offset .* contains 8 entries: + Offset Info Type Sym\.Value Sym\. Name \+ Addend +00080802 .*06 R_PPC_ADDR16_HA 00081400 _GLOBAL_OFFSET_TABLE_ \+ 0 +00080806 .*04 R_PPC_ADDR16_LO 00081400 _GLOBAL_OFFSET_TABLE_ \+ 0 +00080822 .*06 R_PPC_ADDR16_HA 00081400 _GLOBAL_OFFSET_TABLE_ \+ c +00080826 .*04 R_PPC_ADDR16_LO 00081400 _GLOBAL_OFFSET_TABLE_ \+ c +0008140c .*01 R_PPC_ADDR32 00080800 _PROCEDURE_LINKAGE_TAB.* \+ 30 +00080842 .*06 R_PPC_ADDR16_HA 00081400 _GLOBAL_OFFSET_TABLE_ \+ 10 +00080846 .*04 R_PPC_ADDR16_LO 00081400 _GLOBAL_OFFSET_TABLE_ \+ 10 +00081410 .*01 R_PPC_ADDR32 00080800 _PROCEDURE_LINKAGE_TAB.* \+ 50 diff --git a/ld/testsuite/ld-powerpc/vxworks1.s b/ld/testsuite/ld-powerpc/vxworks1.s new file mode 100644 index 0000000..cd54d57 --- /dev/null +++ b/ld/testsuite/ld-powerpc/vxworks1.s @@ -0,0 +1,14 @@ + .text + .globl _start + .type _start,@function +_start: + bl foo@plt + bl sexternal@plt + bl sglobal@plt + .size _start, .-_start + + .globl sexternal + .type sexternal,@function +sexternal: + blr + .size sexternal, .-sexternal -- cgit v1.1