backport: config.gcc: Move -L usage from LINK_OS_EXTRA_SPEC32 and LINK_OS_EXTRA_SPEC64 to...

Backport from mainline
	2019-10-08  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>

	* config.gcc: Move -L usage from LINK_OS_EXTRA_SPEC32 and
	LINK_OS_EXTRA_SPEC64 to MD_STARTFILE_PREFIX and
	MD_STARTFILE_PREFIX_1 when using --with-advance-toolchain.

From-SVN: r277353
This commit is contained in:
Peter Bergner 2019-10-23 21:34:42 +00:00 committed by Peter Bergner
parent 5bd08e79df
commit f81de8afe7
2 changed files with 15 additions and 5 deletions

View File

@ -1,3 +1,12 @@
2019-10-23 Peter Bergner <bergner@linux.ibm.com>
Backport from mainline
2019-10-08 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
* config.gcc: Move -L usage from LINK_OS_EXTRA_SPEC32 and
LINK_OS_EXTRA_SPEC64 to MD_STARTFILE_PREFIX and
MD_STARTFILE_PREFIX_1 when using --with-advance-toolchain.
2019-10-23 Martin Liska <mliska@suse.cz>
Backport from mainline

View File

@ -4700,14 +4700,12 @@ case "${target}" in
echo "#undef LINK_OS_EXTRA_SPEC32"
echo "#define LINK_OS_EXTRA_SPEC32" \
"\"%(link_os_new_dtags)" \
"-rpath $prefix/lib -rpath $at/lib" \
"-L $prefix/lib -L $at/lib\""
"-rpath $prefix/lib -rpath $at/lib\""
echo
echo "#undef LINK_OS_EXTRA_SPEC64"
echo "#define LINK_OS_EXTRA_SPEC64" \
"\"%(link_os_new_dtags)" \
"-rpath $prefix/lib64 -rpath $at/lib64" \
"-L $prefix/lib64 -L $at/lib64\""
"-rpath $prefix/lib64 -rpath $at/lib64\""
echo
echo "#undef LINK_OS_NEW_DTAGS_SPEC"
echo "#define LINK_OS_NEW_DTAGS_SPEC" \
@ -4720,7 +4718,10 @@ case "${target}" in
echo "#define MD_EXEC_PREFIX \"$at/bin/\""
echo
echo "#undef MD_STARTFILE_PREFIX"
echo "#define MD_STARTFILE_PREFIX \"$at/lib/\"") \
echo "#define MD_STARTFILE_PREFIX \"$prefix/lib/\""
echo
echo "#undef MD_STARTFILE_PREFIX_1"
echo "#define MD_STARTFILE_PREFIX_1 \"$at/lib/\"") \
> advance-toolchain.h
else
echo "Unknown advance-toolchain $with_advance_toolchain"