Make gold testsuite work with CC and CXX specifying -B
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.
This commit is contained in:
Alan Modra
parent
9e49efb79c
commit
5acaada745
|
|
@ -1,3 +1,34 @@
|
|||
2018-11-08 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* 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.
|
||||
|
||||
2018-11-02 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* Makefile.am (MOSTLYCLEANFILES): Define.
|
||||
|
|
|
|||
|
|
@ -260,25 +260,29 @@ po/POTFILES.in: @MAINT@ Makefile
|
|||
if GCC
|
||||
if NATIVE_LINKER
|
||||
|
||||
gcctestdir1/ld: ld-new
|
||||
gcctestdir1/ld gcctestdir1/collect-ld: ld-new
|
||||
test -d gcctestdir1 || mkdir -p gcctestdir1
|
||||
rm -f gcctestdir1/ld
|
||||
(cd gcctestdir1 && $(LN_S) ../ld-new ld)
|
||||
rm -f $@
|
||||
$(LN_S) $(abs_top_builddir)/ld-new $@
|
||||
|
||||
ld1_SOURCES = $(sources_var)
|
||||
ld1_DEPENDENCIES = $(deps_var) gcctestdir1/ld
|
||||
ld1_DEPENDENCIES = $(deps_var) gcctestdir1/ld gcctestdir1/collect-ld
|
||||
ld1_LDADD = $(ldadd_var)
|
||||
ld1_LDFLAGS = -Bgcctestdir1/
|
||||
editcc1 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir1\/\2/'
|
||||
ld1_LINK = `echo $(CXXLD) | sed $(editcc1)`\
|
||||
$(AM_CXXFLAGS) $(CXXFLAGS) $(ld1_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
gcctestdir2/ld: ld1
|
||||
gcctestdir2/ld gcctestdir2/collect-ld: ld1
|
||||
test -d gcctestdir2 || mkdir -p gcctestdir2
|
||||
rm -f gcctestdir2/ld
|
||||
(cd gcctestdir2 && $(LN_S) ../ld1 ld)
|
||||
rm -f $@
|
||||
$(LN_S) $(abs_top_builddir)/ld1 $@
|
||||
|
||||
ld2_SOURCES = $(sources_var)
|
||||
ld2_DEPENDENCIES = $(deps_var) gcctestdir2/ld
|
||||
ld2_DEPENDENCIES = $(deps_var) gcctestdir2/ld gcctestdir2/collect-ld
|
||||
ld2_LDADD = $(ldadd_var)
|
||||
ld2_LDFLAGS = -Bgcctestdir2/
|
||||
editcc2 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir2\/\2/'
|
||||
ld2_LINK = `echo $(CXXLD) | sed $(editcc2)`\
|
||||
$(AM_CXXFLAGS) $(CXXFLAGS) $(ld2_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
bootstrap-test: ld2
|
||||
rm -f $@
|
||||
|
|
@ -290,22 +294,25 @@ libgold-1-r.o: gcctestdir1/ld libgold.a
|
|||
gcctestdir1/ld -o $@ -r --whole-archive libgold.a
|
||||
|
||||
ld1_r_SOURCES = $(sources_var)
|
||||
ld1_r_DEPENDENCIES = libgold-1-r.o $(deps_var) gcctestdir1/ld
|
||||
ld1_r_DEPENDENCIES = libgold-1-r.o $(deps_var) gcctestdir1/ld gcctestdir1/collect-ld
|
||||
ld1_r_LDADD = libgold-1-r.o $(ldadd_var)
|
||||
ld1_r_LDFLAGS = -Bgcctestdir1/
|
||||
ld1_r_LINK = `echo $(CXXLD) | sed $(editcc1)`\
|
||||
$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
gcctestdir2-r/ld: ld1-r
|
||||
gcctestdir2-r/ld gcctestdir2-r/collect-ld: ld1-r
|
||||
test -d gcctestdir2-r || mkdir -p gcctestdir2-r
|
||||
rm -f gcctestdir2-r/ld
|
||||
(cd gcctestdir2-r && $(LN_S) ../ld1-r ld)
|
||||
rm -f $@
|
||||
$(LN_S) $(abs_top_builddir)/ld1-r $@
|
||||
|
||||
libgold-2-r.o: gcctestdir2-r/ld libgold.a
|
||||
gcctestdir2-r/ld -o $@ -r --whole-archive libgold.a
|
||||
|
||||
ld2_r_SOURCES = $(sources_var)
|
||||
ld2_r_DEPENDENCIES = libgold-2-r.o $(deps_var) gcctestdir2-r/ld
|
||||
ld2_r_DEPENDENCIES = libgold-2-r.o $(deps_var) gcctestdir2-r/ld gcctestdir2-r/collect-ld
|
||||
ld2_r_LDADD = libgold-2-r.o $(ldadd_var)
|
||||
ld2_r_LDFLAGS = -Bgcctestdir2-r/
|
||||
editcc2r = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir2-r\/\2/'
|
||||
ld2_r_LINK = `echo $(CXXLD) | sed $(editcc2r)`\
|
||||
$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
bootstrap-test-r: ld2-r
|
||||
rm -f $@
|
||||
|
|
@ -327,30 +334,34 @@ check_PROGRAMS += ld4
|
|||
TESTS += bootstrap-test-treehash-chunksize
|
||||
MOSTLYCLEANFILES += bootstrap-test-treehash-chunksize
|
||||
|
||||
gcctestdir3/ld: ld-new
|
||||
gcctestdir3/ld gcctestdir3/collect-ld: ld-new
|
||||
test -d gcctestdir3 || mkdir -p gcctestdir3
|
||||
rm -f gcctestdir3/ld
|
||||
(cd gcctestdir3 && $(LN_S) ../ld-new ld)
|
||||
rm -f $@
|
||||
$(LN_S) $(abs_top_builddir)/ld-new $@
|
||||
|
||||
ld3_SOURCES = $(sources_var)
|
||||
ld3_DEPENDENCIES = $(deps_var) gcctestdir3/ld
|
||||
ld3_DEPENDENCIES = $(deps_var) gcctestdir3/ld gcctestdir3/collect-ld
|
||||
ld3_LDADD = $(ldadd_var)
|
||||
ld3_LDFLAGS = -Bgcctestdir3/
|
||||
editcc3 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir3\/\2/'
|
||||
ld3_LINK = `echo $(CXXLD) | sed $(editcc3)`\
|
||||
$(AM_CXXFLAGS) $(CXXFLAGS) $(ld3_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
gcctestdir4/ld: ld-new
|
||||
gcctestdir4/ld gcctestdir4/collect-ld: ld-new
|
||||
test -d gcctestdir4 || mkdir -p gcctestdir4
|
||||
rm -f gcctestdir4/ld
|
||||
(cd gcctestdir4 && $(LN_S) ../ld-new ld)
|
||||
rm -f $@
|
||||
$(LN_S) $(abs_top_builddir)/ld-new $@
|
||||
|
||||
ld4_SOURCES = $(sources_var)
|
||||
ld4_DEPENDENCIES = $(deps_var) gcctestdir4/ld
|
||||
ld4_DEPENDENCIES = $(deps_var) gcctestdir4/ld gcctestdir4/collect-ld
|
||||
ld4_LDADD = $(ldadd_var)
|
||||
ld4_LDFLAGS = -Bgcctestdir4/
|
||||
editcc4 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir4\/\2/'
|
||||
ld4_LINK = `echo $(CXXLD) | sed $(editcc4)`\
|
||||
$(AM_CXXFLAGS) $(CXXFLAGS) $(ld4_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
ld1_LDFLAGS += -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
|
||||
ld2_LDFLAGS += -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
|
||||
ld3_LDFLAGS += -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
|
||||
ld4_LDFLAGS += -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12346 -Wl,--build-id-min-file-size-for-treehash=0
|
||||
ld1_LDFLAGS = -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
|
||||
ld2_LDFLAGS = -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
|
||||
ld3_LDFLAGS = -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
|
||||
ld4_LDFLAGS = -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12346 -Wl,--build-id-min-file-size-for-treehash=0
|
||||
|
||||
if THREADS
|
||||
|
||||
|
|
|
|||
119
gold/Makefile.in
119
gold/Makefile.in
|
|
@ -198,28 +198,16 @@ ld_new_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld_new_LDFLAGS) \
|
|||
$(LDFLAGS) -o $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@am_ld1_OBJECTS = $(am__objects_4)
|
||||
ld1_OBJECTS = $(am_ld1_OBJECTS)
|
||||
ld1_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld1_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@am_ld1_r_OBJECTS = $(am__objects_4)
|
||||
ld1_r_OBJECTS = $(am_ld1_r_OBJECTS)
|
||||
ld1_r_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld1_r_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@am_ld2_OBJECTS = $(am__objects_4)
|
||||
ld2_OBJECTS = $(am_ld2_OBJECTS)
|
||||
ld2_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld2_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@am_ld2_r_OBJECTS = $(am__objects_4)
|
||||
ld2_r_OBJECTS = $(am_ld2_r_OBJECTS)
|
||||
ld2_r_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld2_r_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@am_ld3_OBJECTS = $(am__objects_4)
|
||||
ld3_OBJECTS = $(am_ld3_OBJECTS)
|
||||
ld3_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld3_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@am_ld4_OBJECTS = $(am__objects_4)
|
||||
ld4_OBJECTS = $(am_ld4_OBJECTS)
|
||||
ld4_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld4_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
AM_V_P = $(am__v_P_@AM_V@)
|
||||
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||
am__v_P_0 = false
|
||||
|
|
@ -841,29 +829,32 @@ dwp_LDFLAGS = $(GOLD_LDFLAGS)
|
|||
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/../bfd/development.sh
|
||||
POTFILES = $(CCFILES) $(HFILES) $(TARGETSOURCES)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_SOURCES = $(sources_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_DEPENDENCIES = $(deps_var) gcctestdir1/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_DEPENDENCIES = $(deps_var) gcctestdir1/ld gcctestdir1/collect-ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_LDADD = $(ldadd_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_LDFLAGS = -Bgcctestdir1/ \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id=tree \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-chunk-size-for-treehash=12345 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-min-file-size-for-treehash=0 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_1)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@editcc1 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir1\/\2/'
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_LINK = `echo $(CXXLD) | sed $(editcc1)`\
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS) $(ld1_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_SOURCES = $(sources_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_DEPENDENCIES = $(deps_var) gcctestdir2/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_DEPENDENCIES = $(deps_var) gcctestdir2/ld gcctestdir2/collect-ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_LDADD = $(ldadd_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_LDFLAGS = -Bgcctestdir2/ \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id=tree \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-chunk-size-for-treehash=12345 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-min-file-size-for-treehash=0 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_2)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@editcc2 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir2\/\2/'
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_LINK = `echo $(CXXLD) | sed $(editcc2)`\
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS) $(ld2_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_r_SOURCES = $(sources_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_r_DEPENDENCIES = libgold-1-r.o $(deps_var) gcctestdir1/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_r_DEPENDENCIES = libgold-1-r.o $(deps_var) gcctestdir1/ld gcctestdir1/collect-ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_r_LDADD = libgold-1-r.o $(ldadd_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_r_LDFLAGS = -Bgcctestdir1/
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_r_LINK = `echo $(CXXLD) | sed $(editcc1)`\
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_r_SOURCES = $(sources_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_r_DEPENDENCIES = libgold-2-r.o $(deps_var) gcctestdir2-r/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_r_DEPENDENCIES = libgold-2-r.o $(deps_var) gcctestdir2-r/ld gcctestdir2-r/collect-ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_r_LDADD = libgold-2-r.o $(ldadd_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_r_LDFLAGS = -Bgcctestdir2-r/
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@editcc2r = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir2-r\/\2/'
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_r_LINK = `echo $(CXXLD) | sed $(editcc2r)`\
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@TESTS = bootstrap-test bootstrap-test-r \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ bootstrap-test-treehash-chunksize \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_6)
|
||||
|
|
@ -872,18 +863,32 @@ POTFILES = $(CCFILES) $(HFILES) $(TARGETSOURCES)
|
|||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ bootstrap-test-treehash-chunksize \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_7)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_SOURCES = $(sources_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_DEPENDENCIES = $(deps_var) gcctestdir3/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_DEPENDENCIES = $(deps_var) gcctestdir3/ld gcctestdir3/collect-ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_LDADD = $(ldadd_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_LDFLAGS = -Bgcctestdir3/ \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id=tree \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@editcc3 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir3\/\2/'
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_LINK = `echo $(CXXLD) | sed $(editcc3)`\
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS) $(ld3_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_SOURCES = $(sources_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_DEPENDENCIES = $(deps_var) gcctestdir4/ld gcctestdir4/collect-ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_LDADD = $(ldadd_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@editcc4 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir4\/\2/'
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_LINK = `echo $(CXXLD) | sed $(editcc4)`\
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS) $(ld4_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_LDFLAGS = -Wl,--build-id=tree \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-chunk-size-for-treehash=12345 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-min-file-size-for-treehash=0 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_1)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld2_LDFLAGS = -Wl,--build-id=tree \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-chunk-size-for-treehash=12345 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-min-file-size-for-treehash=0 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_2)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_LDFLAGS = -Wl,--build-id=tree \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-chunk-size-for-treehash=12345 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-min-file-size-for-treehash=0 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_3)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_SOURCES = $(sources_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_DEPENDENCIES = $(deps_var) gcctestdir4/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_LDADD = $(ldadd_var)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_LDFLAGS = -Bgcctestdir4/ \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id=tree \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld4_LDFLAGS = -Wl,--build-id=tree \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-chunk-size-for-treehash=12346 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ -Wl,--build-id-min-file-size-for-treehash=0 \
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_4)
|
||||
|
|
@ -1016,27 +1021,27 @@ ld-new$(EXEEXT): $(ld_new_OBJECTS) $(ld_new_DEPENDENCIES) $(EXTRA_ld_new_DEPENDE
|
|||
|
||||
ld1$(EXEEXT): $(ld1_OBJECTS) $(ld1_DEPENDENCIES) $(EXTRA_ld1_DEPENDENCIES)
|
||||
@rm -f ld1$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(ld1_LINK) $(ld1_OBJECTS) $(ld1_LDADD) $(LIBS)
|
||||
$(AM_V_GEN)$(ld1_LINK) $(ld1_OBJECTS) $(ld1_LDADD) $(LIBS)
|
||||
|
||||
ld1-r$(EXEEXT): $(ld1_r_OBJECTS) $(ld1_r_DEPENDENCIES) $(EXTRA_ld1_r_DEPENDENCIES)
|
||||
@rm -f ld1-r$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(ld1_r_LINK) $(ld1_r_OBJECTS) $(ld1_r_LDADD) $(LIBS)
|
||||
$(AM_V_GEN)$(ld1_r_LINK) $(ld1_r_OBJECTS) $(ld1_r_LDADD) $(LIBS)
|
||||
|
||||
ld2$(EXEEXT): $(ld2_OBJECTS) $(ld2_DEPENDENCIES) $(EXTRA_ld2_DEPENDENCIES)
|
||||
@rm -f ld2$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(ld2_LINK) $(ld2_OBJECTS) $(ld2_LDADD) $(LIBS)
|
||||
$(AM_V_GEN)$(ld2_LINK) $(ld2_OBJECTS) $(ld2_LDADD) $(LIBS)
|
||||
|
||||
ld2-r$(EXEEXT): $(ld2_r_OBJECTS) $(ld2_r_DEPENDENCIES) $(EXTRA_ld2_r_DEPENDENCIES)
|
||||
@rm -f ld2-r$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(ld2_r_LINK) $(ld2_r_OBJECTS) $(ld2_r_LDADD) $(LIBS)
|
||||
$(AM_V_GEN)$(ld2_r_LINK) $(ld2_r_OBJECTS) $(ld2_r_LDADD) $(LIBS)
|
||||
|
||||
ld3$(EXEEXT): $(ld3_OBJECTS) $(ld3_DEPENDENCIES) $(EXTRA_ld3_DEPENDENCIES)
|
||||
@rm -f ld3$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(ld3_LINK) $(ld3_OBJECTS) $(ld3_LDADD) $(LIBS)
|
||||
$(AM_V_GEN)$(ld3_LINK) $(ld3_OBJECTS) $(ld3_LDADD) $(LIBS)
|
||||
|
||||
ld4$(EXEEXT): $(ld4_OBJECTS) $(ld4_DEPENDENCIES) $(EXTRA_ld4_DEPENDENCIES)
|
||||
@rm -f ld4$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(ld4_LINK) $(ld4_OBJECTS) $(ld4_LDADD) $(LIBS)
|
||||
$(AM_V_GEN)$(ld4_LINK) $(ld4_OBJECTS) $(ld4_LDADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
|
|
@ -1610,15 +1615,15 @@ po/POTFILES.in: @MAINT@ Makefile
|
|||
# build ld2. ld1 and ld2 should be identical. ld-new need not be
|
||||
# identical to ld1, since it was linked with the host linker.
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir1/ld: ld-new
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir1/ld gcctestdir1/collect-ld: ld-new
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ test -d gcctestdir1 || mkdir -p gcctestdir1
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f gcctestdir1/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ (cd gcctestdir1 && $(LN_S) ../ld-new ld)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LN_S) $(abs_top_builddir)/ld-new $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir2/ld: ld1
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir2/ld gcctestdir2/collect-ld: ld1
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ test -d gcctestdir2 || mkdir -p gcctestdir2
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f gcctestdir2/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ (cd gcctestdir2 && $(LN_S) ../ld1 ld)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LN_S) $(abs_top_builddir)/ld1 $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@bootstrap-test: ld2
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@
|
||||
|
|
@ -1629,10 +1634,10 @@ po/POTFILES.in: @MAINT@ Makefile
|
|||
@GCC_TRUE@@NATIVE_LINKER_TRUE@libgold-1-r.o: gcctestdir1/ld libgold.a
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ gcctestdir1/ld -o $@ -r --whole-archive libgold.a
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir2-r/ld: ld1-r
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir2-r/ld gcctestdir2-r/collect-ld: ld1-r
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ test -d gcctestdir2-r || mkdir -p gcctestdir2-r
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f gcctestdir2-r/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ (cd gcctestdir2-r && $(LN_S) ../ld1-r ld)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LN_S) $(abs_top_builddir)/ld1-r $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@libgold-2-r.o: gcctestdir2-r/ld libgold.a
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ gcctestdir2-r/ld -o $@ -r --whole-archive libgold.a
|
||||
|
|
@ -1643,15 +1648,15 @@ po/POTFILES.in: @MAINT@ Makefile
|
|||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ echo "cmp ld1-r ld2-r" >> $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ chmod +x $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir3/ld: ld-new
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir3/ld gcctestdir3/collect-ld: ld-new
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ test -d gcctestdir3 || mkdir -p gcctestdir3
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f gcctestdir3/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ (cd gcctestdir3 && $(LN_S) ../ld-new ld)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LN_S) $(abs_top_builddir)/ld-new $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir4/ld: ld-new
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir4/ld gcctestdir4/collect-ld: ld-new
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ test -d gcctestdir4 || mkdir -p gcctestdir4
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f gcctestdir4/ld
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ (cd gcctestdir4 && $(LN_S) ../ld-new ld)
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LN_S) $(abs_top_builddir)/ld-new $@
|
||||
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@@THREADS_TRUE@bootstrap-test-treehash: ld1 ld3
|
||||
@GCC_TRUE@@NATIVE_LINKER_TRUE@@THREADS_TRUE@ rm -f $@
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -49,7 +49,7 @@ check()
|
|||
|
||||
# Extract actual command line from linker's -v output.
|
||||
cat incremental_test.cmdline |
|
||||
grep "gcctestdir/ld " |
|
||||
grep "gcctestdir/\(collect-\)\?ld " |
|
||||
sed "s/--incremental[-a-z]* //g" |
|
||||
cut -d ' ' -f 2- > actual
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue