8c37241be3
* elflink.c (elf_bfd_final_link): Don't output STT_SECTION symbol
into .dynsym if elf_section_data (sec)->dynindx <= 0.
Adjust counting of last_local.
(_bfd_elf_link_renumber_dynsyms): Don't assign dynindx to sections
other than SHT_PROGBITS/SHT_NOBITS and neither for .got/.got.plt/.plt
created by the linker nor !SHF_ALLOC.
* elf32-i386.c (elf_i386_finish_dynamic_sections): Point
DT_PLTGOT to the start of the .got.plt section instead of the
.got output section. Set sh_entsize for .got section in addition
to .got.plt.
(elf_i386_relocate_section): Don't assume _GLOBAL_OFFSET_TABLE_
is at sgot->output_section->vma.
* elf64-x86-64.c (elf64_x86_64_finish_dynamic_sections): Point
DT_PLTGOT to the start of the .got.plt section instead of the
.got output section.
(elf64_x86_64_relocate_section): Don't assume _GLOBAL_OFFSET_TABLE_
is at sgot->output_section->vma. Set sh_entsize for .got section
in addition to .got.plt.
* elf.c (_bfd_elf_print_private_bfd_data): Handle PT_GNU_RELRO.
(bfd_section_from_phdr): Likewise.
(map_sections_to_segments): Likewise.
(assign_file_positions_for_segments): Likewise.
(get_program_header_size): Likewise.
* elflink.c (bfd_elf_size_dynamic_sections): Set
elf_tdata (output_bfd)->relro from info->relro.
* elf-bfd.h (struct elf_obj_tdata): Add relro field.
include/
* bfdlink.h (struct bfd_link_info): Add relro, relro_start and
relro_end fields.
* elf/common.h (PT_GNU_EH_FRAME, PT_GNU_STACK): Add comments.
(PT_GNU_RELRO): Define.
binutils/
* readelf.c (get_segment_type): Handle PT_GNU_RELRO.
ld/
* genscripts.sh: Generate -z combreloc -z now -z relro scripts
for binaries, -shared and -pie.
* emulparams/elf_i386.sh (SEPARATE_GOTPLT): Set.
* emulparams/elf_x86_64.sh (SEPARATE_GOTPLT): Set.
* emulparams/elf32ppc.sh (OTHER_READWRITE_SECTIONS): Rename to...
(OTHER_RELRO_SECTIONS): ... this.
* ldlex.l (DATA_SEGMENT_RELRO_END): Add.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z relro and -z norelro.
(gld${EMULATION_NAME}_list_options): Add it to usage.
(gld${EMULATION_NAME}_get_script): Return -z combreloc -z now
-z relro scripts when appropriate.
* scripttempl/elf.sc: Unset SEPARATE_GOTPLT if RELRO_NOW is set.
Create separate .got.plt section if SEPARATE_GOTPLT.
Move sections which are only written during relocation handling
to the beginning of RW segment. If NO_SMALL_DATA, move .got
before .data. Add DATA_SEGMENT_RELRO_END directive.
Include OTHER_RELRO_SECTIONS.
* ldgram.y (DATA_SEGMENT_RELRO_END): Add.
* ldexp.c (exp_print_token): Handle DATA_SEGMENT_RELRO_END.
(fold_unary): Likewise.
(fold_binary): Handle -z relro.
* ldexp.h (struct exp_data_seg): Add exp_dataseg_relro_seen and
exp_dataseg_relro_adjust phases. Add relro_end field.
* ldmain.c (main): Initialize link_info.relro to FALSE.
* ldlang.c (lang_size_sections): Handle -z relro.
ld/testsuite/
* ld-i386/tlspic.rd: Adjust for section reordering changes
and removal of unneeded STT_SECTION symbols from .dynsym.
* ld-i386/tlspic.dd: Likewise.
* ld-i386/tlspic.sd: Likewise.
* ld-i386/tlsbin.rd: Likewise.
* ld-i386/tlsbinpic.s: Likewise.
* ld-i386/tlsbin.dd: Likewise.
* ld-i386/tlsbin.sd: Likewise.
* ld-i386/tlsnopic.rd: Likewise.
* ld-i386/tlsnopic1.s: Likewise.
* ld-i386/combreloc.d: Likewise.
* ld-i386/tlsnopic.dd: Likewise.
* ld-i386/tlsnopic.sd: Likewise.
* ld-x86-64/tlspic.rd: Likewise.
* ld-x86-64/tlspic.dd: Likewise.
* ld-x86-64/tlsbin.dd: Likewise.
* ld-x86-64/tlspic.sd: Likewise.
* ld-x86-64/tlsbin.sd: Likewise.
* ld-x86-64/tlspic.td: Likewise.
* ld-x86-64/tlsbin.td: Likewise.
* ld-x86-64/tlsbin.rd: Likewise.
* ld-s390/tlspic1.s: Likewise.
* ld-s390/tlsbinpic.s: Likewise.
* ld-s390/tlspic.rd: Likewise.
* ld-s390/tlsbin.rd: Likewise.
* ld-s390/tlspic.dd: Likewise.
* ld-s390/tlsbin.dd: Likewise.
* ld-s390/tlsbin.sd: Likewise.
* ld-s390/tlsbin.td: Likewise.
* ld-s390/tlspic.sd: Likewise.
* ld-s390/tlspic.td: Likewise.
* ld-s390/tlspic1_64.s: Likewise.
* ld-s390/tlsbinpic_64.s: Likewise.
* ld-s390/tlspic_64.rd: Likewise.
* ld-s390/tlsbin_64.rd: Likewise.
* ld-s390/tlspic_64.dd: Likewise.
* ld-s390/tlsbin_64.dd: Likewise.
* ld-s390/tlspic_64.sd: Likewise.
* ld-s390/tlspic_64.td: Likewise.
* ld-s390/tlsbin_64.td: Likewise.
* ld-s390/tlsbin_64.sd: Likewise.
* ld-powerpc/tlsexe32.r: Likewise.
* ld-powerpc/tlsso32.r: Likewise.
* ld-powerpc/tlsso32.d: Likewise.
* ld-powerpc/tlsso32.g: Likewise.
* ld-powerpc/tlsso32.t: Likewise.
* ld-powerpc/tlsexe.r: Likewise.
* ld-powerpc/tlsso.r: Likewise.
* ld-powerpc/tlsso.g: Likewise.
* ld-powerpc/tlsexetoc.r: Likewise.
* ld-powerpc/tlstocso.r: Likewise.
* ld-powerpc/tlstocso.g: Likewise.
* ld-ia64/tlspic.rd: Likewise.
* ld-ia64/tlspic.dd: Likewise.
* ld-ia64/tlspic.sd: Likewise.
* ld-ia64/tlspic.td: Likewise.
* ld-ia64/tlsbin.rd: Likewise.
* ld-ia64/tlsbin.sd: Likewise.
* ld-ia64/tlsbin.td: Likewise.
* ld-elfvsb/elfvsb.exp: XFAIL non-PIC load offset tests on s390x.
* ld-shared/shared.exp: Likewise.
223 lines
9.3 KiB
Text
223 lines
9.3 KiB
Text
#source: tlsbinpic_64.s
|
|
#source: tlsbin_64.s
|
|
#as: -m64 -Aesame
|
|
#ld: -shared -melf64_s390
|
|
#objdump: -dzrj.text
|
|
#target: s390x-*-*
|
|
|
|
# PT_TLS layout is:
|
|
# Offset from Offset from Name
|
|
# TCB base TCB end
|
|
# 0x00 -0xa0 sg1..sg2
|
|
# 0x20 -0x80 sl1..sl2
|
|
# 0x40 -0x60 sh1..sh2
|
|
# 0x60 -0x40 bg1..bg2
|
|
# 0x80 -0x20 bl1..bl2
|
|
|
|
.*: +file format elf64-s390
|
|
|
|
Disassembly of section .text:
|
|
|
|
0+[0-9a-f]+ <fn2>:
|
|
# function prolog
|
|
+[0-9a-f]+: eb 6e f0 30 00 24 stmg %r6,%r14,48\(%r15\)
|
|
+[0-9a-f]+: a7 d5 00 3e bras %r13,[0-9a-f]+ <fn2\+0x82>
|
|
# sG1@tlsgd
|
|
+[0-9a-f]+: 00 00 00 00 .long 0x00000000
|
|
+[0-9a-f]+: 00 00 00 60 .long 0x00000060
|
|
# sG2@tlsgd
|
|
+[0-9a-f]+: 00 00 00 00 .long 0x00000000
|
|
+[0-9a-f]+: 00 00 00 48 .long 0x00000048
|
|
# sg1@tlsgd
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff 60 .long 0xffffff60
|
|
# sl1@tlsgd
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff 80 .long 0xffffff80
|
|
# sh1@tlsgd
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff a0 .long 0xffffffa0
|
|
# sl1@tlsldm
|
|
+[0-9a-f]+: 00 00 00 00 .long 0x00000000
|
|
+[0-9a-f]+: 00 00 00 00 .long 0x00000000
|
|
# sl1@dtpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff 80 .long 0xffffff80
|
|
# sl2@dtpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff 84 .long 0xffffff84
|
|
# sh1@tlsldm
|
|
+[0-9a-f]+: 00 00 00 00 .long 0x00000000
|
|
+[0-9a-f]+: 00 00 00 00 .long 0x00000000
|
|
# sh1@dtpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff a0 .long 0xffffffa0
|
|
# sh2@dtpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff a4 .long 0xffffffa4
|
|
# sG2@gotntpoff
|
|
+[0-9a-f]+: 00 00 00 00 .long 0x00000000
|
|
+[0-9a-f]+: 00 00 00 48 .long 0x00000048
|
|
# sg1@gotntpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff 60 .long 0xffffff60
|
|
# sl1@gotntpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff 80 .long 0xffffff80
|
|
# sh1@gotntpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff a0 .long 0xffffffa0
|
|
# function prolog
|
|
+[0-9a-f]+: b9 04 00 ef lgr %r14,%r15
|
|
+[0-9a-f]+: a7 fb ff 60 aghi %r15,-160
|
|
+[0-9a-f]+: c0 c0 [0-9a-f ]+ larl %r12,[0-9a-f]+ <_GLOBAL_OFFSET_TABLE_>
|
|
+[0-9a-f]+: e3 e0 e0 00 00 24 stg %r14,0\(%r14\)
|
|
# extract TCB
|
|
+[0-9a-f]+: b2 4f 00 90 ear %r9,%a0
|
|
+[0-9a-f]+: eb 94 00 20 00 0d sllg %r9,%r4,32
|
|
+[0-9a-f]+: b2 4f 00 91 ear %r9,%a1
|
|
# GD -> IE because variable is not defined in executable
|
|
+[0-9a-f]+: e3 c0 d0 00 00 04 lg %r12,0\(%r13\)
|
|
+[0-9a-f]+: e3 22 c0 00 00 04 lg %r2,0\(%r2,%r12\)
|
|
+[0-9a-f]+: 41 22 90 00 la %r2,0\(%r2,%r9\)
|
|
# GD -> IE because variable is not defined in executable where
|
|
# the variable is referenced through IE too
|
|
+[0-9a-f]+: e3 20 d0 08 00 04 lg %r2,8\(%r13\)
|
|
+[0-9a-f]+: e3 22 c0 00 00 04 lg %r2,0\(%r2,%r12\)
|
|
+[0-9a-f]+: 41 22 90 00 la %r2,0\(%r2,%r9\)
|
|
# GD -> LE with global variable defined in executable
|
|
+[0-9a-f]+: e3 20 d0 10 00 04 lg %r2,16\(%r13\)
|
|
+[0-9a-f]+: c0 04 00 00 00 00 brcl 0,[0-9a-f]+ <fn2\+0xca>
|
|
+[0-9a-f]+: 41 22 90 00 la %r2,0\(%r2,%r9\)
|
|
# GD -> LE with local variable defined in executable
|
|
+[0-9a-f]+: e3 20 d0 18 00 04 lg %r2,24\(%r13\)
|
|
+[0-9a-f]+: c0 04 00 00 00 00 brcl 0,[0-9a-f]+ <fn2\+0xda>
|
|
+[0-9a-f]+: 41 22 90 00 la %r2,0\(%r2,%r9\)
|
|
# GD -> LE with hidden variable defined in executable
|
|
+[0-9a-f]+: e3 20 d0 20 00 04 lg %r2,32\(%r13\)
|
|
+[0-9a-f]+: c0 04 00 00 00 00 brcl 0,[0-9a-f]+ <fn2\+0xea>
|
|
+[0-9a-f]+: 41 22 90 00 la %r2,0\(%r2,%r9\)
|
|
# LD -> LE
|
|
+[0-9a-f]+: e3 20 d0 28 00 04 lg %r2,40\(%r13\)
|
|
+[0-9a-f]+: c0 04 00 00 00 00 brcl 0,[0-9a-f]+ <fn2\+0xfa>
|
|
+[0-9a-f]+: 41 32 90 00 la %r3,0\(%r2,%r9\)
|
|
+[0-9a-f]+: e3 40 d0 30 00 04 lg %r4,48\(%r13\)
|
|
+[0-9a-f]+: 41 54 30 00 la %r5,0\(%r4,%r3\)
|
|
+[0-9a-f]+: e3 40 d0 38 00 04 lg %r4,56\(%r13\)
|
|
+[0-9a-f]+: 41 54 30 00 la %r5,0\(%r4,%r3\)
|
|
+[0-9a-f]+: e3 20 d0 40 00 04 lg %r2,64\(%r13\)
|
|
+[0-9a-f]+: c0 04 00 00 00 00 brcl 0,[0-9a-f]+ <fn2\+0x11e>
|
|
+[0-9a-f]+: 41 32 90 00 la %r3,0\(%r2,%r9\)
|
|
+[0-9a-f]+: e3 40 d0 48 00 04 lg %r4,72\(%r13\)
|
|
+[0-9a-f]+: 41 54 30 00 la %r5,0\(%r4,%r3\)
|
|
+[0-9a-f]+: e3 40 d0 50 00 04 lg %r4,80\(%r13\)
|
|
+[0-9a-f]+: 41 54 30 00 la %r5,0\(%r4,%r3\)
|
|
# IE against global var
|
|
+[0-9a-f]+: e3 30 d0 58 00 04 lg %r3,88\(%r13\)
|
|
+[0-9a-f]+: e3 33 c0 00 00 04 lg %r3,0\(%r3,%r12\)
|
|
+[0-9a-f]+: 41 33 90 00 la %r3,0\(%r3,%r9\)
|
|
# IE -> LE against global var defined in exec
|
|
+[0-9a-f]+: e3 30 d0 60 00 04 lg %r3,96\(%r13\)
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# IE -> LE against local var
|
|
+[0-9a-f]+: e3 30 d0 68 00 04 lg %r3,104\(%r13\)
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# IE -> LE against hidden var
|
|
+[0-9a-f]+: e3 30 d0 70 00 04 lg %r3,112\(%r13\)
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# IE against global var with larl got access
|
|
+[0-9a-f]+: c0 30 [0-9a-f ]+ larl %r3,[0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x28>
|
|
+[0-9a-f]+: e3 33 c0 00 00 04 lg %r3,0\(%r3,%r12\)
|
|
+[0-9a-f]+: 41 33 90 00 la %r3,0\(%r3,%r9\)
|
|
# IE against global var defined in exec with larl got access
|
|
+[0-9a-f]+: c0 30 [0-9a-f ]+ larl %r3,[0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x38>
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# IE against local var with larl got access
|
|
+[0-9a-f]+: c0 30 [0-9a-f ]+ larl %r3,[0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x20>
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# IE against hidden var with larl got access
|
|
+[0-9a-f]+: c0 30 [0-9a-f ]+ larl %r3,[0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x40>
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# IE against global var with small got access (no optimization)
|
|
+[0-9a-f]+: e3 30 c0 28 00 04 lg %r3,40\(%r12\)
|
|
+[0-9a-f]+: 41 33 90 00 la %r3,0\(%r3,%r9\)
|
|
# IE against global var defined in exec with small got access
|
|
# (no optimization)
|
|
+[0-9a-f]+: e3 30 c0 38 00 04 lg %r3,56\(%r12\)
|
|
+[0-9a-f]+: 41 33 90 00 la %r3,0\(%r3,%r9\)
|
|
# IE against local var with small got access (no optimization)
|
|
+[0-9a-f]+: e3 30 c0 20 00 04 lg %r3,32\(%r12\)
|
|
+[0-9a-f]+: 41 33 90 00 la %r3,0\(%r3,%r9\)
|
|
# IE against hidden var with small got access (no optimization)
|
|
+[0-9a-f]+: e3 30 c0 40 00 04 lg %r3,64\(%r12\)
|
|
+[0-9a-f]+: 41 33 90 00 la %r3,0\(%r3,%r9\)
|
|
# function epilog
|
|
+[0-9a-f]+: eb 6e f0 d0 00 04 lmg %r6,%r14,208\(%r15\)
|
|
+[0-9a-f]+: 07 fe br %r14
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|
|
|
|
0+[0-9a-f]+ <_start>:
|
|
# function prolog
|
|
+[0-9a-f]+: 90 6e f0 18 stm %r6,%r14,24\(%r15\)
|
|
+[0-9a-f]+: a7 d5 00 16 bras %r13,[0-9a-f]+ <_start\+0x30>
|
|
# sG6@indntpoff
|
|
+[0-9a-f]+: 00 00 00 00 .long 0x00000000
|
|
+[0-9a-f]+: 80 00 [0-9a-f ]+ ssm [0-9]+\(%r1\)
|
|
# bg6@indntpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff d4 .long 0xffffffd4
|
|
# bl6@indntpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff f4 .long 0xfffffff4
|
|
# sh6@indntpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff b4 .long 0xffffffb4
|
|
# sg3@indntpoff
|
|
+[0-9a-f]+: ff ff ff ff .long 0xffffffff
|
|
+[0-9a-f]+: ff ff ff 68 .long 0xffffff68
|
|
# function prolog
|
|
+[0-9a-f]+: b9 04 00 ef lgr %r14,%r15
|
|
+[0-9a-f]+: a7 fb ff 60 aghi %r15,-160
|
|
+[0-9a-f]+: e3 e0 e0 00 00 24 stg %r14,0\(%r14\)
|
|
# extract TCB
|
|
+[0-9a-f]+: b2 4f 00 90 ear %r9,%a0
|
|
+[0-9a-f]+: eb 94 00 20 00 0d sllg %r9,%r4,32
|
|
+[0-9a-f]+: b2 4f 00 91 ear %r9,%a1
|
|
# IE against global var
|
|
+[0-9a-f]+: e3 30 d0 00 00 04 lg %r3,0\(%r13\)
|
|
+[0-9a-f]+: e3 33 c0 00 00 04 lg %r3,0\(%r3,%r12\)
|
|
+[0-9a-f]+: 41 33 90 00 la %r3,0\(%r3,%r9\)
|
|
# IE -> LE against global var defined in exec
|
|
+[0-9a-f]+: e3 30 d0 08 00 04 lg %r3,8\(%r13\)
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# IE -> LE against local var
|
|
+[0-9a-f]+: e3 30 d0 10 00 04 lg %r3,16\(%r13\)
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# IE -> LE against hidden but not local var
|
|
+[0-9a-f]+: e3 30 d0 18 00 04 lg %r3,24\(%r13\)
|
|
+[0-9a-f]+: eb 43 00 00 00 0d sllg %r4,%r3,0
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# LE, global var defined in exec
|
|
+[0-9a-f]+: e3 40 d0 20 00 04 lg %r4,32\(%r13\)
|
|
+[0-9a-f]+: 41 54 90 00 la %r5,0\(%r4,%r9\)
|
|
# function epilog
|
|
+[0-9a-f]+: eb 6e f0 d0 00 04 lmg %r6,%r14,208\(%r15\)
|
|
+[0-9a-f]+: 07 fe br %r14
|
|
+[0-9a-f]+: 07 07 bcr 0,%r7
|