mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-24 12:35:55 +08:00
5acaada745
The patch allows the gold testsuite to pass when using something like
the following configure line, which works for the rest of the binutils
testsuite. At least, it does if you don't configure your gcc with any
of the options that force a particular path to as or ld.
gccdir="/home/alan/build/gcc/prev-"
gccsrc="/home/alan/src/gcc.git"
gcctarg="x86_64-linux"
CC="${gccdir}gcc/xgcc -B${gccdir}gcc/" \
CXX="${gccdir}gcc/xg++ -B${gccdir}gcc/ -I${gccdir}$gcctarg/libstdc++-v3/include -I${gccdir}$gcctarg/libstdc++-v3/include/$gcctarg -I${gccsrc}/libstdc++-v3/libsupc++ -L${gccdir}$gcctarg/libstdc++-v3/src/.libs/" \
~/src/binutils-gdb/configure ...
gold's -Bgcctestdir/ option must come before the -B supplied by $CC
or $CXX, in order to pick up the linker we want to test. Also when
using a not-yet-installed gcc, it is necessary to provide a collect-ld
in gcctestdir/ as otherwise a collect-ld script in -B${gccdir}gcc/
will be used and the wrong linker tested.
Besides this, the patch fixes some bugs: The $COMPILE -D_FORTIFY_SOURCE
edit was wrong (but worked for usual values), and the $CXXLINK_S edit
unnecessarily but harmlessly used extra backslash quoting. See
posix shell documentation regarding quoting, or
www.gnu.org/software/bash/manual/bashref.html#Command-Substitution
Also, -Bgcctestdir/ in one place makes it less likely a new test will
be added that accidentally lacks the option.
* Makefile.am (gcctestdir1/ld): Use $@ and absolute paths.
(gcctestdir1/collect-ld): New.
(ld1_DEPENDENCIES): Add gcctestdir1/collect-ld.
(ld1_LDFLAGS): Remove -Bgcctestdir1/.
(editcc1, ld1_LINK): Define.
(gcctestdir2/ld, gcctestdir2/collect-ld, ld2_DEPENDENCIES),
(ld2_LDFLAGS, editcc2, ld2_LINK),
(ld1_r_DEPENDENCIES, ld1_r_LDFLAGS, ld1_r_LINK),
(gcctestdir2-r/ld, gcctestdir2-r/collect-ld, ld2_r_DEPENDENCIES),
(ld2_r_LDFLAGS, editcc2r, ld2_r_LINK),
(gcctestdir3/ld, gcctestdir3/collect-ld, ld3_DEPENDENCIES),
(ld3_LDFLAGS, editcc3, ld3_LINK),
(gcctestdir4/ld, gcctestdir4/collect-ld, ld4_DEPENDENCIES),
(ld4_LDFLAGS, editcc4, ld4_LINK): Similarly.
* Makefile.in: Regenerate.
* testsuite/Makefile.am (editcc): Define sed command to put
our -B option first. Remove other occurrences of -Bgcctestdir/
throughout file.
(editcc1): Define for -D_FORTIFY_SOURCE stripping.
(editcc2): Define for -static-libgcc/libstdc++ stripping.
(LINK1, CXXLINK1): Don't use CCLD or CXXLD.
(CCLD, CXXLD, COMPILE, LINK, CXXCOMPILE, CXXLINK, CXXLINK_S): Define
using editcc macros.
(gcctestdir/collect-ld): New rule, add as a dependency of..
(gcctestdir/ld): ..this. Use $@ and abs_top_buildir.
(gcctestdir/as): Use $@.
* testsuite/Makefile.in: Regenerate.
* testsuite/incremental_test.sh (actual): Match collect-ld too.
90 lines
2.7 KiB
Bash
Executable File
90 lines
2.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# incremental_test.sh -- test that incremental linking information is correct.
|
|
|
|
# Copyright (C) 2009-2018 Free Software Foundation, Inc.
|
|
# Written by Rafael Avila de Espindola <espindola@google.com>
|
|
# and Cary Coutant <ccoutant@google.com>
|
|
|
|
# This file is part of gold.
|
|
|
|
# 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.
|
|
|
|
check_cmp()
|
|
{
|
|
if ! cmp -s "$1" "$2"
|
|
then
|
|
echo "Actual output differs from expected:"
|
|
echo "diff $1 $2"
|
|
diff $1 $2
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
check()
|
|
{
|
|
if ! grep -q "$2" "$1"
|
|
then
|
|
echo "Did not find expected output in $1:"
|
|
echo " $2"
|
|
echo ""
|
|
echo "Actual output below:"
|
|
cat "$1"
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
# Extract actual command line from linker's -v output.
|
|
cat incremental_test.cmdline |
|
|
grep "gcctestdir/\(collect-\)\?ld " |
|
|
sed "s/--incremental[-a-z]* //g" |
|
|
cut -d ' ' -f 2- > actual
|
|
|
|
# Extract recorded command line from dump of the output file.
|
|
cat incremental_test.stdout |
|
|
grep "Link command line" |
|
|
cut -d : -f 2- |
|
|
cut -d ' ' -f 3- |
|
|
sed "s/'//g" > recorded
|
|
|
|
# Verify that the command line was recorded correctly.
|
|
check_cmp actual recorded
|
|
|
|
rm -f actual recorded
|
|
|
|
# Filter the incremental-dump output into a format that can be grepped
|
|
# more easily.
|
|
|
|
awk '
|
|
/^[A-Za-z][A-Za-z ]+:$/ { section = $0; }
|
|
/^[[]/ { subsection = $0; }
|
|
/^ / { print section, subsection, $0; }
|
|
' < incremental_test.stdout > incremental_test.dump
|
|
|
|
check incremental_test.dump "Input sections: .* incremental_test_1.o *1 "
|
|
check incremental_test.dump "Input sections: .* incremental_test_2.o *1 "
|
|
check incremental_test.dump "Global symbol table: .* main .* relocation type "
|
|
check incremental_test.dump "Global symbol table: .* a *incremental_test_1.o "
|
|
check incremental_test.dump "Global symbol table: .* a .* relocation type "
|
|
check incremental_test.dump "Global symbol table: .* b *incremental_test_2.o "
|
|
check incremental_test.dump "Global symbol table: .* b .* relocation type "
|
|
check incremental_test.dump "Global symbol table: .* t1 *incremental_test_2.o "
|
|
check incremental_test.dump "Global symbol table: .* t1 .* relocation type "
|
|
|
|
rm -f incremental_test.dump
|
|
|
|
exit 0
|