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.
316 lines
8.4 KiB
Text
316 lines
8.4 KiB
Text
# Copyright 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2007,
|
|
# 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
|
|
#
|
|
# This file is part of the GNU Binutils.
|
|
#
|
|
# 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
|
|
# 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.
|
|
|
|
# True if the object format is known to be ELF.
|
|
#
|
|
proc is_elf_format {} {
|
|
if { ![istarget *-*-sysv4*]
|
|
&& ![istarget *-*-unixware*]
|
|
&& ![istarget *-*-elf*]
|
|
&& ![istarget *-*-eabi*]
|
|
&& ![istarget *-*-rtems*]
|
|
&& ![istarget hppa*64*-*-hpux*]
|
|
&& ![istarget ia64-*-hpux*]
|
|
&& ![istarget *-*-linux*]
|
|
&& ![istarget *-*-gnu*]
|
|
&& ![istarget *-*-nacl*]
|
|
&& ![istarget frv-*-uclinux*]
|
|
&& ![istarget bfin-*-uclinux]
|
|
&& ![istarget sh*-*-uclinux*]
|
|
&& ![istarget tic6x*-*-uclinux*]
|
|
&& ![istarget *-*-irix5*]
|
|
&& ![istarget *-*-irix6*]
|
|
&& ![istarget *-*-netbsd*]
|
|
&& ![istarget *-*-openbsd*]
|
|
&& ![istarget *-*-solaris2*] } {
|
|
return 0
|
|
}
|
|
|
|
if { [istarget *-*-linux*aout*]
|
|
|| [istarget *-*-linux*oldld*]
|
|
|| [istarget h8500-*-rtems*]
|
|
|| [istarget i960-*-rtems*]
|
|
|| [istarget *-*-rtemscoff*] } {
|
|
return 0
|
|
}
|
|
|
|
if { ![istarget *-*-netbsdelf*]
|
|
&& ([istarget *-*-netbsd*aout*]
|
|
|| [istarget *-*-netbsdpe*]
|
|
|| [istarget arm*-*-netbsd*]
|
|
|| [istarget sparc-*-netbsd*]
|
|
|| [istarget i*86-*-netbsd*]
|
|
|| [istarget m68*-*-netbsd*]
|
|
|| [istarget vax-*-netbsd*]
|
|
|| [istarget ns32k-*-netbsd*]) } {
|
|
return 0
|
|
}
|
|
|
|
if { [istarget arm-*-openbsd*]
|
|
|| [istarget i386-*-openbsd\[0-2\].*]
|
|
|| [istarget i386-*-openbsd3.\[0-2\]]
|
|
|| [istarget m68*-*-openbsd*]
|
|
|| [istarget ns32k-*-openbsd*]
|
|
|| [istarget sparc-*-openbsd\[0-2\].*]
|
|
|| [istarget sparc-*-openbsd3.\[0-1\]]
|
|
|| [istarget vax-*-openbsd*] } {
|
|
return 0
|
|
}
|
|
|
|
return 1
|
|
}
|
|
|
|
# True if the object format is known to be a.out.
|
|
#
|
|
proc is_aout_format {} {
|
|
if { [istarget *-*-netbsdelf]
|
|
|| [istarget sparc64-*-netbsd*]
|
|
|| [istarget sparc64-*-openbsd*] } {
|
|
return 0
|
|
}
|
|
if { [istarget *-*-*\[ab\]out*]
|
|
|| [istarget *-*-linux*oldld*]
|
|
|| [istarget *-*-bsd*]
|
|
|| [istarget *-*-msdos*]
|
|
|| [istarget arm-*-netbsd*]
|
|
|| [istarget arm-*-openbsd*]
|
|
|| [istarget arm-*-riscix*]
|
|
|| [istarget i?86-*-freebsd\[12\]*]
|
|
|| [istarget i?86-*-netbsd*]
|
|
|| [istarget i?86-*-openbsd\[0-2\]*]
|
|
|| [istarget i?86-*-openbsd3.\[0-2\]*]
|
|
|| [istarget i?86-*-vsta]
|
|
|| [istarget i?86-*-mach*]
|
|
|| [istarget m68*-*-netbsd*]
|
|
|| [istarget m68*-*-openbsd*]
|
|
|| [istarget ns32k-*-*]
|
|
|| [istarget pdp11-*-*]
|
|
|| [istarget sparc*-*-sunos4*]
|
|
|| [istarget sparc*-*-netbsd*]
|
|
|| [istarget sparc*-*-openbsd\[0-2\]*]
|
|
|| [istarget sparc*-*-openbsd3.\[0-1\]*]
|
|
|| [istarget sparc*-fujitsu-none]
|
|
|| [istarget vax-dec-ultrix*]
|
|
|| [istarget vax-*-netbsd] } {
|
|
return 1
|
|
}
|
|
return 0
|
|
}
|
|
|
|
# True if the object format is known to be PE COFF.
|
|
#
|
|
proc is_pecoff_format {} {
|
|
if { ![istarget *-*-mingw*]
|
|
&& ![istarget *-*-cygwin*]
|
|
&& ![istarget *-*-cegcc*]
|
|
&& ![istarget *-*-pe*] } {
|
|
return 0
|
|
}
|
|
|
|
return 1
|
|
}
|
|
|
|
# True if the object format is known to be 64-bit ELF.
|
|
#
|
|
proc is_elf64 { binary_file } {
|
|
global READELF
|
|
global READELFFLAGS
|
|
|
|
set readelf_size ""
|
|
catch "exec $READELF $READELFFLAGS -h $binary_file > readelf.out" got
|
|
|
|
if ![string match "" $got] then {
|
|
return 0
|
|
}
|
|
|
|
if { ![regexp "\n\[ \]*Class:\[ \]*ELF(\[0-9\]+)\n" \
|
|
[file_contents readelf.out] nil readelf_size] } {
|
|
return 0
|
|
}
|
|
|
|
if { $readelf_size == "64" } {
|
|
return 1
|
|
}
|
|
|
|
return 0
|
|
}
|
|
|
|
# Compare two files line-by-line. FILE_1 is the actual output and FILE_2
|
|
# is the expected output. Ignore blank lines in either file.
|
|
#
|
|
# FILE_2 is a series of regexps, comments and # directives. The directives
|
|
# are:
|
|
#
|
|
# #pass
|
|
# Treat the test as a PASS if everything up till this point has
|
|
# matched. Ignore any remaining lines in either FILE_1 or FILE_2.
|
|
#
|
|
# #failif
|
|
# Reverse the sense of the test: expect differences to exist.
|
|
#
|
|
# #...
|
|
# REGEXP
|
|
# Skip all lines in FILE_1 until the first that matches REGEXP.
|
|
#
|
|
# Other # lines are comments. Regexp lines starting with the `!' character
|
|
# specify inverse matching (use `\!' for literal matching against a leading
|
|
# `!'). Skip empty lines in both files.
|
|
#
|
|
# The first optional argument is a list of regexp substitutions of the form:
|
|
#
|
|
# EXP1 SUBSPEC1 EXP2 SUBSPEC2 ...
|
|
#
|
|
# This tells the function to apply each regexp substitution EXPi->SUBSPECi
|
|
# in order to every line of FILE_2.
|
|
#
|
|
# Return nonzero if differences exist.
|
|
proc regexp_diff { file_1 file_2 args } {
|
|
set eof -1
|
|
set end_1 0
|
|
set end_2 0
|
|
set differences 0
|
|
set diff_pass 0
|
|
set fail_if_match 0
|
|
set ref_subst ""
|
|
if { [llength $args] > 0 } {
|
|
set ref_subst [lindex $args 0]
|
|
}
|
|
if { [llength $args] > 1 } {
|
|
perror "Too many arguments to regexp_diff"
|
|
return 1
|
|
}
|
|
|
|
if [file exists $file_1] then {
|
|
set file_a [open $file_1 r]
|
|
} else {
|
|
perror "$file_1 doesn't exist"
|
|
return 1
|
|
}
|
|
|
|
if [file exists $file_2] then {
|
|
set file_b [open $file_2 r]
|
|
} else {
|
|
perror "$file_2 doesn't exist"
|
|
close $file_a
|
|
return 1
|
|
}
|
|
|
|
verbose " Regexp-diff'ing: $file_1 $file_2" 2
|
|
|
|
while { 1 } {
|
|
set line_a ""
|
|
set line_b ""
|
|
while { [string length $line_a] == 0 } {
|
|
# Ignore blank line in FILE_1.
|
|
if { [gets $file_a line_a] == $eof } {
|
|
set end_1 1
|
|
break
|
|
}
|
|
}
|
|
while { [string length $line_b] == 0 || [string match "#*" $line_b] } {
|
|
if { [string match "#pass" $line_b] } {
|
|
set end_2 1
|
|
set diff_pass 1
|
|
break
|
|
} elseif { [string match "#failif" $line_b] } {
|
|
send_log "fail if no difference\n"
|
|
verbose "fail if no difference" 3
|
|
set fail_if_match 1
|
|
} elseif { [string match "#..." $line_b] } {
|
|
if { [gets $file_b line_b] == $eof } {
|
|
set end_2 1
|
|
set diff_pass 1
|
|
break
|
|
}
|
|
set negated [expr { [string index $line_b 0] == "!" }]
|
|
set line_bx [string range $line_b $negated end]
|
|
set n [expr { $negated ? "! " : "" }]
|
|
# Substitute on the reference.
|
|
foreach {name value} $ref_subst {
|
|
regsub -- $name $line_bx $value line_bx
|
|
}
|
|
verbose "looking for $n\"^$line_bx$\"" 3
|
|
while { [expr [regexp "^$line_bx$" "$line_a"] == $negated] } {
|
|
verbose "skipping \"$line_a\"" 3
|
|
if { [gets $file_a line_a] == $eof } {
|
|
set end_1 1
|
|
break
|
|
}
|
|
}
|
|
break
|
|
}
|
|
if { [gets $file_b line_b] == $eof } {
|
|
set end_2 1
|
|
break
|
|
}
|
|
}
|
|
|
|
if { $diff_pass } {
|
|
break
|
|
} elseif { $end_1 && $end_2 } {
|
|
break
|
|
} elseif { $end_1 } {
|
|
send_log "extra regexps in $file_2 starting with \"^$line_b$\"\nEOF from $file_1\n"
|
|
verbose "extra regexps in $file_2 starting with \"^$line_b$\"\nEOF from $file_1" 3
|
|
set differences 1
|
|
break
|
|
} elseif { $end_2 } {
|
|
send_log "extra lines in $file_1 starting with \"^$line_a$\"\nEOF from $file_2\n"
|
|
verbose "extra lines in $file_1 starting with \"^$line_a$\"\nEOF from $file_2\n" 3
|
|
set differences 1
|
|
break
|
|
} else {
|
|
set negated [expr { [string index $line_b 0] == "!" }]
|
|
set line_bx [string range $line_b $negated end]
|
|
set n [expr { $negated ? "! " : "" }]
|
|
set s [expr { $negated ? " " : "" }]
|
|
# Substitute on the reference.
|
|
foreach {name value} $ref_subst {
|
|
regsub -- $name $line_bx $value line_bx
|
|
}
|
|
verbose "regexp $n\"^$line_bx$\"\nline \"$line_a\"" 3
|
|
if { [expr [regexp "^$line_bx$" "$line_a"] == $negated] } {
|
|
send_log "regexp_diff match failure\n"
|
|
send_log "regexp $n\"^$line_bx$\"\nline $s\"$line_a\"\n"
|
|
verbose "regexp_diff match failure\n" 3
|
|
set differences 1
|
|
}
|
|
}
|
|
}
|
|
|
|
if { $differences == 0 && !$diff_pass && [eof $file_a] != [eof $file_b] } {
|
|
send_log "$file_1 and $file_2 are different lengths\n"
|
|
verbose "$file_1 and $file_2 are different lengths" 3
|
|
set differences 1
|
|
}
|
|
|
|
if { $fail_if_match } {
|
|
if { $differences == 0 } {
|
|
set differences 1
|
|
} else {
|
|
set differences 0
|
|
}
|
|
}
|
|
|
|
close $file_a
|
|
close $file_b
|
|
|
|
return $differences
|
|
}
|