5a68afcf73
2012-04-03 Roland McGrath <mcgrathr@google.com> * elf-nacl.c: New file. * elf-nacl.h: New file. * elf32-i386.c (elf_backend_modify_segment_map): Define for bfd_elf32_i386_nacl_vec. (elf_backend_modify_program_headers): Likewise. * elf64-x86-64.c (elf_backend_modify_segment_map): Define for bfd_elf64_x86_64_nacl_vec and bfd_elf32_x86_64_nacl_vec. (elf_backend_modify_program_headers): Likewise. * Makefile.am (BFD32_BACKENDS, BFD64_BACKENDS): Add elf-nacl.lo here. (BFD32_BACKENDS_CFILES, BFD64_BACKENDS_CFILES): Add elf-nacl.c here. * Makefile.in: Regenerated. * configure.in (bfd_elf64_x86_64_nacl_vec): Add elf-nacl.o to tb here. (bfd_elf32_x86_64_nacl_vec): Likewise. (bfd_elf64_x86_64_vec, bfd_elf32_x86_64_vec): Likewise. (bfd_elf64_x86_64_freebsd_vec, bfd_elf64_x86_64_sol2_vec): Likewise. (bfd_elf64_l1om_vec, bfd_elf64_l1om_freebsd_vec): Likewise. (bfd_elf64_k1om_vec, bfd_elf64_k1om_freebsd_vec): Likewise. (bfd_elf32_i386_nacl_vec): Likewise. (bfd_elf32_i386_sol2_vec, bfd_elf32_i386_freebsd_vec): Likewise. (bfd_elf32_i386_vxworks_vec, bfd_elf32_i386_vec): Likewise. * configure: Regenerated. binutils/testsuite/ 2012-04-03 Roland McGrath <mcgrathr@google.com> * lib/binutils-common.exp (is_elf_format): Consider *-*-nacl* to be ELF too. * binutils-all/elfedit-4.d: Add "#as: --64" option. * binutils-all/i386/i386.exp: Accept nacl targets too. * binutils-all/x86-64/x86-64.exp: Likewise. gas/testsuite/ 2012-04-03 Roland McGrath <mcgrathr@google.com> * gas/i386/k1om.d: Add not-target match for *-*-nacl*. * gas/i386/l1om.d: Likewise. ld/ 2012-04-03 Roland McGrath <mcgrathr@google.com> * configure.tgt (i[3-7]86-*-nacl*, x86_64-*-nacl*): Handle them. * emulparams/elf_nacl.sh: New file. * emulparams/elf_i386_nacl.sh: New file. * emulparams/elf32_x86_64_nacl.sh: New file. * emulparams/elf_x86_64_nacl.sh: New file. * Makefile.am (ALL_EMULATION_SOURCES): Add eelf_i386_nacl.c here. (ALL_64_EMULATION_SOURCES): Add eelf32_x86_64_nacl.c and eelf_x86_64_nacl.c here. (eelf_i386_nacl.c, eelf32_x86_64_nacl.c, eelf_x86_64_nacl.c): New targets. * Makefile.in: Regenerated. * scripttempl/elf.sc: Handle SEPARATE_CODE cases. ld/testsuite/ 2012-04-03 Roland McGrath <mcgrathr@google.com> * ld-x86-64/ilp32-4-nacl.d: New file. * ld-x86-64/x86-64.exp: Run it. * ld-discard/discard.exp: Accept nacl targets too. * ld-elf/binutils.exp: Likewise. * ld-elf/comm-data.exp: Likewise. * ld-elf/elf.exp: Likewise. * ld-elf/tls_common.exp: Likewise. * ld-elfvers/vers.exp: Likewise. * ld-elfvsb/elfvsb.exp: Likewise. * ld-elfweak/elfweak.exp: Likewise. * ld-gc/gc.exp: Likewise. * ld-ifunc/binutils.exp: Likewise. * ld-ifunc/ifunc.exp: Likewise. * ld-linkonce/linkonce.exp:Likewise. * ld-pie/pie.exp: Likewise. * ld-shared/shared.exp: Likewise. * ld-undefined/weak-undef.exp: Likewise. * ld-unique/unique.exp: Likewise. * ld-x86-64/dwarfreloc.exp: Likewise. * ld-x86-64/line.exp: Likewise. * lib/ld-lib.exp (slurp_options): Support global array options_regsub to apply substitutions to the contents of options lines read from the file. * ld-i386/emit-relocs.d: Renamed to ... * ld-i386/emit-relocs.rd: ... this. * ld-i386/i386.exp: Accept nacl targets too. For them, use options_regsub to replace elf_i386 with elf_i386_nacl in run_dump_test cases; apply the same substitution in $i386tests; replace foo.rd expectations files with foo-nacl.rd in $i386tests. (i386tests): Change emit-relocs.d to emit-relocs.rd here. * ld-i386/emit-relocs-nacl.rd: New file. * ld-i386/plt-nacl.pd: New file. * ld-i386/plt-pic-nacl.pd: New file. * ld-i386/tlsbin-nacl.rd: New file. * ld-i386/tlsbindesc-nacl.rd: New file. * ld-i386/tlsdesc-nacl.rd: New file. * ld-i386/tlsgdesc-nacl.rd: New file. * ld-i386/tlsnopic-nacl.rd: New file. * ld-i386/tlspic-nacl.rd: New file. * ld-x86-64/x86-64.exp: Accept nacl targets too. For them, use options_regsub to replace elf_x86_64 with elf_x86_64_nacl in run_dump_test cases; apply the same substitution in $x86_64tests; replace foo.rd expectations files with foo-nacl.rd in $x86_64tests. Add explicit -melf_x86_64 to ld options in tests that need it, in case the default emulation is x32 (as it is for x86_64-nacl). * ld/testsuite/ld-x86-64/plt-nacl.pd: New file. * ld/testsuite/ld-x86-64/split-by-file-nacl.rd: New file. * ld/testsuite/ld-x86-64/tlsbin-nacl.rd: New file. * ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd: New file. * ld/testsuite/ld-x86-64/tlsdesc-nacl.pd: New file. * ld/testsuite/ld-x86-64/tlsdesc-nacl.rd: New file. * ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd: New file. * ld/testsuite/ld-x86-64/tlspic-nacl.rd: New file. * ld-i386/hidden2.d: Loosen regexps to match any file format variant, and not to depend on exact addresses, displacements, etc. where they are irrelevant. * ld-i386/pcrel16.d: Likewise. * ld-i386/pcrel16abs.d: Likewise. * ld-i386/pr12718.d: Likewise. * ld-i386/pr12921.d: Likewise. * ld-i386/reloc.d: Likewise. * ld-i386/tlsbin.dd: Likewise. * ld-i386/tlsbin.sd: Likewise. * ld-i386/tlsbin.td: Likewise. * ld-i386/tlsbindesc.dd: Likewise. * ld-i386/tlsbindesc.sd: Likewise. * ld-i386/tlsbindesc.td: Likewise. * ld-i386/tlsdesc.dd: Likewise. * ld-i386/tlsdesc.sd: Likewise. * ld-i386/tlsdesc.td: Likewise. * ld-i386/tlsg.sd: Likewise. * ld-i386/tlsgdesc.dd: Likewise. * ld-i386/tlsindntpoff.dd: Likewise. * ld-i386/tlsnopic.dd: Likewise. * ld-i386/tlsnopic.sd: Likewise. * ld-i386/tlspic.dd: Likewise. * ld-i386/tlspic.sd: Likewise. * ld-i386/tlspic.td: Likewise. * ld-i386/tlspie2.d: Likewise. * ld-x86-64/hidden2.d: Likewise. * ld-x86-64/pcrel16.d: Likewise. * ld-x86-64/pr12718.d: Likewise. * ld-x86-64/pr12921.d: Likewise. * ld-x86-64/protected3.d: Likewise. * ld-x86-64/tlsbin.dd: Likewise. * ld-x86-64/tlsbin.sd: Likewise. * ld-x86-64/tlsbin.td: Likewise. * ld-x86-64/tlsbindesc.dd: Likewise. * ld-x86-64/tlsbindesc.sd: Likewise. * ld-x86-64/tlsbindesc.td: Likewise. * ld-x86-64/tlsdesc.dd: Likewise. * ld-x86-64/tlsdesc.sd: Likewise. * ld-x86-64/tlsdesc.td: Likewise. * ld-x86-64/tlsg.sd: Likewise. * ld-x86-64/tlsgd5.dd: Likewise. * ld-x86-64/tlsgd6.dd: Likewise. * ld-x86-64/tlsgdesc.dd: Likewise. * ld-x86-64/tlspic.dd: Likewise. * ld-x86-64/tlspic.sd: Likewise. * ld-x86-64/tlspic.td: Likewise. * ld-x86-64/ilp32-8.d: Match any file format variant. Use a -Ttext and adjust expected results, to handle variant layouts. * ld-x86-64/ilp32-9.d: Likewise. * ld-i386/alloc.t: Remove superfluous OUTPUT_FORMAT statement. * ld-i386/pr12627.t: Likewise. * ld-x86-64/abs-l1om.d: Add target: constraint. * ld-x86-64/protected2-l1om.d: Likewise. * ld-x86-64/protected3-l1om.d: Likewise. * ld-x86-64/ilp32-4.d: Likewise. * ld-x86-64/plt.s: New file. * ld-x86-64/pltlib.s: New file. * ld-x86-64/plt.pd: New file. * ld-x86-64/x86-64.exp (x86_64tests): Add them. * ld-i386/plt.s: New file. * ld-i386/pltlib.s: New file. * ld-i386/plt.pd: New file. * ld-i386/plt-pic.s: New file. * ld-i386/plt-pic.pd: New file. * ld-i386/i386.exp (i386tests): Add them.
250 lines
7.9 KiB
Text
250 lines
7.9 KiB
Text
# Expect script for linker support of STB_GNU_UNIQUE symbols
|
|
#
|
|
# Copyright 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
|
|
# Contributed by Red Hat.
|
|
#
|
|
# This file is part of the GNU Binutils.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
# MA 02110-1301, USA.
|
|
#
|
|
# Written by Nick Clifton <nickc@redhat.com>
|
|
# Adapted for unique checking by Mark J. Wielaard <mjw@redhat.com>
|
|
|
|
|
|
# STB_GNU_UNIQUE support has only been implemented for the ix86, x86_64,
|
|
# arm, powerpc, and sparc so far.
|
|
if {!(([istarget "i?86-*-*"]
|
|
|| [istarget "x86_64-*-*"]
|
|
|| [istarget "arm-*-*"]
|
|
|| [istarget "powerpc*-*-*"]
|
|
|| [istarget "sparc*-*-*"])
|
|
&& ([istarget "*-*-elf*"]
|
|
|| [istarget "*-*-nacl*"]
|
|
|| (([istarget "*-*-linux*"]
|
|
|| [istarget "*-*-gnu*"])
|
|
&& ![istarget "*-*-*aout*"]
|
|
&& ![istarget "*-*-*oldld*"]))) } {
|
|
verbose "UNIQUE tests not run - target does not support UNIQUE"
|
|
return
|
|
}
|
|
|
|
# We need a native system. FIXME: Strictly speaking this
|
|
# is not true, we just need to know how to create a fully
|
|
# linked executable, including the C and Z libraries, using
|
|
# the linker that is under test.
|
|
if ![isnative] {
|
|
verbose "UNIQUE tests not run - not a native toolchain"
|
|
return
|
|
}
|
|
|
|
# We need a working compiler. (Strictly speaking this is
|
|
# not true, we could use target specific assembler files).
|
|
if { [which $CC] == 0 } {
|
|
verbose "UNIQUE tests not run - no compiler available"
|
|
return
|
|
}
|
|
|
|
# A procedure to check the OS/ABI field in the ELF header of a binary file.
|
|
proc check_osabi { binary_file expected_osabi } {
|
|
global READELF
|
|
global READELFFLAGS
|
|
|
|
catch "exec $READELF $READELFFLAGS --file-header $binary_file > readelf.out" got
|
|
|
|
if ![string match "" $got] then {
|
|
verbose "proc check_osabi: Readelf produced unexpected out processing $binary_file: $got"
|
|
return 0
|
|
}
|
|
|
|
if { ![regexp "\n\[ \]*OS/ABI:\[ \]*(.+)\n\[ \]*ABI" \
|
|
[file_contents readelf.out] nil osabi] } {
|
|
verbose "proc check_osabi: Readelf failed to extract an ELF header from $binary_file"
|
|
return 0
|
|
}
|
|
|
|
if { $osabi == $expected_osabi } {
|
|
return 1
|
|
}
|
|
|
|
verbose "Expected OSABI: $expected_osabi, Obtained osabi: $osabi"
|
|
|
|
return 0
|
|
}
|
|
|
|
# A procedure to confirm that a file contains the UNIQUE symbol.
|
|
# Returns -1 upon error, 0 if the symbol was not found and 1 if it was found.
|
|
proc contains_unique_symbol { binary_file } {
|
|
global READELF
|
|
global READELFFLAGS
|
|
|
|
catch "exec $READELF $READELFFLAGS --symbols $binary_file > readelf.out" got
|
|
|
|
if ![string match "" $got] then {
|
|
verbose "proc contains_unique_symbol: Readelf produced unexpected out processing $binary_file: $got"
|
|
return -1
|
|
}
|
|
|
|
# Look for a line like this:
|
|
# 54: 0000000000400474 4 OBJECT UNIQUE DEFAULT 13 a
|
|
|
|
if { ![regexp ".*\[ \]*OBJECT\[ \]+UNIQUE\[ \]+DEFAULT\[ \]+\[UND0-9\]+\[ \]+\[ab\]\n" [file_contents readelf.out]] } {
|
|
return 0
|
|
}
|
|
|
|
return 1
|
|
}
|
|
|
|
set fails 0
|
|
|
|
# Create object file containing unique symbol.
|
|
if ![ld_compile "$CC -c" "$srcdir/$subdir/unique.s" "tmpdir/unique.o"] {
|
|
fail "Could not create a unique object"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
# Create object file NOT containing unique symbol.
|
|
if ![ld_compile "$CC -c" "$srcdir/$subdir/unique_empty.s" "tmpdir/unique_empty.o"] {
|
|
fail "Could not create a non-unique object"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
# Create pic object file containing unique symbol.
|
|
if ![ld_compile "$CC -c -fPIC" "$srcdir/$subdir/unique_shared.s" "tmpdir/unique_shared.o"] {
|
|
fail "Could not create a pic unique object"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
# Create executable containing unique symbol.
|
|
if ![default_ld_link $ld "tmpdir/unique_prog" "tmpdir/unique.o"] {
|
|
fail "Could not link a unique executable"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
# Create shared library containing unique symbol.
|
|
if ![ld_simple_link $ld "tmpdir/libunique_shared.so" "-shared tmpdir/unique_shared.o"] {
|
|
fail "Could not create a shared library containing an unique symbol"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
# Create executable NOT containing unique symbol linked against library.
|
|
if ![default_ld_link $ld "tmpdir/unique_shared_prog" "-Ltmpdir tmpdir/unique_empty.o -Bdynamic -lunique_shared -rpath ./tmpdir"] {
|
|
fail "Could not link a dynamic executable"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if { $fails != 0 } {
|
|
return
|
|
}
|
|
|
|
# Check the object file.
|
|
if {! [check_osabi tmpdir/unique.o {UNIX - GNU}]} {
|
|
fail "Object containing unique does not have an OS/ABI field of GNU"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if {[contains_unique_symbol tmpdir/unique.o] != 1} {
|
|
fail "Object containing unique does not contain an UNIQUE symbol"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if { $fails == 0 } {
|
|
pass "Checking unique object"
|
|
}
|
|
|
|
# Check the executable.
|
|
if {! [check_osabi tmpdir/unique_prog {UNIX - GNU}]} {
|
|
fail "Executable containing unique does not have an OS/ABI field of GNU"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if {[contains_unique_symbol tmpdir/unique_prog] != 1} {
|
|
fail "Executable containing unique does not contain an UNIQUE symbol"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if { $fails == 0 } {
|
|
pass "Checking unique executable"
|
|
}
|
|
|
|
# Check the empty object file.
|
|
if {! [check_osabi tmpdir/unique_empty.o {UNIX - System V}]} {
|
|
fail "Object NOT containing unique does not have an OS/ABI field of System V"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if {[contains_unique_symbol tmpdir/unique_empty.o] == 1} {
|
|
fail "Object NOT containing unique does contain an UNIQUE symbol"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if { $fails == 0 } {
|
|
pass "Checking empty unique object"
|
|
}
|
|
|
|
# Check the unique PIC file.
|
|
if {! [check_osabi tmpdir/unique_shared.o {UNIX - GNU}]} {
|
|
fail "PIC Object containing unique does not have an OS/ABI field of GNU"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if {[contains_unique_symbol tmpdir/unique_shared.o] != 1} {
|
|
fail "PIC Object containing unique does not contain an UNIQUE symbol"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if { $fails == 0 } {
|
|
pass "Checking unique PIC object"
|
|
}
|
|
|
|
# Check the unique shared library.
|
|
if {! [check_osabi tmpdir/libunique_shared.so {UNIX - GNU}]} {
|
|
fail "Shared library containing unique does not have an OS/ABI field of GNU"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if {[contains_unique_symbol tmpdir/libunique_shared.so] != 1} {
|
|
fail "Shared library containing unique does not contain an UNIQUE symbol"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if { $fails == 0 } {
|
|
pass "Checking unique PIC object"
|
|
}
|
|
|
|
# Check the empty executable linked against unique shared library.
|
|
if {! [check_osabi tmpdir/unique_shared_prog {UNIX - System V}]} {
|
|
fail "Executable NOT containing unique does not have an OS/ABI field of System V"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if {[contains_unique_symbol tmpdir/unique_shared_prog] == 1} {
|
|
fail "Executable NOT containing unique does contain an UNIQUE symbol"
|
|
set fails [expr $fails + 1]
|
|
}
|
|
|
|
if { $fails == 0 } {
|
|
pass "Checking shared empty executable"
|
|
}
|
|
|
|
# Clean up, unless we are being verbose, in which case we leave the files available.
|
|
if { $verbose < 1 } {
|
|
remote_file host delete "tmpdir/unique_empty.o"
|
|
remote_file host delete "tmpdir/unique.o"
|
|
remote_file host delete "tmpdir/unique_shared.o"
|
|
remote_file host delete "tmpdir/libunique_shared.so"
|
|
remote_file host delete "tmpdir/unique_prog"
|
|
remote_file host delete "tmpdir/unique_shared_prog"
|
|
}
|