printf "%s\n" "$*" >>$EXE.out
printf "%s\n" "==========" >>$EXE.out
$debug && echo "Trying: $*"
- "$@" >>$EXE.out 2>&1
- exitcode=$?
- return $exitcode
+ $@ >>$EXE.out 2>&1
+ return $?
}
check_cc() {
- local tempname="/tmp/temp.$$.$RANDOM"
+ local tempname="$(mktemp)"
# Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
# "-xc": C language. "/dev/null" is an empty source file.
- if $CC $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then
+ if $CC $CPPFLAGS $CFLAGS $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then
echo "$1";
else
echo "$2";
fi
- rm "$tempname".o 2>/dev/null
+ rm -f "$tempname" "$tempname".o
}
check_libc_is_glibc() {
- local tempname="/tmp/temp.$$.$RANDOM"
+ local tempname="$(mktemp)"
echo "\
#include <stdlib.h>
/* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
syntax error here
#endif
" >"$tempname".c
- if $CC "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then
+ if $CC $CPPFLAGS $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then
echo "$2";
else
echo "$1";
fi
- rm "$tempname".c "$tempname".o 2>/dev/null
+ rm -f "$tempname" "$tempname".[co]
}
EXE="$1"
# The --sort-section option is not supported by older versions of ld
SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""`
+START_GROUP="-Wl,--start-group"
+END_GROUP="-Wl,--end-group"
+INFO_OPTS="-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"
+
+# gold may not support --sort-common (yet)
+SORT_COMMON=`check_cc "-Wl,--sort-common" ""`
+
# Static linking against glibc produces buggy executables
# (glibc does not cope well with ld --gc-sections).
# See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
fi
)`
+# The --gc-sections option is not supported by older versions of ld
+if test -n "$GC_SECTIONS"; then
+ GC_SECTIONS=`check_cc "$GC_SECTIONS" ""`
+fi
+
# Sanitize lib list (dups, extra spaces etc)
LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs`
# First link with all libs. If it fails, bail out
echo "Trying libraries: $LDLIBS"
# "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
-l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
+l_list=`echo " $LDLIBS " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
+test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
try $CC $CFLAGS $LDFLAGS \
-o $EXE \
- -Wl,--sort-common \
+ $SORT_COMMON \
$SORT_SECTION \
$GC_SECTIONS \
- -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
+ $START_GROUP $O_FILES $A_FILES $END_GROUP \
$l_list \
|| {
echo "Failed: $l_list"
while test "$LDLIBS"; do
$debug && echo "Trying libraries: $LDLIBS"
all_needed=true
+ last_needed=false
for one in $LDLIBS; do
without_one=`echo " $LDLIBS " | sed "s/ $one / /g" | xargs`
# "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
- l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
- test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
+ l_list=`echo " $without_one " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
+ test x"$l_list" != x"" && l_list="$START_GROUP $l_list $END_GROUP"
$debug && echo "Trying -l options: '$l_list'"
try $CC $CFLAGS $LDFLAGS \
-o $EXE \
- -Wl,--sort-common \
+ $SORT_COMMON \
$SORT_SECTION \
$GC_SECTIONS \
- -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
+ $START_GROUP $O_FILES $A_FILES $END_GROUP \
$l_list
if test $? = 0; then
- echo " Library $one is not needed"
+ echo " Library $one is not needed, excluding it"
LDLIBS="$without_one"
all_needed=false
+ last_needed=false
else
- echo " Library $one is needed"
+ echo " Library $one is needed, can't exclude it (yet)"
+ last_needed=true
fi
done
# All libs were needed, can't remove any
$all_needed && break
- # If there is no space char, the list has just one lib.
- # I'm not sure that in this case lib really is 100% needed.
- # Let's try linking without it anyway... thus commented out.
- #{ echo "$LDLIBS" | grep -q ' '; } || break
+ # Optimization: was the last tried lib needed?
+ if $last_needed; then
+ # Was it the only one lib left? Don't test again then.
+ { echo "$LDLIBS" | grep -q ' '; } || break
+ fi
done
# Make the binary with final, minimal list of libs
echo "Final link with: ${LDLIBS:-<none>}"
-l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
+l_list=`echo " $LDLIBS " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
+test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
# --verbose gives us gobs of info to stdout (e.g. linker script used)
if ! test -f busybox_ldscript; then
try $CC $CFLAGS $LDFLAGS \
-o $EXE \
- -Wl,--sort-common \
+ $SORT_COMMON \
$SORT_SECTION \
$GC_SECTIONS \
- -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
+ $START_GROUP $O_FILES $A_FILES $END_GROUP \
$l_list \
- -Wl,--warn-common \
- -Wl,-Map,$EXE.map \
- -Wl,--verbose \
+ $INFO_OPTS \
|| {
cat $EXE.out
exit 1
# Hmm, "ld --sort-section alignment" should do it too.
try $CC $CFLAGS $LDFLAGS \
-o $EXE \
- -Wl,--sort-common \
+ $SORT_COMMON \
$SORT_SECTION \
$GC_SECTIONS \
-Wl,-T,busybox_ldscript \
- -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
+ $START_GROUP $O_FILES $A_FILES $END_GROUP \
$l_list \
- -Wl,--warn-common \
- -Wl,-Map,$EXE.map \
- -Wl,--verbose \
+ $INFO_OPTS \
|| {
cat $EXE.out
exit 1
-Wl,-z,combreloc \
-Wl,-soname="libbusybox.so.$BB_VER" \
-Wl,--undefined=lbb_main \
- -Wl,--sort-common \
+ $SORT_COMMON \
$SORT_SECTION \
- -Wl,--start-group $A_FILES -Wl,--end-group \
+ $START_GROUP $A_FILES $END_GROUP \
$l_list \
- -Wl,--warn-common \
- -Wl,-Map,$EXE.map \
- -Wl,--verbose \
+ $INFO_OPTS \
|| {
echo "Linking $EXE failed"
cat $EXE.out
EXE="$sharedlib_dir/busybox_unstripped"
try $CC $CFLAGS $LDFLAGS \
-o $EXE \
- -Wl,--sort-common \
+ $SORT_COMMON \
$SORT_SECTION \
$GC_SECTIONS \
- -Wl,--start-group $O_FILES -Wl,--end-group \
+ $START_GROUP $O_FILES $END_GROUP \
-L"$sharedlib_dir" -lbusybox \
- -Wl,--warn-common \
- -Wl,-Map,$EXE.map \
- -Wl,--verbose \
+ $l_list \
+ $INFO_OPTS \
|| {
echo "Linking $EXE failed"
cat $EXE.out
if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)"
- gcc -DNAME_MAIN_CNAME -E -include include/autoconf.h include/applets.h \
+ gcc -DNAME_MAIN -E -include include/autoconf.h include/applets.h \
| grep -v "^#" \
| grep -v "^$" \
> applet_lst.tmp
EXE="$sharedlib_dir/$name"
try $CC $CFLAGS $LDFLAGS "$sharedlib_dir/applet.c" \
-o $EXE \
- -Wl,--sort-common \
+ $SORT_COMMON \
$SORT_SECTION \
$GC_SECTIONS \
-L"$sharedlib_dir" -lbusybox \
}
rm -- "$sharedlib_dir/applet.c" $EXE.out
$STRIP -s --remove-section=.note --remove-section=.comment $EXE
+ # Let user see that we do something - list the names of created binaries:
+ echo "$EXE"
done <applet_lst.tmp
fi
projects / oweals / busybox.git / blobdiff