mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-02-05 12:53:16 +08:00
7ba115508a
Two pieces to this puzzle: 1) Revert HJ's fix for PR13250 so that size and alignment isn't sticky, instead attack the real underlying problem that _bfd_generic_link_add_one_symbol does the wrong thing in making a common section in a shared library bfd. 2) Save and restore common u.c.p fields, which hold the section and alignment. A better fix for (2) would be to throw away all of that horrible code saving and restoring the hash table when loading as-needed library symbols, and instead do a scan over as-needed library symbols before adding anything. bfd/ PR 13250 PR 26580 * elflink.c (_bfd_elf_merge_symbol): Make "override" a bfd**. Return oldbfd in override when old common should override new common. (_bfd_elf_add_default_symbol): Adjust to suit. (elf_link_add_object_symbols): Likewise. Pass "override" to _bfd_generic_link_add_one_symbol. Save and restore common u.c.p field for --as-needed shared libraries. Revert pr13250 changes. ld/ * testsuite/ld-elf/pr26580-a.s, * testsuite/ld-elf/pr26580-b.s, * testsuite/ld-elf/pr26580-1.sd, * testsuite/ld-elf/pr26580-2.sd: New tests * testsuite/ld-elf/comm-data.exp: Run new tests. * testsuite/ld-elf/pr26580-a.c, * testsuite/ld-elf/pr26580-b.c, * testsuite/ld-elf/pr26580-3.out, * testsuite/ld-elf/pr26580-4.out: New tests. * testsuite/ld-elf/shared.exp: Run new tests.
141 lines
3.5 KiB
Plaintext
141 lines
3.5 KiB
Plaintext
# Expect script for common symbol override.
|
|
#
|
|
# Copyright (C) 2011-2020 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 Maciej W. Rozycki <macro@codesourcery.com>
|
|
#
|
|
|
|
# This test is for ELF shared-library targets.
|
|
if { ![is_elf_format] || ![check_shared_lib_support] } {
|
|
return
|
|
}
|
|
|
|
# This target requires extra GAS options when building code for shared
|
|
# libraries.
|
|
set AFLAGS_PIC ""
|
|
if [istarget "tic6x-*-*"] {
|
|
append AFLAGS_PIC " -mpic -mpid=near"
|
|
}
|
|
# This target requires a non-default emulation for successful shared
|
|
# library/executable builds.
|
|
set LFLAGS ""
|
|
if [istarget "tic6x-*-*"] {
|
|
append LFLAGS " -melf32_tic6x_le"
|
|
}
|
|
# These targets do not default to linking with shared libraries.
|
|
if { [istarget "mips*vr4100*-*-elf*"] \
|
|
|| [istarget "mips*vr4300*-*-elf*"] \
|
|
|| [istarget "mips*vr5000*-*-elf*"] } {
|
|
append LFLAGS " -call_shared"
|
|
}
|
|
|
|
# Set the pointer size according to the ELF flavor.
|
|
set AFLAGS ""
|
|
if [is_elf64 "tmpdir/libcomm-data.so"] {
|
|
append AFLAGS " --defsym ELF64=1"
|
|
}
|
|
# HPUX targets use a different .comm syntax.
|
|
if [istarget "*-*-hpux*"] {
|
|
append AFLAGS " --defsym HPUX=1"
|
|
}
|
|
|
|
set testname "Common symbol override test"
|
|
|
|
# Define a global symbol.
|
|
run_ld_link_tests [list \
|
|
[list \
|
|
"$testname (auxiliary shared object build)" \
|
|
"$LFLAGS -shared" "" \
|
|
"$AFLAGS_PIC" \
|
|
{ comm-data1.s } \
|
|
{ \
|
|
{ readelf -s comm-data1.sd } \
|
|
} \
|
|
"libcomm-data.so" \
|
|
] \
|
|
[list \
|
|
"libpr26580-1.so" \
|
|
"$LFLAGS -shared" "" \
|
|
"$AFLAGS_PIC $AFLAGS" \
|
|
{ pr26580-b.s } \
|
|
{ } \
|
|
"libpr26580-1.so" \
|
|
] \
|
|
]
|
|
|
|
# bfin-elf does not currently support copy relocs.
|
|
setup_xfail "bfin-*-*"
|
|
clear_xfail "bfin-*-linux-uclibc*"
|
|
|
|
# Verify that a common symbol has been converted to an undefined
|
|
# reference to the global symbol of the same name defined above
|
|
# and that the debug reference has been dropped.
|
|
run_ld_link_tests [list \
|
|
[list \
|
|
"$testname" \
|
|
"$LFLAGS -T comm-data2.ld -Ltmpdir -lcomm-data" "" \
|
|
"$AFLAGS" \
|
|
{ comm-data2.s } \
|
|
[list \
|
|
[list readelf -s comm-data2.sd] \
|
|
[list readelf -r comm-data2.rd] \
|
|
[list readelf "-x .debug_foo" comm-data2.xd]] \
|
|
"comm-data" \
|
|
] \
|
|
[list \
|
|
"$testname 3a" \
|
|
"-static" "" \
|
|
"" \
|
|
{ comm-data3a.s comm-data3b.s } \
|
|
{ \
|
|
{ readelf -s comm-data3.sd } \
|
|
} \
|
|
"comm-data3a" \
|
|
] \
|
|
[list \
|
|
"$testname 3b" \
|
|
"-static" "" \
|
|
"" \
|
|
{ comm-data3b.s comm-data3a.s } \
|
|
{ \
|
|
{ readelf -s comm-data3.sd } \
|
|
} \
|
|
"comm-data3b" \
|
|
] \
|
|
[list \
|
|
"pr26580-1" \
|
|
"$LFLAGS --as-needed -Ltmpdir -lpr26580-1" "" \
|
|
"$AFLAGS" \
|
|
{ pr26580-a.s } \
|
|
{ {readelf -s pr26580-1.sd} } \
|
|
"pr26580-1" \
|
|
] \
|
|
[list \
|
|
"pr26580-2" \
|
|
"$LFLAGS --no-as-needed -Ltmpdir -lpr26580-1" "" \
|
|
"$AFLAGS" \
|
|
{ pr26580-a.s } \
|
|
{ {readelf -s pr26580-2.sd} } \
|
|
"pr26580-2" \
|
|
] \
|
|
]
|