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.
167 lines
3.6 KiB
ArmAsm
167 lines
3.6 KiB
ArmAsm
/* Force .got aligned to 4K, so it very likely gets at 0x804a100
|
|
(0x60 bytes .tdata and 0xa0 bytes .dynamic) */
|
|
.section ".tdata", "awT", @progbits
|
|
.balign 4096
|
|
.globl sg1, sg2, sg3, sg4, sg5, sg6, sg7, sg8
|
|
.globl sh1, sh2, sh3, sh4, sh5, sh6, sh7, sh8
|
|
.hidden sh1, sh2, sh3, sh4, sh5, sh6, sh7, sh8
|
|
sg1: .long 17
|
|
sg2: .long 18
|
|
sg3: .long 19
|
|
sg4: .long 20
|
|
sg5: .long 21
|
|
sg6: .long 22
|
|
sg7: .long 23
|
|
sg8: .long 24
|
|
sl1: .long 65
|
|
sl2: .long 66
|
|
sl3: .long 67
|
|
sl4: .long 68
|
|
sl5: .long 69
|
|
sl6: .long 70
|
|
sl7: .long 71
|
|
sl8: .long 72
|
|
sh1: .long 257
|
|
sh2: .long 258
|
|
sh3: .long 259
|
|
sh4: .long 260
|
|
sh5: .long 261
|
|
sh6: .long 262
|
|
sh7: .long 263
|
|
sh8: .long 264
|
|
/* Force .text aligned to 4K, so it very likely gets at 0x8049000. */
|
|
.text
|
|
.balign 4096
|
|
.globl fn2
|
|
.type fn2,@function
|
|
fn2:
|
|
pushl %ebp
|
|
movl %esp, %ebp
|
|
pushl %ebx
|
|
pushl %eax
|
|
call 1f
|
|
1: popl %ebx
|
|
addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> IE because variable is not defined in executable */
|
|
leal sG1@tlsgd(,%ebx,1), %eax
|
|
call ___tls_get_addr@plt
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> IE because variable is not defined in executable where
|
|
the variable is referenced through @gottpoff too */
|
|
leal sG2@tlsgd(,%ebx,1), %eax
|
|
call ___tls_get_addr@plt
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> IE because variable is not defined in executable where
|
|
the variable is referenced through @gotntpoff too */
|
|
leal sG3@tlsgd(,%ebx,1), %eax
|
|
call ___tls_get_addr@plt
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> IE because variable is not defined in executable where
|
|
the variable is referenced through @gottpoff and @gotntpoff too */
|
|
leal sG4@tlsgd(,%ebx,1), %eax
|
|
call ___tls_get_addr@plt
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> LE with global variable defined in executable */
|
|
leal sg1@tlsgd(,%ebx,1), %eax
|
|
call ___tls_get_addr@plt
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> LE with local variable defined in executable */
|
|
leal sl1@tlsgd(,%ebx,1), %eax
|
|
call ___tls_get_addr@plt
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> LE with hidden variable defined in executable */
|
|
leal sh1@tlsgd(,%ebx,1), %eax
|
|
call ___tls_get_addr@plt
|
|
nop;nop;nop;nop
|
|
|
|
/* LD -> LE */
|
|
leal sl1@tlsldm(%ebx), %eax
|
|
call ___tls_get_addr@PLT
|
|
nop;nop
|
|
leal sl1@dtpoff(%eax), %edx
|
|
nop;nop
|
|
leal sl2@dtpoff(%eax), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* LD -> LE against hidden variables */
|
|
leal sh1@tlsldm(%ebx), %eax
|
|
call ___tls_get_addr@PLT
|
|
nop;nop
|
|
leal sh1@dtpoff(%eax), %edx
|
|
nop;nop
|
|
leal sh2@dtpoff(%eax), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gottpoff IE against global var */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
subl sG2@gottpoff(%ebx), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gottpoff IE against global var */
|
|
movl %gs:0, %eax
|
|
nop;nop
|
|
subl sG4@gottpoff(%ebx), %eax
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE against global var */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
addl sG3@gotntpoff(%ebx), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE against global var */
|
|
movl %gs:0, %eax
|
|
nop;nop
|
|
addl sG4@gotntpoff(%ebx), %eax
|
|
nop;nop;nop;nop
|
|
|
|
/* @gottpoff IE -> LE against global var defined in exec */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
subl sg1@gottpoff(%ebx), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE -> LE against local var */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
addl sl1@gotntpoff(%ebx), %eax
|
|
nop;nop;nop;nop
|
|
|
|
/* @gottpoff IE -> LE against hidden var */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
subl sh1@gottpoff(%ebx), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* Direct access through %gs */
|
|
|
|
/* @gotntpoff IE against global var */
|
|
movl sG5@gotntpoff(%ebx), %ecx
|
|
nop;nop
|
|
movl %gs:(%ecx), %edx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE->LE against local var */
|
|
movl sl5@gotntpoff(%ebx), %eax
|
|
nop;nop
|
|
movl %gs:(%eax), %edx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE->LE against hidden var */
|
|
movl sh5@gotntpoff(%ebx), %edx
|
|
nop;nop
|
|
movl %gs:(%edx), %edx
|
|
nop;nop;nop;nop
|
|
|
|
movl -4(%ebp), %ebx
|
|
leave
|
|
ret
|