Added force_parlib_symbols as default param to gcc
authorKevin Klues <klueska@cs.berkeley.edu>
Mon, 10 Dec 2012 23:23:53 +0000 (15:23 -0800)
committerKevin Klues <klueska@cs.berkeley.edu>
Mon, 10 Dec 2012 23:23:53 +0000 (15:23 -0800)
Allowed us to remove the busybox patch that diabled looping over
included libs and not including them if they wre not needed.

We previously had to override this because we always wanted parlib
included, but now it is included by default as part of invoking gcc.

tests/Makefrag
tools/compilers/gcc-glibc/gcc-4.6.1-ros/gcc/config/i386/i386.h
tools/patches/busybox-1.17.3-parlib.patch [deleted file]

index ed62bba..7e9bc97 100644 (file)
@@ -2,11 +2,11 @@ TESTS_DIR = tests
 
 OBJDIRS += $(TESTS_DIR)
 
-TESTS_CFLAGS += $(USER_CFLAGS) -g -u force_parlib_symbols
+TESTS_CFLAGS += $(USER_CFLAGS) -g
 
 ALL_TEST_FILES = $(shell ls $(TESTS_DIR)/*.c)
 
-TESTS_LDLIBS := -lpthread -lparlib
+TESTS_LDLIBS := -lpthread
 
 TESTS_SRCS := $(ALL_TEST_FILES)
 
index 7356ce8..6b12990 100644 (file)
@@ -540,7 +540,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
    The order here is important so that -march doesn't squash the
    tune or cpu values.  */
 #define OPTION_DEFAULT_SPECS                                      \
-  {"parlib", "-lparlib"},                         \
+  {"parlib", "-lparlib -u force_parlib_symbols"},                         \
   {"tune", "%{!mtune=*:%{!mcpu=*:%{!march=*:-mtune=%(VALUE)}}}" }, \
   {"tune_32", "%{" OPT_ARCH32 ":%{!mtune=*:%{!mcpu=*:%{!march=*:-mtune=%(VALUE)}}}}" }, \
   {"tune_64", "%{" OPT_ARCH64 ":%{!mtune=*:%{!mcpu=*:%{!march=*:-mtune=%(VALUE)}}}}" }, \
diff --git a/tools/patches/busybox-1.17.3-parlib.patch b/tools/patches/busybox-1.17.3-parlib.patch
deleted file mode 100644 (file)
index db5ecd3..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- busybox-1.17.3/Makefile.orig       2012-03-13 13:50:26.000000000 -0700
-+++ busybox-1.17.3/Makefile    2012-03-13 13:28:51.000000000 -0700
-@@ -315,13 +315,13 @@
- # Use LINUXINCLUDE when you must reference the include/ directory.
- # Needed to be compatible with the O= option
--CFLAGS                := $(CFLAGS)
-+CFLAGS                := $(CFLAGS) -u force_parlib_symbols
- # Added only to final link stage of busybox binary
- CFLAGS_busybox        := $(CFLAGS_busybox)
- CPPFLAGS      := $(CPPFLAGS)
- AFLAGS                := $(AFLAGS)
- LDFLAGS               := $(LDFLAGS)
--LDLIBS                :=
-+LDLIBS                := parlib
- # Read KERNELRELEASE from .kernelrelease (if it exists)
- KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
---- busybox-1.17.3/scripts/trylink.orig        2012-03-13 13:50:53.000000000 -0700
-+++ busybox-1.17.3/scripts/trylink     2012-03-13 13:32:33.000000000 -0700
-@@ -144,6 +144,12 @@
-       l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-       test x"$l_list" != x"" && l_list="$START_GROUP $l_list $END_GROUP"
-       $debug && echo "Trying -l options: '$l_list'"
-+      # brho: put in this if block to make sure they build parlib
-+      if [ "$one" = "parlib" ]; then
-+              echo " Forcing link with parlib"
-+              last_needed=true
-+              continue
-+      fi
-       try $CC $CFLAGS $LDFLAGS \
-               -o $EXE \
-               $SORT_COMMON \