From bffbf9406ff7c4c8545d3f154e54926e5f37a9bb Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 27 Sep 2002 19:29:18 +0000 Subject: bfd/ * reloc.c: Add x86-64 TLS relocs. * bfd-in2.h, libbfd.h: Rebuilt. * elf64-x86-64.c (x86_64_elf_howto): Fix size fields for 32-bit relocs. Add TLS relocs. (x86_64_reloc_map): Add TLS relocs. (elf64_x86_64_info_to_howto): Adjust for added TLS relocs. (struct elf64_x86_64_link_hash_entry): Add tls_type field. (GOT_UNKNOWN, GOT_NORMAL, GOT_TLS_GD, GOT_TLS_IE): Define. (elf64_x86_64_hash_entry): Define. (struct elf64_x86_64_obj_tdata): New. (elf64_x86_64_tdata, elf64_x86_64_local_got_tls_type): Define. (struct elf64_x86_64_link_hash_table): Add tls_ld_got. (link_hash_newfunc): Initialize tls_type. (elf64_x86_64_link_hash_table_create): Initialize tls_ld_got. (elf64_x86_64_copy_indirect_symbol): Swap tls_type if necessary. (elf64_x86_64_mkobject): New. (elf64_x86_64_elf_object_p): Allocate struct elf64_x86_64_obj_tdata. (elf64_x86_64_tls_transition): New. (elf64_x86_64_check_relocs): Add r_type variable and use it. Handle TLS relocs. (elf64_x86_64_gc_sweep_hook): Handle TLS relocs. (allocate_dynrelocs): Allocate GOT space for TLS relocs. (elf64_x86_64_size_dynamic_sections): Likewise. (dtpoff_base, tpoff): New. (elf64_x86_64_relocate_section): Handle TLS relocs. (elf64_x86_64_finish_dynamic_symbol): Only handle non-TLS GOT entries. (bfd_elf64_mkobject): Define. * elf32-i386.c (elf_i386_check_relocs) [R_386_TLS_LE]: Set DF_STATIC_TLS if shared. gas/ * config/tc-i386.c (tc_i386_fix_adjustable): Add x86-64 TLS relocs. Define them if not BFD_ASSEMBLER. (lex_got): Handle @tlsgd, @dtpoff and @tpoff in 64-bit mode, add @tlsld. (md_apply_fix3): No addend for BFD_RELOC_X86_64_TLSGD, BFD_RELOC_X86_64_TLSLD and BFD_RELOC_X86_64_GOTTPOFF. (tc_gen_reloc): Handle x86-64 TLS relocs. include/ * elf/x86-64.h: Add TLS relocs. ld/testsuite/ * lib/ld-lib.exp (run_ld_link_tests): Add. * ld-sh/sh64/sh64.exp (run_ld_link_tests, regexp_diff, file_contents): Remove. (sh64tests): Add 6th field to the tests array. * ld-i386/i386.exp (run_ld_link_tests): Remove. * ld-x86-64/x86-64.exp: New. * ld-x86-64/tlsbin.dd: New test. * ld-x86-64/tlsbinpic.s: New test. * ld-x86-64/tlsbin.rd: New test. * ld-x86-64/tlsbin.s: New test. * ld-x86-64/tlsbin.sd: New test. * ld-x86-64/tlsbin.td: New test. * ld-x86-64/tlslib.s: New test. * ld-x86-64/tlspic1.s: New test. * ld-x86-64/tlspic2.s: New test. * ld-x86-64/tlspic.dd: New test. * ld-x86-64/tlspic.rd: New test. * ld-x86-64/tlspic.sd: New test. * ld-x86-64/tlspic.td: New test. --- ld/testsuite/ld-i386/i386.exp | 129 +----------------------------------------- 1 file changed, 1 insertion(+), 128 deletions(-) (limited to 'ld/testsuite/ld-i386') diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 09526f8..4ccb9f6 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -1,5 +1,5 @@ # Expect script for ld-i386 tests -# Copyright (C) 2000, 2001, 2002 Free Software Foundation +# Copyright (C) 2002 Free Software Foundation # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,11 +26,6 @@ if { !([istarget "i?86-*-elf*"] return } -# FIXME: This isn't set by testsuite/config/default.exp; make it. -if ![info exists readelf] then { - set readelf [findfile $base_dir/../binutils/readelf] -} - # List contains test-items with 3 items followed by 2 lists: # 0:name 1:ld options 2:assembler options # 3:filenames of assembler files 4: action and options. 5: name of output file @@ -59,126 +54,4 @@ set i386tests { {objdump -sj.got tlsnopic.sd}} "libtlsnopic.so"} } -# FIXME: Generalize and move this to ld-lib.exp - -proc run_ld_link_tests { ldtests } { - global ld - global as - global nm - global objdump - global readelf - global srcdir - global subdir - global env - - foreach testitem $ldtests { - set testname [lindex $testitem 0] - set ld_options [lindex $testitem 1] - set as_options [lindex $testitem 2] - set as_files [lindex $testitem 3] - set actions [lindex $testitem 4] - set binfile tmpdir/[lindex $testitem 5] - set objfiles {} - set is_unresolved 0 - set failed 0 - -# verbose -log "Testname is $testname" -# verbose -log "ld_options is $ld_options" -# verbose -log "as_options is $as_options" -# verbose -log "as_files is $as_files" -# verbose -log "actions is $actions" -# verbose -log "binfile is $binfile" - - # Assemble each file in the test. - foreach as_file $as_files { - set objfile "tmpdir/[file rootname $as_file].o" - lappend objfiles $objfile - - if ![ld_assemble $as "$as_options $srcdir/$subdir/$as_file" $objfile] { - set is_unresolved 1 - break - } - } - - # Catch assembler errors. - if { $is_unresolved != 0 } { - unresolved $testname - continue - } - - if ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles"] { - fail $testname - } else { - set failed 0 - foreach actionlist $actions { - set action [lindex $actionlist 0] - set progopts [lindex $actionlist 1] - - # There are actions where we run regexp_diff on the - # output, and there are other actions (presumably). - # Handling of the former look the same. - set dump_prog "" - switch -- $action { - objdump - { set dump_prog $objdump } - nm - { set dump_prog $nm } - readelf - { set dump_prog $readelf } - default - { - perror "Unrecognized action $action" - set is_unresolved 1 - break - } - } - - if { $dump_prog != "" } { - set dumpfile [lindex $actionlist 2] - set binary $dump_prog - - # Ensure consistent sorting of symbols - if {[info exists env(LC_ALL)]} { - set old_lc_all $env(LC_ALL) - } - set env(LC_ALL) "C" - set cmd "$binary $progopts $binfile > dump.out" - send_log "$cmd\n" - catch "exec $cmd" comp_output - if {[info exists old_lc_all]} { - set env(LC_ALL) $old_lc_all - } else { - unset env(LC_ALL) - } - set comp_output [prune_warnings $comp_output] - - if ![string match "" $comp_output] then { - send_log "$comp_output\n" - set failed 1 - break - } - - if { [regexp_diff "dump.out" "$srcdir/$subdir/$dumpfile"] } then { - verbose "output is [file_contents "dump.out"]" 2 - set failed 1 - break - } - } - } - - if { $failed != 0 } { - fail $testname - } else { if { $is_unresolved == 0 } { - pass $testname - } } - } - - # Catch action errors. - if { $is_unresolved != 0 } { - unresolved $testname - continue - } - } -} - run_ld_link_tests $i386tests -- cgit v1.1