mirror of https://code.videolan.org/videolan/vlc
84 lines
4.0 KiB
Diff
84 lines
4.0 KiB
Diff
From 5fe8ae738927cd2c7e6d786b359e39876c84630c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
|
|
Date: Wed, 10 Oct 2018 10:47:21 +0300
|
|
Subject: [PATCH] Prefer response files over linker scripts for mingw tools
|
|
|
|
The GCC/binutils tools support response files just fine, while
|
|
lld (impersonating GNU ld) only supports response files, not
|
|
linker scripts. Using a linker script as input just to pass a
|
|
list of files is overkill for cases when a response file is enough.
|
|
---
|
|
libtool-2.4.6/build-aux/ltmain.in | 28 ++++++++++++++--------------
|
|
libtool-2.4.6/m4/libtool.m4 | 2 ++
|
|
2 files changed, 16 insertions(+), 14 deletions(-)
|
|
|
|
diff --git libtool-2.4.6/build-aux/ltmain.in.orig libtool-2.4.6/build-aux/ltmain.in
|
|
index 2641327..f6b4217 100644
|
|
--- libtool-2.4.6/build-aux/ltmain.in.orig 2019-05-14 15:41:21.977391100 +0200
|
|
+++ libtool-2.4.6/build-aux/ltmain.in 2019-05-14 15:43:07.767697900 +0200
|
|
@@ -9852,20 +9852,7 @@ EOF
|
|
last_robj=
|
|
k=1
|
|
|
|
- if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
|
|
- output=$output_objdir/$output_la.lnkscript
|
|
- func_verbose "creating GNU ld script: $output"
|
|
- echo 'INPUT (' > $output
|
|
- for obj in $save_libobjs
|
|
- do
|
|
- func_to_tool_file "$obj"
|
|
- $ECHO "$func_to_tool_file_result" >> $output
|
|
- done
|
|
- echo ')' >> $output
|
|
- func_append delfiles " $output"
|
|
- func_to_tool_file "$output"
|
|
- output=$func_to_tool_file_result
|
|
- elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
|
|
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
|
|
output=$output_objdir/$output_la.lnk
|
|
func_verbose "creating linker input file list: $output"
|
|
: > $output
|
|
@@ -9884,6 +9871,19 @@ EOF
|
|
func_append delfiles " $output"
|
|
func_to_tool_file "$output"
|
|
output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
|
|
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
|
|
+ output=$output_objdir/$output_la.lnkscript
|
|
+ func_verbose "creating GNU ld script: $output"
|
|
+ echo 'INPUT (' > $output
|
|
+ for obj in $save_libobjs
|
|
+ do
|
|
+ func_to_tool_file "$obj"
|
|
+ $ECHO "$func_to_tool_file_result" >> $output
|
|
+ done
|
|
+ echo ')' >> $output
|
|
+ func_append delfiles " $output"
|
|
+ func_to_tool_file "$output"
|
|
+ output=$func_to_tool_file_result
|
|
else
|
|
if test -n "$save_libobjs"; then
|
|
func_verbose "creating reloadable object files..."
|
|
diff --git libtool-2.4.6/m4/libtool.m4.orig libtool-2.4.6/m4/libtool.m4
|
|
index 6f93d32..2c5c2f0 100644
|
|
--- libtool-2.4.6/m4/libtool.m4.orig
|
|
+++ libtool-2.4.6/m4/libtool.m4
|
|
@@ -4750,6 +4750,7 @@ _LT_EOF
|
|
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
|
|
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
|
|
+ _LT_TAGVAR(file_list_spec, $1)='@'
|
|
|
|
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
|
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
|
@@ -6166,6 +6167,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
|
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
_LT_TAGVAR(always_export_symbols, $1)=no
|
|
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
+ _LT_TAGVAR(file_list_spec, $1)='@'
|
|
|
|
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
|
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
|
--
|
|
2.7.4
|
|
|