jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

update patch to gcc-4.1.0 release

Browse Source
This commit is contained in:
Mike Frysinger 2006-03-02 05:25:36 +00:00
parent b2da053b14
commit 4bca06f079
1 changed files with 264 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

462
toolchain/gcc/4.1.0/100-uclibc-conf.patch
View File

@ -1,7 +1,38 @@
diff -urN gcc-4.0.0-dist/boehm-gc/configure gcc-4.0.0/boehm-gc/configure --- gcc-4.1.0/gcc/config/t-linux-uclibc
--- gcc-4.0.0-dist/boehm-gc/configure 2005-04-21 02:04:10.000000000 -0500 +++ gcc-4.1.0/gcc/config/t-linux-uclibc
+++ gcc-4.0.0/boehm-gc/configure 2005-04-30 13:22:27.495094224 -0500 @@ -0,0 +1,5 @@
@@ -4320,6 +4320,11 @@ +# Remove glibc specific files added in t-linux
+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
+
+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
--- gcc-4.1.0/gcc/config.gcc
+++ gcc-4.1.0/gcc/config.gcc
@@ -1887,7 +1887,7 @@ s390x-ibm-tpf*)
;;
sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
- sh-*-linux* | sh[346lbe]*-*-linux* | \
+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
sh64-*-netbsd* | sh64l*-*-netbsd*)
tmake_file="${tmake_file} sh/t-sh sh/t-elf"
@@ -2341,6 +2341,12 @@ m32c-*-elf*)
;;
esac
+# Rather than hook into each target, just do it after all the linux
+# targets have been processed
+case ${target} in
+*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
+esac
+
case ${target} in
i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
tmake_file="${tmake_file} i386/t-gmm_malloc"
--- gcc-4.1.0/boehm-gc/configure
+++ gcc-4.1.0/boehm-gc/configure
@@ -4320,6 +4320,11 @@ linux-gnu*)
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
@ -13,10 +44,9 @@ diff -urN gcc-4.0.0-dist/boehm-gc/configure gcc-4.0.0/boehm-gc/configure
netbsd* | knetbsd*-gnu) netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff -urN gcc-4.0.0-dist/configure gcc-4.0.0/configure --- gcc-4.1.0/configure
--- gcc-4.0.0-dist/configure 2005-04-21 02:04:10.000000000 -0500 +++ gcc-4.1.0/configure
+++ gcc-4.0.0/configure 2005-04-30 12:27:56.000000000 -0500 @@ -1133,7 +1133,7 @@ no)
@@ -1136,7 +1136,7 @@
;; ;;
"") "")
case "${target}" in case "${target}" in
@ -25,10 +55,9 @@ diff -urN gcc-4.0.0-dist/configure gcc-4.0.0/configure
# Enable libmudflap by default in GNU and friends. # Enable libmudflap by default in GNU and friends.
;; ;;
*-*-freebsd*) *-*-freebsd*)
diff -urN gcc-4.0.0-dist/configure.in gcc-4.0.0/configure.in --- gcc-4.1.0/configure.in
--- gcc-4.0.0-dist/configure.in 2005-04-20 21:45:11.000000000 -0500 +++ gcc-4.1.0/configure.in
+++ gcc-4.0.0/configure.in 2005-04-30 12:22:09.000000000 -0500 @@ -341,7 +341,7 @@ no)
@@ -345,7 +345,7 @@
;; ;;
"") "")
case "${target}" in case "${target}" in
@ -37,10 +66,9 @@ diff -urN gcc-4.0.0-dist/configure.in gcc-4.0.0/configure.in
# Enable libmudflap by default in GNU and friends. # Enable libmudflap by default in GNU and friends.
;; ;;
*-*-freebsd*) *-*-freebsd*)
diff -urN gcc-4.0.0-dist/contrib/regression/objs-gcc.sh gcc-4.0.0/contrib/regression/objs-gcc.sh --- gcc-4.1.0/contrib/regression/objs-gcc.sh
--- gcc-4.0.0-dist/contrib/regression/objs-gcc.sh 2002-10-11 15:23:21.000000000 -0500 +++ gcc-4.1.0/contrib/regression/objs-gcc.sh
+++ gcc-4.0.0/contrib/regression/objs-gcc.sh 2005-04-30 12:29:58.000000000 -0500 @@ -105,6 +105,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
@@ -105,6 +105,10 @@
then then
make all-gdb all-dejagnu all-ld || exit 1 make all-gdb all-dejagnu all-ld || exit 1
make install-gdb install-dejagnu install-ld || exit 1 make install-gdb install-dejagnu install-ld || exit 1
@ -51,9 +79,9 @@ diff -urN gcc-4.0.0-dist/contrib/regression/objs-gcc.sh gcc-4.0.0/contrib/regres
elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
make bootstrap || exit 1 make bootstrap || exit 1
make install || exit 1 make install || exit 1
--- gcc-3.4.4/gcc/config/alpha/linux-elf.h --- gcc-4.1.0/gcc/config/alpha/linux-elf.h
+++ gcc-3.4.4/gcc/config/alpha/linux-elf.h +++ gcc-4.1.0/gcc/config/alpha/linux-elf.h
@@ -27,7 +27,11 @@ @@ -27,7 +27,11 @@ Boston, MA 02110-1301, USA. */
#define SUBTARGET_EXTRA_SPECS \ #define SUBTARGET_EXTRA_SPECS \
{ "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
@ -65,40 +93,23 @@ diff -urN gcc-4.0.0-dist/contrib/regression/objs-gcc.sh gcc-4.0.0/contrib/regres
#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
%{O*:-O3} %{!O*:-O1} \ %{O*:-O3} %{!O*:-O1} \
diff -urN gcc-4.0.0-dist/gcc/config/arm/linux-elf.h gcc-4.0.0/gcc/config/arm/linux-elf.h --- gcc-4.1.0/gcc/config/arm/linux-elf.h
--- gcc-4.0.0-dist/gcc/config/arm/linux-elf.h 2005-03-04 10:14:01.000000000 -0600 +++ gcc-4.1.0/gcc/config/arm/linux-elf.h
+++ gcc-4.0.0/gcc/config/arm/linux-elf.h 2005-04-28 20:30:00.000000000 -0500 @@ -51,7 +51,11 @@
@@ -82,6 +82,18 @@
"%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
#undef LINK_SPEC
+#ifdef USE_UCLIBC +#ifdef USE_UCLIBC
+#define LINK_SPEC "%{h*} %{version:-v} \ +#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
+ %{b} %{Wl,*:%*} \
+ %{static:-Bstatic} \
+ %{shared:-shared} \
+ %{symbolic:-Bsymbolic} \
+ %{rdynamic:-export-dynamic} \
+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0} \
+ -X \
+ %{mbig-endian:-EB}" \
+ SUBTARGET_EXTRA_LINK_SPEC
+#else +#else
#define LINK_SPEC "%{h*} %{version:-v} \ #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.2"
%{b} %{Wl,*:%*} \
%{static:-Bstatic} \
@@ -92,6 +104,7 @@
-X \
%{mbig-endian:-EB}" \
SUBTARGET_EXTRA_LINK_SPEC
+#endif +#endif
#define TARGET_OS_CPP_BUILTINS() \ #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \
do \ %{b} \
diff -urN gcc-4.0.0-dist/gcc/config/cris/linux.h gcc-4.0.0/gcc/config/cris/linux.h --- gcc-4.1.0/gcc/config/cris/linux.h
--- gcc-4.0.0-dist/gcc/config/cris/linux.h 2003-11-28 21:08:09.000000000 -0600 +++ gcc-4.1.0/gcc/config/cris/linux.h
+++ gcc-4.0.0/gcc/config/cris/linux.h 2005-04-28 20:30:00.000000000 -0500 @@ -73,6 +73,25 @@ Boston, MA 02110-1301, USA. */
@@ -79,6 +79,25 @@
#undef CRIS_DEFAULT_CPU_VERSION #undef CRIS_DEFAULT_CPU_VERSION
#define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
@ -124,7 +135,7 @@ diff -urN gcc-4.0.0-dist/gcc/config/cris/linux.h gcc-4.0.0/gcc/config/cris/linux
#undef CRIS_SUBTARGET_VERSION #undef CRIS_SUBTARGET_VERSION
#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu" #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
@@ -93,6 +112,8 @@ @@ -87,6 +106,8 @@ Boston, MA 02110-1301, USA. */
%{!shared:%{!static:%{rdynamic:-export-dynamic}}}\ %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
%{!r:%{O2|O3: --gc-sections}}" %{!r:%{O2|O3: --gc-sections}}"
@ -133,17 +144,9 @@ diff -urN gcc-4.0.0-dist/gcc/config/cris/linux.h gcc-4.0.0/gcc/config/cris/linux
/* Node: Run-time Target */ /* Node: Run-time Target */
diff -urN gcc-4.0.0-dist/gcc/config/cris/t-linux-uclibc gcc-4.0.0/gcc/config/cris/t-linux-uclibc --- gcc-4.1.0/gcc/config/i386/linux.h
--- gcc-4.0.0-dist/gcc/config/cris/t-linux-uclibc 1969-12-31 18:00:00.000000000 -0600 +++ gcc-4.1.0/gcc/config/i386/linux.h
+++ gcc-4.0.0/gcc/config/cris/t-linux-uclibc 2005-04-28 20:30:00.000000000 -0500 @@ -107,6 +107,11 @@ Boston, MA 02110-1301, USA. */
@@ -0,0 +1,3 @@
+T_CFLAGS = -DUSE_UCLIBC
+TARGET_LIBGCC2_CFLAGS += -fPIC
+CRTSTUFF_T_CFLAGS_S = $(TARGET_LIBGCC2_CFLAGS)
diff -urN gcc-4.0.0-dist/gcc/config/i386/linux.h gcc-4.0.0/gcc/config/i386/linux.h
--- gcc-4.0.0-dist/gcc/config/i386/linux.h 2004-11-27 10:45:14.000000000 -0600
+++ gcc-4.0.0/gcc/config/i386/linux.h 2005-04-28 20:30:00.000000000 -0500
@@ -107,6 +107,11 @@
#define LINK_EMULATION "elf_i386" #define LINK_EMULATION "elf_i386"
#define DYNAMIC_LINKER "/lib/ld-linux.so.2" #define DYNAMIC_LINKER "/lib/ld-linux.so.2"
@ -155,65 +158,123 @@ diff -urN gcc-4.0.0-dist/gcc/config/i386/linux.h gcc-4.0.0/gcc/config/i386/linux
#undef SUBTARGET_EXTRA_SPECS #undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \ #define SUBTARGET_EXTRA_SPECS \
{ "link_emulation", LINK_EMULATION },\ { "link_emulation", LINK_EMULATION },\
--- gcc-3.4.4/gcc/config/i386/linux64.h --- gcc-4.1.0/gcc/config/i386/linux64.h
+++ gcc-3.4.4/gcc/config/i386/linux64.h +++ gcc-4.1.0/gcc/config/i386/linux64.h
@@ -55,6 +55,15 @@ @@ -54,14 +54,21 @@ Boston, MA 02110-1301, USA. */
When the -shared link option is used a final link is not being
done. */ done. */
#undef LINK_SPEC +#ifdef USE_UCLIBC
+#if defined USE_UCLIBC +#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ +#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
+ %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
+ %{static:-static}}"
+#else +#else
+#define ELF32_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define ELF64_DYNAMIC_LINKER "/lib64/ld-linux-x86-64.so.2"
+#endif
#undef LINK_SPEC
#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
%{shared:-shared} \ %{shared:-shared} \
%{!shared: \ %{!shared: \
@@ -63,6 +73,7 @@ %{!static: \
%{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \ %{rdynamic:-export-dynamic} \
%{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \ - %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
- %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
+ %{m32:%{!dynamic-linker:-dynamic-linker " ELF32_DYNAMIC_LINKER "}} \
+ %{!m32:%{!dynamic-linker:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}} \
%{static:-static}}" %{static:-static}}"
/* Similar to standard Linux, but adding -ffast-math support. */
--- gcc-4.1.0/gcc/config/ia64/linux.h
+++ gcc-4.1.0/gcc/config/ia64/linux.h
@@ -37,13 +37,18 @@ do { \
/* Define this for shared library support because it isn't in the main
linux.h file. */
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+#endif +#endif
#undef LINK_SPEC
#define LINK_SPEC "\
%{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
%{static:-static}}"
#define MULTILIB_DEFAULTS { "m64" }
diff -urN gcc-4.0.0-dist/gcc/config/mips/linux.h gcc-4.0.0/gcc/config/mips/linux.h --- gcc-4.1.0/gcc/config/m68k/linux.h
--- gcc-4.0.0-dist/gcc/config/mips/linux.h 2005-01-25 20:04:46.000000000 -0600 +++ gcc-4.1.0/gcc/config/m68k/linux.h
+++ gcc-4.0.0/gcc/config/mips/linux.h 2005-04-28 20:30:00.000000000 -0500 @@ -123,12 +123,17 @@ Boston, MA 02110-1301, USA. */
@@ -108,6 +108,17 @@
/* If ELF is the default format, we should not use /lib/elf. */
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
+#endif
#undef LINK_SPEC
#define LINK_SPEC "-m m68kelf %{shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
- %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
+ %{!dynamic-linker*:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
%{static}}"
/* For compatibility with linux/a.out */
--- gcc-4.1.0/gcc/config/mips/linux.h
+++ gcc-4.1.0/gcc/config/mips/linux.h
@@ -105,6 +105,11 @@ Boston, MA 02110-1301, USA. */
/* Borrowed from sparc/linux.h */ /* Borrowed from sparc/linux.h */
#undef LINK_SPEC #undef LINK_SPEC
+#ifdef USE_UCLIBC +#ifdef USE_UCLIBC
+#define LINK_SPEC \ +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+ "%(endian_spec) \
+ %{shared:-shared} \
+ %{!shared: \
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
+ %{static:-static}}}"
+#else +#else
+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
+#endif
#define LINK_SPEC \ #define LINK_SPEC \
"%(endian_spec) \ "%(endian_spec) \
%{shared:-shared} \ %{shared:-shared} \
@@ -117,6 +128,7 @@ @@ -112,7 +117,7 @@ Boston, MA 02110-1301, USA. */
%{!ibcs: \
%{!static: \
%{rdynamic:-export-dynamic} \ %{rdynamic:-export-dynamic} \
%{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \ - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
%{static:-static}}}" %{static:-static}}}"
+#endif
#undef SUBTARGET_ASM_SPEC #undef SUBTARGET_ASM_SPEC
#define SUBTARGET_ASM_SPEC "%{mabi=64: -64} %{!mno-abicalls:-KPIC}" --- gcc-4.1.0/gcc/config/pa/pa-linux.h
diff -urN gcc-4.0.0-dist/gcc/config/rs6000/linux.h gcc-4.0.0/gcc/config/rs6000/linux.h +++ gcc-4.1.0/gcc/config/pa/pa-linux.h
--- gcc-4.0.0-dist/gcc/config/rs6000/linux.h 2004-12-01 20:21:28.000000000 -0600 @@ -49,13 +49,18 @@ Boston, MA 02110-1301, USA. */
+++ gcc-4.0.0/gcc/config/rs6000/linux.h 2005-04-28 20:30:00.000000000 -0500 /* Define this for shared library support because it isn't in the main
@@ -69,7 +69,11 @@ linux.h file. */
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
+#endif
#undef LINK_SPEC
#define LINK_SPEC "\
%{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
%{static:-static}}"
/* glibc's profiling functions don't need gcc to allocate counters. */
--- gcc-4.1.0/gcc/config/rs6000/linux.h
+++ gcc-4.1.0/gcc/config/rs6000/linux.h
@@ -72,7 +72,11 @@
#define LINK_START_DEFAULT_SPEC "%(link_start_linux)" #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
#undef LINK_OS_DEFAULT_SPEC #undef LINK_OS_DEFAULT_SPEC
@ -225,10 +286,9 @@ diff -urN gcc-4.0.0-dist/gcc/config/rs6000/linux.h gcc-4.0.0/gcc/config/rs6000/l
#define LINK_GCC_C_SEQUENCE_SPEC \ #define LINK_GCC_C_SEQUENCE_SPEC \
"%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}" "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
diff -urN gcc-4.0.0-dist/gcc/config/rs6000/sysv4.h gcc-4.0.0/gcc/config/rs6000/sysv4.h --- gcc-4.1.0/gcc/config/rs6000/sysv4.h
--- gcc-4.0.0-dist/gcc/config/rs6000/sysv4.h 2005-02-15 09:53:52.000000000 -0600 +++ gcc-4.1.0/gcc/config/rs6000/sysv4.h
+++ gcc-4.0.0/gcc/config/rs6000/sysv4.h 2005-04-28 20:30:00.000000000 -0500 @@ -866,6 +866,7 @@ extern int fixuplabelno;
@@ -956,6 +956,7 @@
mcall-linux : %(link_os_linux) ; \ mcall-linux : %(link_os_linux) ; \
mcall-gnu : %(link_os_gnu) ; \ mcall-gnu : %(link_os_gnu) ; \
mcall-netbsd : %(link_os_netbsd) ; \ mcall-netbsd : %(link_os_netbsd) ; \
@ -236,7 +296,7 @@ diff -urN gcc-4.0.0-dist/gcc/config/rs6000/sysv4.h gcc-4.0.0/gcc/config/rs6000/s
mcall-openbsd: %(link_os_openbsd) ; \ mcall-openbsd: %(link_os_openbsd) ; \
: %(link_os_default) }" : %(link_os_default) }"
@@ -1134,6 +1135,10 @@ @@ -1043,6 +1044,10 @@ extern int fixuplabelno;
%{rdynamic:-export-dynamic} \ %{rdynamic:-export-dynamic} \
%{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
@ -247,7 +307,7 @@ diff -urN gcc-4.0.0-dist/gcc/config/rs6000/sysv4.h gcc-4.0.0/gcc/config/rs6000/s
#if defined(HAVE_LD_EH_FRAME_HDR) #if defined(HAVE_LD_EH_FRAME_HDR)
# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
#endif #endif
@@ -1300,6 +1305,7 @@ @@ -1209,6 +1214,7 @@ ncrtn.o%s"
{ "link_os_sim", LINK_OS_SIM_SPEC }, \ { "link_os_sim", LINK_OS_SIM_SPEC }, \
{ "link_os_freebsd", LINK_OS_FREEBSD_SPEC }, \ { "link_os_freebsd", LINK_OS_FREEBSD_SPEC }, \
{ "link_os_linux", LINK_OS_LINUX_SPEC }, \ { "link_os_linux", LINK_OS_LINUX_SPEC }, \
@ -255,10 +315,36 @@ diff -urN gcc-4.0.0-dist/gcc/config/rs6000/sysv4.h gcc-4.0.0/gcc/config/rs6000/s
{ "link_os_gnu", LINK_OS_GNU_SPEC }, \ { "link_os_gnu", LINK_OS_GNU_SPEC }, \
{ "link_os_netbsd", LINK_OS_NETBSD_SPEC }, \ { "link_os_netbsd", LINK_OS_NETBSD_SPEC }, \
{ "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
diff -urN gcc-4.0.0-dist/gcc/config/sh/linux.h gcc-4.0.0/gcc/config/sh/linux.h --- gcc-4.1.0/gcc/config/s390/linux.h
--- gcc-4.0.0-dist/gcc/config/sh/linux.h 2005-01-25 20:04:48.000000000 -0600 +++ gcc-4.1.0/gcc/config/s390/linux.h
+++ gcc-4.0.0/gcc/config/sh/linux.h 2005-04-28 20:30:00.000000000 -0500 @@ -77,6 +77,13 @@ Software Foundation, 51 Franklin Street,
@@ -67,12 +67,21 @@ #define MULTILIB_DEFAULTS { "m31" }
#endif
+#ifdef USE_UCLIBC
+#define ELF31_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
+#else
+#define ELF31_DYNAMIC_LINKER "/lib/ld.so.1"
+#define ELF64_DYNAMIC_LINKER "/lib/ld64.so.1"
+#endif
#undef LINK_SPEC
#define LINK_SPEC \
"%{m31:-m elf_s390}%{m64:-m elf64_s390} \
@@ -86,8 +93,8 @@ Software Foundation, 51 Franklin Street,
%{!static: \
%{rdynamic:-export-dynamic} \
%{!dynamic-linker: \
- %{m31:-dynamic-linker /lib/ld.so.1} \
- %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
+ %{m31:-dynamic-linker " ELF31_DYNAMIC_LINKER "} \
+ %{m64:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}}}"
#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
--- gcc-4.1.0/gcc/config/sh/linux.h
+++ gcc-4.1.0/gcc/config/sh/linux.h
@@ -56,12 +56,21 @@ Boston, MA 02110-1301, USA. */
#undef SUBTARGET_LINK_EMUL_SUFFIX #undef SUBTARGET_LINK_EMUL_SUFFIX
#define SUBTARGET_LINK_EMUL_SUFFIX "_linux" #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
#undef SUBTARGET_LINK_SPEC #undef SUBTARGET_LINK_SPEC
@ -278,68 +364,55 @@ diff -urN gcc-4.0.0-dist/gcc/config/sh/linux.h gcc-4.0.0/gcc/config/sh/linux.h
%{static:-static}" %{static:-static}"
+#endif +#endif
#undef LIB_SPEC /* Output assembler code to STREAM to call the profiler. */
#define LIB_SPEC \
diff -urN gcc-4.0.0-dist/gcc/config/t-linux-uclibc gcc-4.0.0/gcc/config/t-linux-uclibc --- gcc-4.1.0/gcc/config/sparc/linux.h
--- gcc-4.0.0-dist/gcc/config/t-linux-uclibc 1969-12-31 18:00:00.000000000 -0600 +++ gcc-4.1.0/gcc/config/sparc/linux.h
+++ gcc-4.0.0/gcc/config/t-linux-uclibc 2005-04-28 20:30:00.000000000 -0500 @@ -125,6 +125,11 @@ Boston, MA 02110-1301, USA. */
@@ -0,0 +1,15 @@
+T_CFLAGS = -DUSE_UCLIBC /* If ELF is the default format, we should not use /lib/elf. */
+
+# Compile crtbeginS.o and crtendS.o with pic. +#ifdef USE_UCLIBC
+CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+# Compile libgcc2.a with pic. +#else
+TARGET_LIBGCC2_CFLAGS = -fPIC +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ +#endif
+# Override t-slibgcc-elf-ver to export some libgcc symbols with #undef LINK_SPEC
+# the symbol versions that glibc used. #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+#SHLIB_MAPFILES += $(srcdir)/config/libgcc-glibc.ver %{!mno-relax:%{!r:-relax}} \
+ @@ -132,7 +137,7 @@ Boston, MA 02110-1301, USA. */
+# Use unwind-dw2-fde %{!ibcs: \
+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \ %{!static: \
+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c %{rdynamic:-export-dynamic} \
+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
diff -urN gcc-4.0.0-dist/gcc/config.gcc gcc-4.0.0/gcc/config.gcc + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
--- gcc-4.0.0-dist/gcc/config.gcc 2005-03-30 21:17:08.000000000 -0600 %{static:-static}}}"
+++ gcc-4.0.0/gcc/config.gcc 2005-04-28 20:30:00.000000000 -0500
@@ -439,7 +439,12 @@ /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
case ${enable_threads} in --- gcc-4.1.0/gcc/config/sparc/linux64.h
"" | yes | posix) thread_file='posix' ;; +++ gcc-4.1.0/gcc/config/sparc/linux64.h
esac @@ -162,12 +162,17 @@ Boston, MA 02110-1301, USA. */
- tmake_file="t-slibgcc-elf-ver t-linux" { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
+ case ${target} in { "link_arch", LINK_ARCH_SPEC },
+ *-*-linux-uclibc*)
+ tmake_file="t-slibgcc-elf-ver t-linux-uclibc" ;; +#ifdef USE_UCLIBC
+ *) +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+ tmake_file="t-slibgcc-elf-ver t-linux" ;; +#else
+ esac +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
;; +#endif
*-*-gnu*) #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
# On the Hurd, the setup is just about the same on %{!shared: \
@@ -744,6 +749,10 @@ %{!ibcs: \
tmake_file="cris/t-cris cris/t-elfmulti" %{!static: \
gas=yes %{rdynamic:-export-dynamic} \
;; - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+cris-*-linux-uclibc*) + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
+ tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h" %{static:-static}}} \
+ tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux-uclibc" "
+ ;;
cris-*-linux*) --- gcc-4.1.0/libffi/configure
tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h" +++ gcc-4.1.0/libffi/configure
# We need to avoid using t-linux, so override default tmake_file @@ -3457,6 +3457,11 @@ linux-gnu*)
@@ -1759,7 +1759,7 @@
;;
sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
- sh-*-linux* | sh[346lbe]*-*-linux* | \
+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
sh64-*-netbsd* | sh64l*-*-netbsd*)
tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff -urN gcc-4.0.0-dist/libffi/configure gcc-4.0.0/libffi/configure
--- gcc-4.0.0-dist/libffi/configure 2004-12-02 05:04:21.000000000 -0600
+++ gcc-4.0.0/libffi/configure 2005-04-30 12:18:05.000000000 -0500
@@ -3457,6 +3457,11 @@
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
@ -351,10 +424,9 @@ diff -urN gcc-4.0.0-dist/libffi/configure gcc-4.0.0/libffi/configure
netbsd* | knetbsd*-gnu) netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff -urN gcc-4.0.0-dist/libgfortran/configure gcc-4.0.0/libgfortran/configure --- gcc-4.1.0/libgfortran/configure
--- gcc-4.0.0-dist/libgfortran/configure 2005-04-21 02:04:10.000000000 -0500 +++ gcc-4.1.0/libgfortran/configure
+++ gcc-4.0.0/libgfortran/configure 2005-04-30 12:26:15.000000000 -0500 @@ -3699,6 +3699,11 @@ linux-gnu*)
@@ -3684,6 +3684,11 @@
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
@ -366,10 +438,9 @@ diff -urN gcc-4.0.0-dist/libgfortran/configure gcc-4.0.0/libgfortran/configure
netbsd* | knetbsd*-gnu) netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff -urN gcc-4.0.0-dist/libjava/configure gcc-4.0.0/libjava/configure --- gcc-4.1.0/libjava/configure
--- gcc-4.0.0-dist/libjava/configure 2005-04-21 02:04:10.000000000 -0500 +++ gcc-4.1.0/libjava/configure
+++ gcc-4.0.0/libjava/configure 2005-04-30 12:27:15.000000000 -0500 @@ -5137,6 +5137,11 @@ linux-gnu*)
@@ -4354,6 +4354,11 @@
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
@ -381,10 +452,9 @@ diff -urN gcc-4.0.0-dist/libjava/configure gcc-4.0.0/libjava/configure
netbsd* | knetbsd*-gnu) netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff -urN gcc-4.0.0-dist/libmudflap/configure gcc-4.0.0/libmudflap/configure --- gcc-4.1.0/libmudflap/configure
--- gcc-4.0.0-dist/libmudflap/configure 2005-01-02 16:24:50.000000000 -0600 +++ gcc-4.1.0/libmudflap/configure
+++ gcc-4.0.0/libmudflap/configure 2005-04-30 12:25:24.000000000 -0500 @@ -5382,6 +5382,11 @@ linux-gnu*)
@@ -5380,6 +5380,11 @@
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
@ -396,10 +466,9 @@ diff -urN gcc-4.0.0-dist/libmudflap/configure gcc-4.0.0/libmudflap/configure
netbsd* | knetbsd*-gnu) netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff -urN gcc-4.0.0-dist/libobjc/configure gcc-4.0.0/libobjc/configure --- gcc-4.1.0/libobjc/configure
--- gcc-4.0.0-dist/libobjc/configure 2005-04-21 02:04:10.000000000 -0500 +++ gcc-4.1.0/libobjc/configure
+++ gcc-4.0.0/libobjc/configure 2005-04-30 12:25:55.000000000 -0500 @@ -3312,6 +3312,11 @@ linux-gnu*)
@@ -3283,6 +3283,11 @@
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
@ -411,10 +480,9 @@ diff -urN gcc-4.0.0-dist/libobjc/configure gcc-4.0.0/libobjc/configure
netbsd* | knetbsd*-gnu) netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff -urN gcc-4.0.0-dist/libtool.m4 gcc-4.0.0/libtool.m4 --- gcc-4.1.0/libtool.m4
--- gcc-4.0.0-dist/libtool.m4 2004-11-29 17:45:17.000000000 -0600 +++ gcc-4.1.0/libtool.m4
+++ gcc-4.0.0/libtool.m4 2005-04-30 12:28:32.000000000 -0500 @@ -743,6 +743,11 @@ linux-gnu*)
@@ -682,6 +682,11 @@
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
@ -426,10 +494,9 @@ diff -urN gcc-4.0.0-dist/libtool.m4 gcc-4.0.0/libtool.m4
netbsd* | knetbsd*-gnu) netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
[lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
diff -urN gcc-4.0.0-dist/ltconfig gcc-4.0.0/ltconfig --- gcc-4.1.0/ltconfig
--- gcc-4.0.0-dist/ltconfig 2004-10-02 11:33:06.000000000 -0500 +++ gcc-4.1.0/ltconfig
+++ gcc-4.0.0/ltconfig 2005-04-30 13:26:08.000000000 -0500 @@ -603,6 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
@@ -602,6 +602,7 @@
# Transform linux* to *-*-linux-gnu*, to support old configure scripts. # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
case $host_os in case $host_os in
@ -437,7 +504,7 @@ diff -urN gcc-4.0.0-dist/ltconfig gcc-4.0.0/ltconfig
linux-gnu*) ;; linux-gnu*) ;;
linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
esac esac
@@ -1273,6 +1274,23 @@ @@ -1274,6 +1275,23 @@ linux-gnu*)
dynamic_linker='GNU/Linux ld.so' dynamic_linker='GNU/Linux ld.so'
;; ;;
@ -461,10 +528,9 @@ diff -urN gcc-4.0.0-dist/ltconfig gcc-4.0.0/ltconfig
netbsd*) netbsd*)
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
diff -urN gcc-4.0.0-dist/zlib/configure gcc-4.0.0/zlib/configure --- gcc-4.1.0/zlib/configure
--- gcc-4.0.0-dist/zlib/configure 2004-11-24 16:04:38.000000000 -0600 +++ gcc-4.1.0/zlib/configure
+++ gcc-4.0.0/zlib/configure 2005-04-30 12:30:40.000000000 -0500 @@ -3426,6 +3426,11 @@ linux-gnu*)
@@ -3426,6 +3426,11 @@
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;