b8871f357f
The BFD configure option, --enable-elf-stt-common, can't be to used to verify STT_COMMON implementation with the normal binutils build. Instead, this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF assembler/objcopy and adds -z common/-z nocommon to ld. A configure option, --enable-elf-stt-common, is added to gas to specify whether ELF assembler should generate common symbols with the STT_COMMON type by default. Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF common symbols. bfd/ PR ld/19645 * bfd.c (bfd): Change flags to 20 bits. (BFD_CONVERT_ELF_COMMON): New. (BFD_USE_ELF_STT_COMMON): Likewise. (BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and BFD_USE_ELF_STT_COMMON. (BFD_FLAGS_FOR_BFD_USE_MASK): Likewise. * configure.ac: Remove --enable-elf-stt-common. * elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for common symbol depending on BFD_CONVERT_ELF_COMMON and BFD_USE_ELF_STT_COMMON. * elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for STT_COMMON. * elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check STT_COMMON. (elf_link_convert_common_type): New function. (elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for common symbol depending on BFD_CONVERT_ELF_COMMON and BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx. * elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON and BFD_USE_ELF_STT_COMMON to object_flags. (TARGET_LITTLE_SYM): Likewise. * syms.c (BSF_KEEP_G): Renamed to ... (BSF_ELF_COMMON): This. * bfd-in2.h: Regenerated. * config.in: Likewise. * configure: Likewise. binutils/ PR ld/19645 * NEWS: Mention --elf-stt-common= for objcopy. * doc/binutils.texi: Document --elf-stt-common= for objcopy. * objcopy.c (do_elf_stt_common): New. (command_line_switch): Add OPTION_ELF_STT_COMMON. (copy_options): Add --elf-stt-common=. (copy_usage): Add --elf-stt-common=. (copy_object): Also check do_elf_stt_common for ELF targets. (copy_file): Handle do_elf_stt_common. (copy_main): Handle OPTION_ELF_STT_COMMON. * readelf.c (apply_relocations): Support STT_COMMON. * testsuite/binutils-all/common-1.s: New file. * testsuite/binutils-all/common-1a.d: Likewise. * testsuite/binutils-all/common-1b.d: Likewise. * testsuite/binutils-all/common-1c.d: Likewise. * testsuite/binutils-all/common-1d.d: Likewise. * testsuite/binutils-all/common-1e.d: Likewise. * testsuite/binutils-all/common-1f.d: Likewise. * testsuite/binutils-all/common-2.s: Likewise. * testsuite/binutils-all/common-2a.d: Likewise. * testsuite/binutils-all/common-2b.d: Likewise. * testsuite/binutils-all/common-2c.d: Likewise. * testsuite/binutils-all/common-2d.d: Likewise. * testsuite/binutils-all/common-2e.d: Likewise. * testsuite/binutils-all/common-2f.d: Likewise. * testsuite/binutils-all/objcopy.exp (objcopy_test_elf_common_symbols): New proc. Run objcopy_test_elf_common_symbols for ELF targets gas/ PR ld/19645 * NEWS: Mention --enable-elf-stt-common and --elf-stt-common= for ELF assemblers. * as.c (flag_use_elf_stt_common): New. (show_usage): Add --elf-stt-common=. (option_values): Add OPTION_ELF_STT_COMMON. (std_longopts): Add --elf-stt-common=. (parse_args): Handle --elf-stt-common=. * as.h (flag_use_elf_stt_common): New. * config.in: Regenerated. * configure: Likewise. * configure.ac: Add --enable-elf-stt-common and define DEFAULT_GENERATE_ELF_STT_COMMON. * gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set. * doc/as.texinfo: Document --elf-stt-common=. * testsuite/gas/elf/common3.s: New file. * testsuite/gas/elf/common3a.d: Likewise. * testsuite/gas/elf/common3b.d: Likewise. * testsuite/gas/elf/common4.s: Likewise. * testsuite/gas/elf/common4a.d: Likewise. * testsuite/gas/elf/common4b.d: Likewise. * testsuite/gas/i386/dw2-compress-3b.d: Likewise. * testsuite/gas/i386/dw2-compressed-3b.d: Likewise. * testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a and common4b. * testsuite/gas/i386/dw2-compress-3.d: Renamed to ... * testsuite/gas/i386/dw2-compress-3a.d: This. Pass --elf-stt-common=no to as. * testsuite/gas/i386/dw2-compressed-3.d: Renamed to ... * testsuite/gas/i386/dw2-compressed-3a.d: This. Pass --elf-stt-common=no to as. * testsuite/gas/i386/i386.exp: Run dw2-compress-3a, dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead of dw2-compress-3 and dw2-compressed-3. include/ PR ld/19645 * bfdlink.h (bfd_link_elf_stt_common): New enum. (bfd_link_info): Add elf_stt_common. ld/ PR ld/19645 * NEWS: Mention -z common/-z nocommon for ELF targets. * emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle -z common and -z nocommon. * ld.texinfo: Document -z common/-z nocommon. * lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon. * testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and --elf-stt-common=yes with assembler. * testsuite/ld-elfcomm/common-1.s: New file. * testsuite/ld-elfcomm/common-1a.d: Likewise. * testsuite/ld-elfcomm/common-1b.d: Likewise. * testsuite/ld-elfcomm/common-1c.d: Likewise. * testsuite/ld-elfcomm/common-1d.d: Likewise. * testsuite/ld-elfcomm/common-1e.d: Likewise. * testsuite/ld-elfcomm/common-1f.d: Likewise. * testsuite/ld-elfcomm/common-2.s: Likewise. * testsuite/ld-elfcomm/common-2a.d: Likewise. * testsuite/ld-elfcomm/common-2b.d: Likewise. * testsuite/ld-elfcomm/common-2c.d: Likewise. * testsuite/ld-elfcomm/common-2d.d: Likewise. * testsuite/ld-elfcomm/common-2e.d: Likewise. * testsuite/ld-elfcomm/common-2f.d: Likewise. * testsuite/ld-elfcomm/common-3a.rd: Likewise. * testsuite/ld-elfcomm/common-3b.rd: Likewise. * testsuite/ld-i386/pr19645.d: Likewise. * testsuite/ld-i386/pr19645.s: Likewise. * testsuite/ld-x86-64/largecomm-1.s: Likewise. * testsuite/ld-x86-64/largecomm-1a.d: Likewise. * testsuite/ld-x86-64/largecomm-1b.d: Likewise. * testsuite/ld-x86-64/largecomm-1c.d: Likewise. * testsuite/ld-x86-64/largecomm-1d.d: Likewise. * testsuite/ld-x86-64/largecomm-1e.d: Likewise. * testsuite/ld-x86-64/largecomm-1f.d: Likewise. * testsuite/ld-x86-64/pr19645.d: Likewise. * testsuite/ld-x86-64/pr19645.s: Likewise. * testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes with assembler. (assembler_generates_commons): Removed. Run -z common/-z nocommon tests. Run *.d tests. * testsuite/ld-i386/i386.exp: Run pr19645. * testsuite/ld-x86-64/x86-64.exp: Likewise. * testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with assembler. Test STT_COMMON with readelf.
301 lines
8.7 KiB
Text
301 lines
8.7 KiB
Text
# Expect script for common symbol tests
|
|
# Copyright (C) 2003-2016 Free Software Foundation, Inc.
|
|
#
|
|
# 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 H.J. Lu (hjl@gnu.org)
|
|
#
|
|
|
|
# Make sure that ld correctly handles common symbols in ELF.
|
|
|
|
# This test can only be run on ELF platforms.
|
|
if ![is_elf_format] {
|
|
return
|
|
}
|
|
|
|
# hpux assembly is weird
|
|
if [istarget "hppa*-*-hpux*"] {
|
|
return
|
|
}
|
|
|
|
proc test_sort_common {} {
|
|
global exec_output
|
|
global objdump
|
|
global srcdir
|
|
global subdir
|
|
global as
|
|
global ld
|
|
|
|
set test "--sort-common (descending)"
|
|
|
|
verbose "Check to see that --sort-common sorts in descending alignment"
|
|
|
|
# We do not run the sort common tests for the DLX target because we know that the linker
|
|
# will seg-fault. The built-in DLX linker script requires that there be something in the
|
|
# .text section and our sort-common.s file does not provide anything.
|
|
if [istarget dlx-*-*] {
|
|
untested "$test"
|
|
return 0
|
|
}
|
|
|
|
if { ![ld_assemble $as $srcdir/$subdir/sort-common.s tmpdir/sort-common.o] } {
|
|
unresolved "$test"
|
|
return 0
|
|
}
|
|
|
|
if { ![ld_simple_link $ld tmpdir/sort-common.dx "--sort-common=descending tmpdir/sort-common.o"] } {
|
|
fail "$test"
|
|
return 0
|
|
}
|
|
|
|
send_log "$objdump --syms tmpdir/sort-common.dx | grep var | sort\n"
|
|
set exec_output [run_host_cmd "$objdump" "--syms tmpdir/sort-common.dx | grep var | sort"]
|
|
|
|
# Don't know why, but the CR ports fail this test.
|
|
setup_xfail "cr16-*-*" "crx-*-*"
|
|
|
|
# Note: The second regexp is for targets which put small commons in a .sbss
|
|
# section and large commons in a .bss section.
|
|
if { ![regexp ".*var_16.*var_8.*var_4.*var_2.*var_1.*" $exec_output]
|
|
&& ![regexp ".*sbss.*var_8.*var_4.*var_2.*var_1.*bss.*var_16.*" $exec_output] } {
|
|
fail $test
|
|
} else {
|
|
pass $test
|
|
}
|
|
|
|
set test "--sort-common (ascending)"
|
|
|
|
verbose "Check to see that --sort-common=ascending sorts in ascending alignment"
|
|
|
|
if { ![ld_simple_link $ld tmpdir/sort-common.ax "--sort-common=ascending tmpdir/sort-common.o"] } {
|
|
fail "$test"
|
|
return 0
|
|
}
|
|
|
|
send_log "$objdump --syms tmpdir/sort-common.ax | grep var | sort\n"
|
|
set exec_output [run_host_cmd "$objdump" "--syms tmpdir/sort-common.ax | grep var | sort"]
|
|
|
|
if {![regexp ".*var_1.*var_2.*var_4.*var_8.*var_16.*" $exec_output]} {
|
|
fail $test
|
|
return 0
|
|
}
|
|
|
|
pass $test
|
|
return 1
|
|
}
|
|
|
|
test_sort_common
|
|
|
|
set test1 "size/aligment change of common symbols"
|
|
set test1w1 "$test1 (warning 1)"
|
|
set test1w2 "$test1 (warning 2)"
|
|
set test1c1 "$test1 (change 1)"
|
|
set test1c2 "$test1 (change 2)"
|
|
|
|
if { ![is_remote host] && [which $CC] == 0 } {
|
|
untested $test1w1
|
|
untested $test1w2
|
|
untested $test1c1
|
|
untested $test1c2
|
|
return
|
|
}
|
|
if { [istarget score-*-*] } {
|
|
untested $test1w1
|
|
untested $test1w2
|
|
untested $test1c1
|
|
untested $test1c2
|
|
return
|
|
}
|
|
|
|
proc dump_common1 { testname } {
|
|
global exec_output
|
|
global READELF
|
|
|
|
send_log "$READELF --syms tmpdir/common1.o | grep foo\n"
|
|
set exec_output [run_host_cmd "$READELF" "--syms tmpdir/common1.o | grep foo"]
|
|
|
|
if { ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0\]*)80(\[ \]+)4(\[ \]+)(COMMON|OBJECT)(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(PRC\\\[0xff03\\\]|COM|SCOM)(\[ \]+)_?foo2" $exec_output]
|
|
|| ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0-9\]+)(\[ \]+)21(\[ \]+)OBJECT(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(\[0-9\]+)(\[ \]+)_?foo1" $exec_output] } {
|
|
verbose $exec_output
|
|
fail $testname
|
|
return 0
|
|
}
|
|
|
|
return 1
|
|
}
|
|
|
|
proc stt_common_test { options testname } {
|
|
global exec_output
|
|
global READELF
|
|
global ld
|
|
|
|
set options "$options tmpdir/common1c.o"
|
|
|
|
if { ! [ld_simple_link $ld tmpdir/common.exe $options] } {
|
|
unresolved $testname
|
|
return 0
|
|
}
|
|
|
|
send_log "$READELF --syms tmpdir/common.exe | grep foo\n"
|
|
set exec_output [run_host_cmd "$READELF" "--syms tmpdir/common.exe | grep foo"]
|
|
|
|
if {![regexp { +[0-9a-f]+. +[0-9a-f]+ OBJECT + GLOBAL +DEFAULT +[0-9]+ _?foo2} $exec_output] } {
|
|
fail $testname
|
|
return 0
|
|
}
|
|
|
|
pass $testname
|
|
return 1
|
|
}
|
|
|
|
if [istarget nios2*-*-*] {
|
|
set CFLAGS "$CFLAGS -G0"
|
|
}
|
|
|
|
# Explicitly use "-fcommon" so that even if $CFLAGS includes
|
|
# "-fno-common", these tests are compiled as expected.
|
|
if { ![ld_compile "$CC $CFLAGS -fcommon" $srcdir/$subdir/common1a.c tmpdir/common1a.o]
|
|
|| ![ld_compile "$CC $CFLAGS -fcommon" $srcdir/$subdir/common1b.c tmpdir/common1b.o]
|
|
|| ![ld_compile "$CC $CFLAGS -Wa,--elf-stt-common=yes -fcommon" $srcdir/$subdir/common1b.c tmpdir/common1c.o] } {
|
|
unresolved $test1
|
|
unresolved $test1
|
|
return
|
|
}
|
|
|
|
global ld
|
|
global link_output
|
|
|
|
set options "-r tmpdir/common1a.o tmpdir/common1b.o"
|
|
|
|
# SH64 targets needs an extra ld option for this test.
|
|
if [istarget sh64*-*-*] {
|
|
if [istarget sh64*l*-*-*] {
|
|
set options "-mshlelf32 $options"
|
|
} else {
|
|
set options "-mshelf32 $options"
|
|
}
|
|
}
|
|
|
|
if { [ld_simple_link $ld tmpdir/common1.o $options] } {
|
|
unresolved $test1w1
|
|
return
|
|
}
|
|
|
|
# This test fails on MIPS because the backend sets type_change_ok.
|
|
# The size change warning is suppressed. Same on hppa64.
|
|
if {[istarget mips*-*-*] || [istarget hppa*64*-*-*]} {
|
|
if { ![regexp "Warning: alignment (\[0-9\]+) of symbol \`_?foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output] } {
|
|
fail $test1w1
|
|
} else {
|
|
pass $test1w1
|
|
}
|
|
} else {
|
|
if { ![regexp "Warning: alignment (\[0-9\]+) of symbol \`_?foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output]
|
|
|| ![regexp "Warning: size of symbol \`_?foo1\' changed from 2 in tmpdir/common1a.o to 21 in tmpdir/common1b.o" $link_output] } {
|
|
fail $test1w1
|
|
} else {
|
|
pass $test1w1
|
|
}
|
|
}
|
|
|
|
if { [dump_common1 $test1c1] } {
|
|
pass $test1c1
|
|
}
|
|
|
|
set options "-r tmpdir/common1b.o tmpdir/common1a.o"
|
|
|
|
# SH64 targets needs an extra ld option for this test.
|
|
if [istarget sh64*-*-*] {
|
|
if [istarget sh64*l*-*-*] {
|
|
set options "-mshlelf32 $options"
|
|
} else {
|
|
set options "-mshelf32 $options"
|
|
}
|
|
}
|
|
|
|
if { [ld_simple_link $ld tmpdir/common1.o $options] } {
|
|
unresolved $test1w2
|
|
return
|
|
}
|
|
|
|
if { ![regexp "Warning: alignment (\[0-9\]+) of symbol \`_?foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output] } {
|
|
fail $test1w2
|
|
} else {
|
|
pass $test1w2
|
|
}
|
|
|
|
if { [dump_common1 $test1c2] } {
|
|
pass $test1c2
|
|
}
|
|
|
|
#
|
|
# The following tests are for when we are generating STT_COMMON symbols only.
|
|
#
|
|
stt_common_test "-static -e 0" "static link of common symbols"
|
|
stt_common_test "-shared" "shared link of common symbols"
|
|
stt_common_test "-pie" "position independent link of common symbols"
|
|
|
|
run_ld_link_tests [list \
|
|
[list \
|
|
"Build common-3x.o" \
|
|
"-r" "" "--elf-stt-common=no" \
|
|
{common-1.s} {} "common-3x.o" \
|
|
] \
|
|
[list \
|
|
"Build common-3y.o" \
|
|
"-r" "" "--elf-stt-common=yes" \
|
|
{common-1.s} {} "common-3y.o" \
|
|
] \
|
|
[list \
|
|
"Build common-3a.o" \
|
|
"-r tmpdir/common-3x.o tmpdir/common-3y.o" "" "" \
|
|
{dummy.s} {{readelf {-s -W} common-3a.rd}} "common-3a.o" \
|
|
] \
|
|
[list \
|
|
"Build common-3b.o" \
|
|
"-r tmpdir/common-3y.o tmpdir/common-3x.o" "" "" \
|
|
{dummy.s} {{readelf {-s -W} common-3b.rd}} "common-3b.o" \
|
|
] \
|
|
[list \
|
|
"Build common-3c.o" \
|
|
"-r -z nocommon tmpdir/common-3x.o tmpdir/common-3y.o" "" "" \
|
|
{dummy.s} {{readelf {-s -W} common-3a.rd}} "common-3c.o" \
|
|
] \
|
|
[list \
|
|
"Build common-3d.o" \
|
|
"-r -z common tmpdir/common-3x.o tmpdir/common-3y.o" "" "" \
|
|
{dummy.s} {{readelf {-s -W} common-3b.rd}} "common-3b.o" \
|
|
] \
|
|
[list \
|
|
"Build common-3e.o" \
|
|
"-r -z common tmpdir/common-3y.o tmpdir/common-3x.o" "" "" \
|
|
{dummy.s} {{readelf {-s -W} common-3b.rd}} "common-3e.o" \
|
|
] \
|
|
[list \
|
|
"Build common-3f.o" \
|
|
"-r -z nocommon tmpdir/common-3y.o tmpdir/common-3x.o" "" "" \
|
|
{dummy.s} {{readelf {-s -W} common-3a.rd}} "common-3f.o" \
|
|
] \
|
|
]
|
|
|
|
set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
|
|
foreach t $test_list {
|
|
# We need to strip the ".d", but can leave the dirname.
|
|
verbose [file rootname $t]
|
|
run_dump_test [file rootname $t]
|
|
}
|