mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
toolchain: remove gcc 4.1.2 and non-sysroot support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard
parent
144e4ed085
commit
5fd095b374
3
CHANGES
3
CHANGES
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
Fixes all over the tree and new features.
|
Fixes all over the tree and new features.
|
||||||
|
|
||||||
Toolchain: GCC 4.3.5, older 4.3.x versions removed.
|
Toolchain: GCC 4.3.5, older 4.3.x versions removed. GCC 4.1.2
|
||||||
|
and non-sysroot support removed.
|
||||||
|
|
||||||
Bootloaders: Various cleanups, moved to boot/, added Barebox,
|
Bootloaders: Various cleanups, moved to boot/, added Barebox,
|
||||||
removed yaboot. Support building u-boot from custom tarball.
|
removed yaboot. Support building u-boot from custom tarball.
|
||||||
|
|||||||
10
Makefile
10
Makefile
@ -297,7 +297,6 @@ include toolchain/dependencies/dependencies.mk
|
|||||||
include toolchain/binutils/binutils.mk
|
include toolchain/binutils/binutils.mk
|
||||||
include toolchain/ccache/ccache.mk
|
include toolchain/ccache/ccache.mk
|
||||||
include toolchain/elf2flt/elf2flt.mk
|
include toolchain/elf2flt/elf2flt.mk
|
||||||
include toolchain/gcc/gcc-uclibc-3.x.mk
|
|
||||||
include toolchain/gcc/gcc-uclibc-4.x.mk
|
include toolchain/gcc/gcc-uclibc-4.x.mk
|
||||||
include toolchain/gdb/gdb.mk
|
include toolchain/gdb/gdb.mk
|
||||||
include toolchain/kernel-headers/kernel-headers.mk
|
include toolchain/kernel-headers/kernel-headers.mk
|
||||||
@ -364,16 +363,7 @@ $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
|
|||||||
$(STAGING_DIR):
|
$(STAGING_DIR):
|
||||||
@mkdir -p $(STAGING_DIR)/bin
|
@mkdir -p $(STAGING_DIR)/bin
|
||||||
@mkdir -p $(STAGING_DIR)/lib
|
@mkdir -p $(STAGING_DIR)/lib
|
||||||
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
|
|
||||||
@mkdir -p $(STAGING_DIR)/usr/lib
|
@mkdir -p $(STAGING_DIR)/usr/lib
|
||||||
else
|
|
||||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
|
|
||||||
@ln -snf . $(STAGING_DIR)/usr
|
|
||||||
@mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)
|
|
||||||
@ln -snf ../lib $(STAGING_DIR)/usr/lib
|
|
||||||
@ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
@mkdir -p $(STAGING_DIR)/usr/include
|
@mkdir -p $(STAGING_DIR)/usr/include
|
||||||
@mkdir -p $(STAGING_DIR)/usr/bin
|
@mkdir -p $(STAGING_DIR)/usr/bin
|
||||||
|
|
||||||
|
|||||||
@ -83,10 +83,8 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
|
|||||||
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
|
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
|
||||||
TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
|
TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
|
||||||
TARGET_CXXFLAGS=$(TARGET_CFLAGS)
|
TARGET_CXXFLAGS=$(TARGET_CFLAGS)
|
||||||
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
|
|
||||||
TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
|
TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
|
||||||
TARGET_LDFLAGS+= $(BR2_SYSROOT)
|
TARGET_LDFLAGS+= $(BR2_SYSROOT)
|
||||||
endif
|
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
|
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
|
||||||
|
|||||||
@ -148,7 +148,6 @@ config BR2_GCC_CROSS_CXX
|
|||||||
|
|
||||||
config BR2_INSTALL_LIBSTDCPP
|
config BR2_INSTALL_LIBSTDCPP
|
||||||
bool "Build/install c++ compiler and libstdc++?"
|
bool "Build/install c++ compiler and libstdc++?"
|
||||||
select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_BUILDROOT)
|
|
||||||
select BR2_GCC_CROSS_CXX
|
select BR2_GCC_CROSS_CXX
|
||||||
help
|
help
|
||||||
If you are building your own toolchain and want to build and install
|
If you are building your own toolchain and want to build and install
|
||||||
|
|||||||
@ -10,8 +10,6 @@ else
|
|||||||
MULTILIB:=--disable-multilib
|
MULTILIB:=--disable-multilib
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
|
|
||||||
BR2_SYSROOT_PREFIX=# nothing, straight into /usr
|
|
||||||
BR2_SYSROOT_STAGING_DESTDIR=DESTDIR=$(STAGING_DIR)/
|
BR2_SYSROOT_STAGING_DESTDIR=DESTDIR=$(STAGING_DIR)/
|
||||||
BR2_SYSROOT_TARGET_DESTDIR=DESTDIR=$(TARGET_DIR)/
|
BR2_SYSROOT_TARGET_DESTDIR=DESTDIR=$(TARGET_DIR)/
|
||||||
BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/
|
BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/
|
||||||
@ -19,16 +17,6 @@ BR2_CONFIGURE_STAGING_SYSROOT=--with-sysroot=$(STAGING_DIR)
|
|||||||
BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin
|
BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin
|
||||||
BR2_SYSROOT=--sysroot=$(STAGING_DIR)/
|
BR2_SYSROOT=--sysroot=$(STAGING_DIR)/
|
||||||
BR2_ISYSROOT=-isysroot $(STAGING_DIR)
|
BR2_ISYSROOT=-isysroot $(STAGING_DIR)
|
||||||
else
|
|
||||||
BR2_SYSROOT_PREFIX=$(STAGING_DIR)
|
|
||||||
BR2_SYSROOT_STAGING_DESTDIR=# nothing
|
|
||||||
BR2_SYSROOT_TARGET_DESTDIR=# nothing
|
|
||||||
BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/
|
|
||||||
BR2_CONFIGURE_STAGING_SYSROOT=# nothing
|
|
||||||
BR2_CONFIGURE_BUILD_TOOLS=# nothing
|
|
||||||
BR2_SYSROOT=# nothing
|
|
||||||
BR2_ISYSROOT=#nothing
|
|
||||||
endif
|
|
||||||
|
|
||||||
# gcc has a bunch of needed stuff....
|
# gcc has a bunch of needed stuff....
|
||||||
include toolchain/gcc/Makefile.in
|
include toolchain/gcc/Makefile.in
|
||||||
|
|||||||
@ -73,12 +73,12 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
|
|||||||
(cd $(BINUTILS_DIR1); rm -rf config.cache; \
|
(cd $(BINUTILS_DIR1); rm -rf config.cache; \
|
||||||
$(HOST_CONFIGURE_OPTS) \
|
$(HOST_CONFIGURE_OPTS) \
|
||||||
$(BINUTILS_DIR)/configure $(QUIET) \
|
$(BINUTILS_DIR)/configure $(QUIET) \
|
||||||
--prefix=$(BR2_SYSROOT_PREFIX)/usr \
|
--prefix=/usr \
|
||||||
--build=$(GNU_HOST_NAME) \
|
--build=$(GNU_HOST_NAME) \
|
||||||
--host=$(GNU_HOST_NAME) \
|
--host=$(GNU_HOST_NAME) \
|
||||||
--target=$(REAL_GNU_TARGET_NAME) \
|
--target=$(REAL_GNU_TARGET_NAME) \
|
||||||
--mandir=$(BR2_SYSROOT_PREFIX)/usr/share/man \
|
--mandir=/usr/share/man \
|
||||||
--infodir=$(BR2_SYSROOT_PREFIX)/usr/share/info \
|
--infodir=/usr/share/info \
|
||||||
$(BR2_CONFIGURE_DEVEL_SYSROOT) \
|
$(BR2_CONFIGURE_DEVEL_SYSROOT) \
|
||||||
$(BR2_CONFIGURE_STAGING_SYSROOT) \
|
$(BR2_CONFIGURE_STAGING_SYSROOT) \
|
||||||
$(DISABLE_NLS) \
|
$(DISABLE_NLS) \
|
||||||
|
|||||||
@ -1,544 +0,0 @@
|
|||||||
--- gcc-4.1.0/gcc/config/t-linux-uclibc
|
|
||||||
+++ gcc-4.1.0/gcc/config/t-linux-uclibc
|
|
||||||
@@ -0,0 +1,5 @@
|
|
||||||
+# 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
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
|
||||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd* | knetbsd*-gnu)
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
||||||
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
|
|
||||||
--- gcc-4.1.0/configure
|
|
||||||
+++ gcc-4.1.0/configure
|
|
||||||
@@ -1133,7 +1133,7 @@ no)
|
|
||||||
;;
|
|
||||||
"")
|
|
||||||
case "${target}" in
|
|
||||||
- *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
|
|
||||||
+ *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
|
|
||||||
# Enable libmudflap by default in GNU and friends.
|
|
||||||
;;
|
|
||||||
*-*-freebsd*)
|
|
||||||
--- gcc-4.1.0/configure.in
|
|
||||||
+++ gcc-4.1.0/configure.in
|
|
||||||
@@ -341,7 +341,7 @@ no)
|
|
||||||
;;
|
|
||||||
"")
|
|
||||||
case "${target}" in
|
|
||||||
- *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
|
|
||||||
+ *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
|
|
||||||
# Enable libmudflap by default in GNU and friends.
|
|
||||||
;;
|
|
||||||
*-*-freebsd*)
|
|
||||||
--- gcc-4.1.0/contrib/regression/objs-gcc.sh
|
|
||||||
+++ gcc-4.1.0/contrib/regression/objs-gcc.sh
|
|
||||||
@@ -105,6 +105,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
|
|
||||||
then
|
|
||||||
make all-gdb all-dejagnu all-ld || exit 1
|
|
||||||
make install-gdb install-dejagnu install-ld || exit 1
|
|
||||||
+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
|
|
||||||
+ then
|
|
||||||
+ make all-gdb all-dejagnu all-ld || exit 1
|
|
||||||
+ make install-gdb install-dejagnu install-ld || exit 1
|
|
||||||
elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
|
|
||||||
make bootstrap || exit 1
|
|
||||||
make install || exit 1
|
|
||||||
--- gcc-4.1.0/gcc/config/alpha/linux-elf.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/alpha/linux-elf.h
|
|
||||||
@@ -27,7 +27,11 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
#define SUBTARGET_EXTRA_SPECS \
|
|
||||||
{ "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
|
|
||||||
|
|
||||||
+#if defined USE_UCLIBC
|
|
||||||
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
|
||||||
+#else
|
|
||||||
#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
|
|
||||||
%{O*:-O3} %{!O*:-O1} \
|
|
||||||
--- gcc-4.1.0/gcc/config/arm/linux-elf.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/arm/linux-elf.h
|
|
||||||
@@ -51,7 +51,11 @@
|
|
||||||
|
|
||||||
#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
|
|
||||||
|
|
||||||
+#ifdef USE_UCLIBC
|
|
||||||
+#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
|
|
||||||
+#else
|
|
||||||
#define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.2"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \
|
|
||||||
%{b} \
|
|
||||||
--- gcc-4.1.0/gcc/config/cris/linux.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/cris/linux.h
|
|
||||||
@@ -73,6 +73,25 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
#undef CRIS_DEFAULT_CPU_VERSION
|
|
||||||
#define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
|
|
||||||
|
|
||||||
+#ifdef USE_UCLIBC
|
|
||||||
+
|
|
||||||
+#undef CRIS_SUBTARGET_VERSION
|
|
||||||
+#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
|
|
||||||
+
|
|
||||||
+#undef CRIS_LINK_SUBTARGET_SPEC
|
|
||||||
+#define CRIS_LINK_SUBTARGET_SPEC \
|
|
||||||
+ "-mcrislinux\
|
|
||||||
+ -rpath-link include/asm/../..%s\
|
|
||||||
+ %{shared} %{static}\
|
|
||||||
+ %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
|
|
||||||
+ %{!shared: \
|
|
||||||
+ %{!static: \
|
|
||||||
+ %{rdynamic:-export-dynamic} \
|
|
||||||
+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
|
|
||||||
+ %{!r:%{O2|O3: --gc-sections}}"
|
|
||||||
+
|
|
||||||
+#else /* USE_UCLIBC */
|
|
||||||
+
|
|
||||||
#undef CRIS_SUBTARGET_VERSION
|
|
||||||
#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
|
|
||||||
|
|
||||||
@@ -87,6 +106,8 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
%{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
|
|
||||||
%{!r:%{O2|O3: --gc-sections}}"
|
|
||||||
|
|
||||||
+#endif /* USE_UCLIBC */
|
|
||||||
+
|
|
||||||
|
|
||||||
/* Node: Run-time Target */
|
|
||||||
|
|
||||||
--- gcc-4.1.0/gcc/config/i386/linux.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/i386/linux.h
|
|
||||||
@@ -107,6 +107,11 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
#define LINK_EMULATION "elf_i386"
|
|
||||||
#define DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
|
||||||
|
|
||||||
+#if defined USE_UCLIBC
|
|
||||||
+#undef DYNAMIC_LINKER
|
|
||||||
+#define DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#undef SUBTARGET_EXTRA_SPECS
|
|
||||||
#define SUBTARGET_EXTRA_SPECS \
|
|
||||||
{ "link_emulation", LINK_EMULATION },\
|
|
||||||
--- gcc-4.1.0/gcc/config/i386/linux64.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/i386/linux64.h
|
|
||||||
@@ -54,14 +54,21 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
When the -shared link option is used a final link is not being
|
|
||||||
done. */
|
|
||||||
|
|
||||||
+#ifdef USE_UCLIBC
|
|
||||||
+#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
|
||||||
+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
|
|
||||||
+#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} \
|
|
||||||
%{shared:-shared} \
|
|
||||||
%{!shared: \
|
|
||||||
%{!static: \
|
|
||||||
%{rdynamic:-export-dynamic} \
|
|
||||||
- %{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}}"
|
|
||||||
|
|
||||||
/* 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
|
|
||||||
#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}}"
|
|
||||||
|
|
||||||
|
|
||||||
--- gcc-4.1.0/gcc/config/m68k/linux.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/m68k/linux.h
|
|
||||||
@@ -123,12 +123,17 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
|
|
||||||
/* 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 */
|
|
||||||
#undef LINK_SPEC
|
|
||||||
+#ifdef USE_UCLIBC
|
|
||||||
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
|
||||||
+#else
|
|
||||||
+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
|
|
||||||
+#endif
|
|
||||||
#define LINK_SPEC \
|
|
||||||
"%(endian_spec) \
|
|
||||||
%{shared:-shared} \
|
|
||||||
@@ -112,7 +117,7 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
%{!ibcs: \
|
|
||||||
%{!static: \
|
|
||||||
%{rdynamic:-export-dynamic} \
|
|
||||||
- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
|
|
||||||
+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
|
|
||||||
%{static:-static}}}"
|
|
||||||
|
|
||||||
#undef SUBTARGET_ASM_SPEC
|
|
||||||
--- gcc-4.1.0/gcc/config/pa/pa-linux.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/pa/pa-linux.h
|
|
||||||
@@ -49,13 +49,18 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
/* 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.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)"
|
|
||||||
|
|
||||||
#undef LINK_OS_DEFAULT_SPEC
|
|
||||||
+#ifdef USE_UCLIBC
|
|
||||||
+#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
|
|
||||||
+#else
|
|
||||||
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#define LINK_GCC_C_SEQUENCE_SPEC \
|
|
||||||
"%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
|
|
||||||
--- gcc-4.1.0/gcc/config/rs6000/sysv4.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/rs6000/sysv4.h
|
|
||||||
@@ -866,6 +866,7 @@ extern int fixuplabelno;
|
|
||||||
mcall-linux : %(link_os_linux) ; \
|
|
||||||
mcall-gnu : %(link_os_gnu) ; \
|
|
||||||
mcall-netbsd : %(link_os_netbsd) ; \
|
|
||||||
+ mcall-linux-uclibc : %(link_os_linux_uclibc); \
|
|
||||||
mcall-openbsd: %(link_os_openbsd) ; \
|
|
||||||
: %(link_os_default) }"
|
|
||||||
|
|
||||||
@@ -1043,6 +1044,10 @@ extern int fixuplabelno;
|
|
||||||
%{rdynamic:-export-dynamic} \
|
|
||||||
%{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
|
|
||||||
|
|
||||||
+#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
|
|
||||||
+ %{rdynamic:-export-dynamic} \
|
|
||||||
+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
|
|
||||||
+
|
|
||||||
#if defined(HAVE_LD_EH_FRAME_HDR)
|
|
||||||
# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
|
|
||||||
#endif
|
|
||||||
@@ -1209,6 +1214,7 @@ ncrtn.o%s"
|
|
||||||
{ "link_os_sim", LINK_OS_SIM_SPEC }, \
|
|
||||||
{ "link_os_freebsd", LINK_OS_FREEBSD_SPEC }, \
|
|
||||||
{ "link_os_linux", LINK_OS_LINUX_SPEC }, \
|
|
||||||
+ { "link_os_linux_uclibc", LINK_OS_LINUX_UCLIBC_SPEC }, \
|
|
||||||
{ "link_os_gnu", LINK_OS_GNU_SPEC }, \
|
|
||||||
{ "link_os_netbsd", LINK_OS_NETBSD_SPEC }, \
|
|
||||||
{ "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
|
|
||||||
--- gcc-4.1.0/gcc/config/s390/linux.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/s390/linux.h
|
|
||||||
@@ -77,6 +77,13 @@ Software Foundation, 51 Franklin Street,
|
|
||||||
#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
|
|
||||||
#define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
|
|
||||||
#undef SUBTARGET_LINK_SPEC
|
|
||||||
+#ifdef USE_UCLIBC
|
|
||||||
+#define SUBTARGET_LINK_SPEC \
|
|
||||||
+ "%{shared:-shared} \
|
|
||||||
+ %{!static: \
|
|
||||||
+ %{rdynamic:-export-dynamic} \
|
|
||||||
+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
|
|
||||||
+ %{static:-static}"
|
|
||||||
+#else
|
|
||||||
#define SUBTARGET_LINK_SPEC \
|
|
||||||
"%{shared:-shared} \
|
|
||||||
%{!static: \
|
|
||||||
%{rdynamic:-export-dynamic} \
|
|
||||||
%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
|
|
||||||
%{static:-static}"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* Output assembler code to STREAM to call the profiler. */
|
|
||||||
|
|
||||||
--- gcc-4.1.0/gcc/config/sparc/linux.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/sparc/linux.h
|
|
||||||
@@ -125,6 +125,11 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
|
|
||||||
/* 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-linux.so.2"
|
|
||||||
+#endif
|
|
||||||
#undef LINK_SPEC
|
|
||||||
#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
|
|
||||||
%{!mno-relax:%{!r:-relax}} \
|
|
||||||
@@ -132,7 +137,7 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
%{!ibcs: \
|
|
||||||
%{!static: \
|
|
||||||
%{rdynamic:-export-dynamic} \
|
|
||||||
- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
|
|
||||||
+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
|
|
||||||
%{static:-static}}}"
|
|
||||||
|
|
||||||
/* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
|
|
||||||
--- gcc-4.1.0/gcc/config/sparc/linux64.h
|
|
||||||
+++ gcc-4.1.0/gcc/config/sparc/linux64.h
|
|
||||||
@@ -162,12 +162,17 @@ Boston, MA 02110-1301, USA. */
|
|
||||||
{ "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
|
|
||||||
{ "link_arch", LINK_ARCH_SPEC },
|
|
||||||
|
|
||||||
+#ifdef USE_UCLIBC
|
|
||||||
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
|
||||||
+#else
|
|
||||||
+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
|
||||||
+#endif
|
|
||||||
#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
|
|
||||||
%{!shared: \
|
|
||||||
%{!ibcs: \
|
|
||||||
%{!static: \
|
|
||||||
%{rdynamic:-export-dynamic} \
|
|
||||||
- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
|
|
||||||
+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
|
|
||||||
%{static:-static}}} \
|
|
||||||
"
|
|
||||||
|
|
||||||
--- gcc-4.1.0/libffi/configure
|
|
||||||
+++ gcc-4.1.0/libffi/configure
|
|
||||||
@@ -3457,6 +3457,11 @@ linux-gnu*)
|
|
||||||
lt_cv_deplibs_check_method=pass_all
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
|
||||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd* | knetbsd*-gnu)
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
||||||
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
|
|
||||||
--- gcc-4.1.0/libgfortran/configure
|
|
||||||
+++ gcc-4.1.0/libgfortran/configure
|
|
||||||
@@ -3699,6 +3699,11 @@ linux-gnu*)
|
|
||||||
lt_cv_deplibs_check_method=pass_all
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
|
||||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd* | knetbsd*-gnu)
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
||||||
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
|
|
||||||
--- gcc-4.1.0/libjava/configure
|
|
||||||
+++ gcc-4.1.0/libjava/configure
|
|
||||||
@@ -5137,6 +5137,11 @@ linux-gnu*)
|
|
||||||
lt_cv_deplibs_check_method=pass_all
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
|
||||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd* | knetbsd*-gnu)
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
||||||
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
|
|
||||||
--- gcc-4.1.0/libmudflap/configure
|
|
||||||
+++ gcc-4.1.0/libmudflap/configure
|
|
||||||
@@ -5382,6 +5382,11 @@ linux-gnu*)
|
|
||||||
lt_cv_deplibs_check_method=pass_all
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
|
||||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd* | knetbsd*-gnu)
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
||||||
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
|
|
||||||
--- gcc-4.1.0/libobjc/configure
|
|
||||||
+++ gcc-4.1.0/libobjc/configure
|
|
||||||
@@ -3312,6 +3312,11 @@ linux-gnu*)
|
|
||||||
lt_cv_deplibs_check_method=pass_all
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
|
||||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd* | knetbsd*-gnu)
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
||||||
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
|
|
||||||
--- gcc-4.1.0/libtool.m4
|
|
||||||
+++ gcc-4.1.0/libtool.m4
|
|
||||||
@@ -743,6 +743,11 @@ linux-gnu*)
|
|
||||||
lt_cv_deplibs_check_method=pass_all
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
|
||||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd* | knetbsd*-gnu)
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
||||||
[lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
|
|
||||||
--- gcc-4.1.0/ltconfig
|
|
||||||
+++ gcc-4.1.0/ltconfig
|
|
||||||
@@ -603,6 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
|
|
||||||
|
|
||||||
# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
|
|
||||||
case $host_os in
|
|
||||||
+linux-uclibc*) ;;
|
|
||||||
linux-gnu*) ;;
|
|
||||||
linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
|
|
||||||
esac
|
|
||||||
@@ -1274,6 +1275,23 @@ linux-gnu*)
|
|
||||||
dynamic_linker='GNU/Linux ld.so'
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ version_type=linux
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
|
|
||||||
+ soname_spec='${libname}${release}.so$major'
|
|
||||||
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
|
||||||
+ shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
+ shlibpath_overrides_runpath=no
|
|
||||||
+ # This implies no fast_install, which is unacceptable.
|
|
||||||
+ # Some rework will be needed to allow for fast_install
|
|
||||||
+ # before this can be enabled.
|
|
||||||
+ hardcode_into_libs=yes
|
|
||||||
+ # Assume using the uClibc dynamic linker.
|
|
||||||
+ dynamic_linker="uClibc ld.so"
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd*)
|
|
||||||
need_lib_prefix=no
|
|
||||||
need_version=no
|
|
||||||
--- gcc-4.1.0/zlib/configure
|
|
||||||
+++ gcc-4.1.0/zlib/configure
|
|
||||||
@@ -3426,6 +3426,11 @@ linux-gnu*)
|
|
||||||
lt_cv_deplibs_check_method=pass_all
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ lt_cv_deplibs_check_method=pass_all
|
|
||||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd* | knetbsd*-gnu)
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
|
||||||
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
--- gcc-2005q3-1.orig/gcc/config.gcc 2005-10-31 19:02:54.000000000 +0300
|
|
||||||
+++ gcc-2005q3-1/gcc/config.gcc 2006-01-27 01:09:09.000000000 +0300
|
|
||||||
@@ -674,7 +674,7 @@
|
|
||||||
tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
|
|
||||||
tmake_file="t-slibgcc-elf-ver t-linux arm/t-arm"
|
|
||||||
case ${target} in
|
|
||||||
- arm*-*-linux-gnueabi)
|
|
||||||
+ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
|
|
||||||
tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
|
|
||||||
tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
|
|
||||||
# The BPABI long long divmod functions return a 128-bit value in
|
|
||||||
|
|
||||||
diff -urN gcc-2005q3-2/gcc/config/arm/linux-eabi.h gcc-2005q3-2.new/gcc/config/arm/linux-eabi.h
|
|
||||||
--- gcc-2005q3-2/gcc/config/arm/linux-eabi.h 2005-12-07 23:14:16.000000000 +0300
|
|
||||||
+++ gcc-2005q3-2.new/gcc/config/arm/linux-eabi.h 2006-03-29 19:02:34.000000000 +0400
|
|
||||||
@@ -53,7 +53,11 @@
|
|
||||||
/* Use ld-linux.so.3 so that it will be possible to run "classic"
|
|
||||||
GNU/Linux binaries on an EABI system. */
|
|
||||||
#undef LINUX_TARGET_INTERPRETER
|
|
||||||
+#ifdef USE_UCLIBC
|
|
||||||
+#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
|
|
||||||
+#else
|
|
||||||
#define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.3"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
|
|
||||||
use the GNU/Linux version, not the generic BPABI version. */
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,50 +0,0 @@
|
|||||||
# DP: Build and install libstdc++_pic.a library.
|
|
||||||
|
|
||||||
--- gcc/libstdc++-v3/src/Makefile.am
|
|
||||||
+++ gcc/libstdc++-v3/src/Makefile.am
|
|
||||||
@@ -214,6 +214,12 @@
|
|
||||||
$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
|
||||||
|
|
||||||
|
|
||||||
+install-exec-local:
|
|
||||||
+ifeq ($(enable_shared),yes)
|
|
||||||
+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
|
|
||||||
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
# Added bits to build debug library.
|
|
||||||
if GLIBCXX_BUILD_DEBUG
|
|
||||||
all-local: build_debug
|
|
||||||
--- gcc/libstdc++-v3/src/Makefile.in
|
|
||||||
+++ gcc/libstdc++-v3/src/Makefile.in
|
|
||||||
@@ -627,7 +627,7 @@
|
|
||||||
|
|
||||||
install-data-am: install-data-local
|
|
||||||
|
|
||||||
-install-exec-am: install-toolexeclibLTLIBRARIES
|
|
||||||
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
|
|
||||||
|
|
||||||
install-info: install-info-am
|
|
||||||
|
|
||||||
@@ -660,6 +660,7 @@
|
|
||||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
|
||||||
html-am info info-am install install-am install-data \
|
|
||||||
install-data-am install-data-local install-exec \
|
|
||||||
+ install-exec-local \
|
|
||||||
install-exec-am install-info install-info-am install-man \
|
|
||||||
install-strip install-toolexeclibLTLIBRARIES installcheck \
|
|
||||||
installcheck-am installdirs maintainer-clean \
|
|
||||||
@@ -743,6 +743,13 @@
|
|
||||||
install_debug:
|
|
||||||
(cd ${debugdir} && $(MAKE) \
|
|
||||||
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
|
|
||||||
+
|
|
||||||
+install-exec-local:
|
|
||||||
+ifeq ($(enable_shared),yes)
|
|
||||||
+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
|
|
||||||
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
||||||
.NOEXPORT:
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- gcc-4.0.0/boehm-gc/include/gc.h-orig 2005-04-28 22:28:57.000000000 -0500
|
|
||||||
+++ gcc-4.0.0/boehm-gc/include/gc.h 2005-04-28 22:30:38.000000000 -0500
|
|
||||||
@@ -500,7 +500,7 @@
|
|
||||||
#ifdef __linux__
|
|
||||||
# include <features.h>
|
|
||||||
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
|
|
||||||
- && !defined(__ia64__)
|
|
||||||
+ && !defined(__ia64__) && !defined(__UCLIBC__)
|
|
||||||
# ifndef GC_HAVE_BUILTIN_BACKTRACE
|
|
||||||
# define GC_HAVE_BUILTIN_BACKTRACE
|
|
||||||
# endif
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h-orig 2005-04-29 00:08:41.000000000 -0500
|
|
||||||
+++ gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h 2005-04-29 00:08:45.000000000 -0500
|
|
||||||
@@ -142,7 +142,7 @@
|
|
||||||
using ::vsprintf;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if _GLIBCXX_USE_C99
|
|
||||||
+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
|
|
||||||
|
|
||||||
#undef snprintf
|
|
||||||
#undef vfscanf
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- gcc-4.0.0/libstdc++-v3/configure-old 2005-04-30 22:04:48.061603912 -0500
|
|
||||||
+++ gcc-4.0.0/libstdc++-v3/configure 2005-04-30 22:06:13.678588152 -0500
|
|
||||||
@@ -7194,6 +7194,9 @@
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <complex.h>
|
|
||||||
+#ifdef __UCLIBC__
|
|
||||||
+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
|
|
||||||
+#endif
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
--- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps 2006-03-24 01:49:51 +0100
|
|
||||||
+++ gcc-4.1.0/libstdc++-v3/include/ext/rope 2006-03-24 01:49:37 +0100
|
|
||||||
@@ -59,6 +59,9 @@
|
|
||||||
#include <bits/allocator.h>
|
|
||||||
#include <ext/hash_fun.h>
|
|
||||||
|
|
||||||
+/* cope w/ index defined as macro, SuSv3 proposal */
|
|
||||||
+#undef index
|
|
||||||
+
|
|
||||||
# ifdef __GC
|
|
||||||
# define __GC_CONST const
|
|
||||||
# else
|
|
||||||
--- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps 2006-03-24 01:50:04 +0100
|
|
||||||
+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h 2006-03-24 01:50:28 +0100
|
|
||||||
@@ -53,6 +53,9 @@
|
|
||||||
#include <ext/memory> // For uninitialized_copy_n
|
|
||||||
#include <ext/numeric> // For power
|
|
||||||
|
|
||||||
+/* cope w/ index defined as macro, SuSv3 proposal */
|
|
||||||
+#undef index
|
|
||||||
+
|
|
||||||
namespace __gnu_cxx
|
|
||||||
{
|
|
||||||
using std::size_t;
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
# gcc.gnu.org/PR30620
|
|
||||||
--- gcc-4.1.2-20070208.orig/gcc/Makefile.in 2006-11-01 15:40:44.000000000 +0100
|
|
||||||
+++ gcc-4.1.2-20070208/gcc/Makefile.in 2007-02-13 19:23:31.000000000 +0100
|
|
||||||
@@ -2522,7 +2522,7 @@
|
|
||||||
# FIXME: writing proper dependencies for this is a *LOT* of work.
|
|
||||||
libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
|
|
||||||
insn-config.h insn-flags.h insn-codes.h insn-constants.h \
|
|
||||||
- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
|
|
||||||
+ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
|
|
||||||
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
|
|
||||||
-DTARGET_NAME=\"$(target_noncanonical)\" \
|
|
||||||
-DLOCALEDIR=\"$(localedir)\" \
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
|
|
||||||
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
|
|
||||||
|
|
||||||
--- gcc/gcc/configure.ac (revision 106699)
|
|
||||||
+++ gcc/gcc/configure.ac (working copy)
|
|
||||||
@@ -2446,7 +2446,7 @@
|
|
||||||
tls_first_minor=14
|
|
||||||
tls_as_opt="-m64 -Aesame --fatal-warnings"
|
|
||||||
;;
|
|
||||||
- sh-*-* | sh[34]-*-*)
|
|
||||||
+ sh-*-* | sh[34]*-*-*)
|
|
||||||
conftest_s='
|
|
||||||
.section ".tdata","awT",@progbits
|
|
||||||
foo: .long 25
|
|
||||||
--- gcc/gcc/configure
|
|
||||||
+++ gcc/gcc/configure
|
|
||||||
@@ -14846,7 +14846,7 @@
|
|
||||||
tls_first_minor=14
|
|
||||||
tls_as_opt="-m64 -Aesame --fatal-warnings"
|
|
||||||
;;
|
|
||||||
- sh-*-* | sh[34]-*-*)
|
|
||||||
+ sh-*-* | sh[34]*-*-*)
|
|
||||||
conftest_s='
|
|
||||||
.section ".tdata","awT",@progbits
|
|
||||||
foo: .long 25
|
|
||||||
@ -1,127 +0,0 @@
|
|||||||
By Lennert Buytenhek <buytenh@wantstofly.org>
|
|
||||||
Adds support for arm*b-linux* big-endian ARM targets
|
|
||||||
|
|
||||||
See http://gcc.gnu.org/PR16350
|
|
||||||
|
|
||||||
Index: gcc-4.1.1/gcc/config/arm/linux-elf.h
|
|
||||||
===================================================================
|
|
||||||
--- gcc-4.1.1.orig/gcc/config/arm/linux-elf.h
|
|
||||||
+++ gcc-4.1.1/gcc/config/arm/linux-elf.h
|
|
||||||
@@ -28,19 +28,33 @@
|
|
||||||
#undef TARGET_VERSION
|
|
||||||
#define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr);
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
|
|
||||||
+ * (big endian) configurations.
|
|
||||||
+ */
|
|
||||||
+#if TARGET_BIG_ENDIAN_DEFAULT
|
|
||||||
+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
|
|
||||||
+#define TARGET_ENDIAN_OPTION "mbig-endian"
|
|
||||||
+#define TARGET_LINKER_EMULATION "armelfb_linux"
|
|
||||||
+#else
|
|
||||||
+#define TARGET_ENDIAN_DEFAULT 0
|
|
||||||
+#define TARGET_ENDIAN_OPTION "mlittle-endian"
|
|
||||||
+#define TARGET_LINKER_EMULATION "armelf_linux"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#undef TARGET_DEFAULT_FLOAT_ABI
|
|
||||||
#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
|
|
||||||
|
|
||||||
#undef TARGET_DEFAULT
|
|
||||||
-#define TARGET_DEFAULT (0)
|
|
||||||
+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
|
|
||||||
|
|
||||||
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
|
|
||||||
|
|
||||||
-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
|
|
||||||
+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
|
|
||||||
|
|
||||||
#undef MULTILIB_DEFAULTS
|
|
||||||
#define MULTILIB_DEFAULTS \
|
|
||||||
- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
|
|
||||||
+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
|
|
||||||
|
|
||||||
/* Now we define the strings used to build the spec file. */
|
|
||||||
#undef LIB_SPEC
|
|
||||||
@@ -61,7 +75,7 @@
|
|
||||||
%{rdynamic:-export-dynamic} \
|
|
||||||
%{!dynamic-linker:-dynamic-linker " LINUX_TARGET_INTERPRETER "} \
|
|
||||||
-X \
|
|
||||||
- %{mbig-endian:-EB}" \
|
|
||||||
+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
|
|
||||||
SUBTARGET_EXTRA_LINK_SPEC
|
|
||||||
|
|
||||||
#undef LINK_SPEC
|
|
||||||
Index: gcc-4.1.1/gcc/config.gcc
|
|
||||||
===================================================================
|
|
||||||
--- gcc-4.1.1.orig/gcc/config.gcc
|
|
||||||
+++ gcc-4.1.1/gcc/config.gcc
|
|
||||||
@@ -672,6 +672,11 @@ arm*-*-netbsd*)
|
|
||||||
;;
|
|
||||||
arm*-*-linux*) # ARM GNU/Linux with ELF
|
|
||||||
tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
|
|
||||||
+ case $target in
|
|
||||||
+ arm*b-*)
|
|
||||||
+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
tmake_file="${tmake_file} t-linux arm/t-arm"
|
|
||||||
case ${target} in
|
|
||||||
arm*-*-linux-gnueabi)
|
|
||||||
Index: gcc-4.1.1/gcc/config/arm/linux-eabi.h
|
|
||||||
===================================================================
|
|
||||||
--- gcc-4.1.1.orig/gcc/config/arm/linux-eabi.h
|
|
||||||
+++ gcc-4.1.1/gcc/config/arm/linux-eabi.h
|
|
||||||
@@ -20,6 +20,17 @@
|
|
||||||
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
||||||
Boston, MA 02110-1301, USA. */
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
|
|
||||||
+ * (big endian) configurations.
|
|
||||||
+ */
|
|
||||||
+#undef TARGET_LINKER_EMULATION
|
|
||||||
+#if TARGET_BIG_ENDIAN_DEFAULT
|
|
||||||
+#define TARGET_LINKER_EMULATION "armelfb_linux_eabi"
|
|
||||||
+#else
|
|
||||||
+#define TARGET_LINKER_EMULATION "armelf_linux_eabi"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* On EABI GNU/Linux, we want both the BPABI builtins and the
|
|
||||||
GNU/Linux builtins. */
|
|
||||||
#undef TARGET_OS_CPP_BUILTINS
|
|
||||||
@@ -48,7 +59,7 @@
|
|
||||||
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
|
|
||||||
|
|
||||||
#undef SUBTARGET_EXTRA_LINK_SPEC
|
|
||||||
-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
|
|
||||||
+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION
|
|
||||||
|
|
||||||
/* Use ld-linux.so.3 so that it will be possible to run "classic"
|
|
||||||
GNU/Linux binaries on an EABI system. */
|
|
||||||
Index: gcc-4.1.1/gcc/config/arm/bpabi.h
|
|
||||||
===================================================================
|
|
||||||
--- gcc-4.1.1.orig/gcc/config/arm/bpabi.h
|
|
||||||
+++ gcc-4.1.1/gcc/config/arm/bpabi.h
|
|
||||||
@@ -33,9 +33,19 @@
|
|
||||||
#undef FPUTYPE_DEFAULT
|
|
||||||
#define FPUTYPE_DEFAULT FPUTYPE_VFP
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
|
|
||||||
+ * (big endian) configurations.
|
|
||||||
+ */
|
|
||||||
+#if TARGET_BIG_ENDIAN_DEFAULT
|
|
||||||
+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
|
|
||||||
+#else
|
|
||||||
+#define TARGET_ENDIAN_DEFAULT 0
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* EABI targets should enable interworking by default. */
|
|
||||||
#undef TARGET_DEFAULT
|
|
||||||
-#define TARGET_DEFAULT MASK_INTERWORK
|
|
||||||
+#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT)
|
|
||||||
|
|
||||||
/* The ARM BPABI functions return a boolean; they use no special
|
|
||||||
calling convention. */
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
diff -ur gcc-4.1.2/gcc/config/arm/unwind-arm.c gcc-4.1.2-patched/gcc/config/arm/unwind-arm.c
|
|
||||||
--- gcc-4.1.2/gcc/config/arm/unwind-arm.c 2006-09-20 12:31:12.000000000 -0500
|
|
||||||
+++ gcc-4.1.2-patched/gcc/config/arm/unwind-arm.c 2008-02-27 13:30:45.339282365 -0600
|
|
||||||
@@ -29,7 +29,13 @@
|
|
||||||
|
|
||||||
/* We add a prototype for abort here to avoid creating a dependency on
|
|
||||||
target headers. */
|
|
||||||
+#ifndef BOOTSTRAP_GCC
|
|
||||||
extern void abort (void);
|
|
||||||
+#else
|
|
||||||
+void abort (void)
|
|
||||||
+{
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* Definitions for C++ runtime support routines. We make these weak
|
|
||||||
declarations to avoid pulling in libsupc++ unnecessarily. */
|
|
||||||
@@ -542,7 +548,9 @@
|
|
||||||
{
|
|
||||||
UCB_SAVED_CALLSITE_ADDR (ucbp) = saved_vrs.core.r[R_PC];
|
|
||||||
|
|
||||||
+#ifndef BOOTSTRAP_GCC
|
|
||||||
next_vrs = saved_vrs;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* Call the pr to decide what to do. */
|
|
||||||
pr_result = ((personality_routine) UCB_PR_ADDR (ucbp))
|
|
||||||
@@ -572,7 +580,9 @@
|
|
||||||
if (entry_code != _URC_OK)
|
|
||||||
return entry_code;
|
|
||||||
|
|
||||||
+#ifndef BOOTSTRAP_GCC
|
|
||||||
saved_vrs = next_vrs;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
while (pr_result == _URC_CONTINUE_UNWIND);
|
|
||||||
|
|
||||||
diff -ur gcc-4.1.2/gcc/mklibgcc.in gcc-4.1.2-patched/gcc/mklibgcc.in
|
|
||||||
--- gcc-4.1.2/gcc/mklibgcc.in 2006-09-10 02:13:12.000000000 -0500
|
|
||||||
+++ gcc-4.1.2-patched/gcc/mklibgcc.in 2008-02-27 13:39:15.697843177 -0600
|
|
||||||
@@ -169,7 +169,7 @@
|
|
||||||
# It is too hard to guarantee that vis_hide and gen-hide-list will never
|
|
||||||
# be referenced if SHLIB_LINK is not set, so set them to the values they'd
|
|
||||||
# have if SHLIB_LINK were set and we didn't have visibility support.
|
|
||||||
- echo "vis_hide ="
|
|
||||||
+ echo "vis_hide :=-DBOOTSTRAP_GCC"
|
|
||||||
echo "gen-hide-list = echo > \$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
diff -ur gcc-4.1.2/gcc/unwind-dw2.c gcc-4.1.2-patched/gcc/unwind-dw2.c
|
|
||||||
--- gcc-4.1.2/gcc/unwind-dw2.c 2005-11-17 19:19:10.000000000 -0600
|
|
||||||
+++ gcc-4.1.2-patched/gcc/unwind-dw2.c 2008-02-27 13:29:55.414640030 -0600
|
|
||||||
@@ -1311,8 +1311,10 @@
|
|
||||||
void *c = current->reg[i];
|
|
||||||
void *t = target->reg[i];
|
|
||||||
|
|
||||||
+#ifndef BOOTSTRAP_GCC
|
|
||||||
if (t && c && t != c)
|
|
||||||
memcpy (c, t, dwarf_reg_size_table[i]);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If the current frame doesn't have a saved stack pointer, then we
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
--- gcc-4.2-20061205/gcc/config/arm/t-linux 2006-12-08 15:18:33.000000000 -0800
|
|
||||||
+++ gcc-4.2-20061205/gcc/config/arm/t-linux 2006-12-08 15:18:33.000000000 -0800
|
|
||||||
@@ -4,7 +4,10 @@
|
|
||||||
LIBGCC2_DEBUG_CFLAGS = -g0
|
|
||||||
|
|
||||||
LIB1ASMSRC = arm/lib1funcs.asm
|
|
||||||
-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
|
|
||||||
+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
|
|
||||||
+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
|
|
||||||
+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
|
|
||||||
+ _fixsfsi _fixunssfsi _floatdidf _floatundidf _floatdisf _floatundisf
|
|
||||||
|
|
||||||
# MULTILIB_OPTIONS = mhard-float/msoft-float
|
|
||||||
# MULTILIB_DIRNAMES = hard-float soft-float
|
|
||||||
|
|
||||||
--- gcc-4.2-20061205/gcc/config/arm/linux-elf.h 2006-12-08 15:18:33.000000000 -0800
|
|
||||||
+++ gcc-4.2-20061205/gcc/config/arm/linux-elf.h 2006-12-08 15:18:33.000000000 -0800
|
|
||||||
@@ -63,7 +63,7 @@
|
|
||||||
%{shared:-lc} \
|
|
||||||
%{!shared:%{profile:-lc_p}%{!profile:-lc}}"
|
|
||||||
|
|
||||||
-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
|
|
||||||
+#define LIBGCC_SPEC "-lgcc"
|
|
||||||
|
|
||||||
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
|
||||||
|
|
||||||
@ -9,11 +9,6 @@ choice
|
|||||||
help
|
help
|
||||||
Select the version of gcc you wish to use.
|
Select the version of gcc you wish to use.
|
||||||
|
|
||||||
config BR2_GCC_VERSION_4_1_2
|
|
||||||
depends on !BR2_avr32
|
|
||||||
depends on BR2_DEPRECATED
|
|
||||||
bool "gcc 4.1.2"
|
|
||||||
|
|
||||||
config BR2_GCC_VERSION_4_2_1
|
config BR2_GCC_VERSION_4_2_1
|
||||||
depends on !BR2_avr32
|
depends on !BR2_avr32
|
||||||
depends on BR2_DEPRECATED
|
depends on BR2_DEPRECATED
|
||||||
@ -50,13 +45,9 @@ choice
|
|||||||
bool "gcc snapshot"
|
bool "gcc snapshot"
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
config BR2_GCC_SUPPORTS_SYSROOT
|
|
||||||
bool
|
|
||||||
default y if !BR2_GCC_VERSION_4_1_2
|
|
||||||
|
|
||||||
config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
|
config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
|
||||||
bool
|
bool
|
||||||
default y if !BR2_GCC_VERSION_4_1_2 && !BR2_GCC_VERSION_4_2_1 && !BR2_GCC_VERSION_4_2_2 && !BR2_GCC_VERSION_4_2_3 && !BR2_GCC_VERSION_4_2_4 && !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
|
default y if !BR2_GCC_VERSION_4_2_1 && !BR2_GCC_VERSION_4_2_2 && !BR2_GCC_VERSION_4_2_3 && !BR2_GCC_VERSION_4_2_4 && !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
|
||||||
|
|
||||||
config BR2_GCC_SNAP_DATE
|
config BR2_GCC_SNAP_DATE
|
||||||
string "GCC snapshot date"
|
string "GCC snapshot date"
|
||||||
@ -68,7 +59,6 @@ config BR2_GCC_SNAP_DATE
|
|||||||
|
|
||||||
config BR2_GCC_VERSION
|
config BR2_GCC_VERSION
|
||||||
string
|
string
|
||||||
default "4.1.2" if BR2_GCC_VERSION_4_1_2
|
|
||||||
default "4.2.1" if BR2_GCC_VERSION_4_2_1
|
default "4.2.1" if BR2_GCC_VERSION_4_2_1
|
||||||
default "4.2.2" if BR2_GCC_VERSION_4_2_2
|
default "4.2.2" if BR2_GCC_VERSION_4_2_2
|
||||||
default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
|
default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
|
||||||
@ -78,20 +68,6 @@ config BR2_GCC_VERSION
|
|||||||
default "4.4.4" if BR2_GCC_VERSION_4_4_X
|
default "4.4.4" if BR2_GCC_VERSION_4_4_X
|
||||||
default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
|
default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
|
||||||
|
|
||||||
config BR2_TOOLCHAIN_SYSROOT
|
|
||||||
bool "Enable toolchain with --sysroot support"
|
|
||||||
depends on BR2_GCC_SUPPORTS_SYSROOT
|
|
||||||
default y
|
|
||||||
help
|
|
||||||
Enables --sysroot=dir for binutils and gcc.
|
|
||||||
Use dir as the logical root directory for headers and libraries.
|
|
||||||
For example, if the compiler would normally search for headers in
|
|
||||||
/usr/include and libraries in /usr/lib, it will instead search
|
|
||||||
dir/usr/include and dir/usr/lib.
|
|
||||||
|
|
||||||
This does not work with gcc < 4.2.0 (4.1.2 gets
|
|
||||||
ORIGINAL_AS_FOR_TARGET wrong)
|
|
||||||
|
|
||||||
config BR2_GCC_USE_SJLJ_EXCEPTIONS
|
config BR2_GCC_USE_SJLJ_EXCEPTIONS
|
||||||
bool "Enable setjmp/longjmp exceptions?"
|
bool "Enable setjmp/longjmp exceptions?"
|
||||||
help
|
help
|
||||||
|
|||||||
@ -1,8 +1,7 @@
|
|||||||
# gcc has a bunch of options that need to be shared with
|
# gcc has a bunch of options that need to be shared with
|
||||||
# both gcc-uclibc-2.95.mk and gcc-uclibc-3.x.mk, and are
|
# both gcc-uclibc-4.x.mk, and are use by other packages...
|
||||||
# use by other packages... So include them in this file
|
# So include them in this file and arrange to include it
|
||||||
# and arrange to include it soon after invoking make from
|
# soon after invoking make from the top level.
|
||||||
# the top level.
|
|
||||||
|
|
||||||
GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
|
GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
|
||||||
TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
|
TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
|
||||||
|
|||||||
@ -1,484 +0,0 @@
|
|||||||
# Makefile for to build a gcc/uClibc toolchain
|
|
||||||
#
|
|
||||||
# Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org>
|
|
||||||
# Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org>
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
|
|
||||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
|
|
||||||
|
|
||||||
# without sysroot support. Sysroot toolchain is gcc-uclibc-4.x.mk
|
|
||||||
ifneq ($(BR2_TOOLCHAIN_SYSROOT),y)
|
|
||||||
|
|
||||||
ifneq ($(GCC_SNAP_DATE),)
|
|
||||||
GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION)
|
|
||||||
else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
|
|
||||||
GCC_SITE:=ftp://www.at91.com/pub/buildroot/
|
|
||||||
else
|
|
||||||
GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
|
|
||||||
endif
|
|
||||||
|
|
||||||
GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
|
|
||||||
GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)
|
|
||||||
GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
|
|
||||||
GCC_CAT:=$(BZCAT)
|
|
||||||
GCC_STRIP_HOST_BINARIES:=true
|
|
||||||
|
|
||||||
ifneq ($(BR2_INSTALL_FORTRAN),y)
|
|
||||||
# fortran needs gmp and mpfr
|
|
||||||
ifeq ($(findstring 4.0.,$(GCC_VERSION)),4.0.)
|
|
||||||
GCC_NO_MPFR:=y
|
|
||||||
endif
|
|
||||||
ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.)
|
|
||||||
GCC_NO_MPFR:=y
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Setup some initial stuff
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
|
|
||||||
|
|
||||||
GCC_CROSS_LANGUAGES:=c
|
|
||||||
ifeq ($(BR2_GCC_CROSS_CXX),y)
|
|
||||||
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),c++
|
|
||||||
endif
|
|
||||||
ifeq ($(BR2_GCC_CROSS_FORTRAN),y)
|
|
||||||
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),fortran
|
|
||||||
endif
|
|
||||||
ifeq ($(BR2_GCC_CROSS_OBJC),y)
|
|
||||||
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
GCC_TARGET_LANGUAGES:=c
|
|
||||||
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
|
||||||
GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),c++
|
|
||||||
endif
|
|
||||||
ifeq ($(BR2_INSTALL_LIBGCJ),y)
|
|
||||||
GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),java
|
|
||||||
endif
|
|
||||||
ifeq ($(BR2_INSTALL_OBJC),y)
|
|
||||||
GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc
|
|
||||||
endif
|
|
||||||
|
|
||||||
GCC_TARGET_PREREQ =
|
|
||||||
GCC_STAGING_PREREQ= $(STAGING_DIR)/usr/lib/libc.a
|
|
||||||
|
|
||||||
ifndef GCC_NO_MPFR
|
|
||||||
GCC_WITH_HOST_GMP=--with-gmp=$(GMP_HOST_DIR)
|
|
||||||
GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR)
|
|
||||||
|
|
||||||
ifeq ($(BR2_INSTALL_FORTRAN),y)
|
|
||||||
GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran
|
|
||||||
#GCC_TARGET_PREREQ += $(TARGET_DIR)/lib/libmpfr.so $(TARGET_DIR)/lib/libgmp.so
|
|
||||||
#GCC_STAGING_PREREQ+= $(TOOLCHAIN_DIR)/mpfr/lib/libmpfr.so
|
|
||||||
GCC_WITH_TARGET_GMP=--with-gmp="$(GMP_TARGET_DIR)"
|
|
||||||
GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)"
|
|
||||||
endif
|
|
||||||
endif # ifndef GCC_NO_MPFR
|
|
||||||
|
|
||||||
ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
|
|
||||||
GCC_SHARED_LIBGCC:=--enable-shared
|
|
||||||
else
|
|
||||||
GCC_SHARED_LIBGCC:=--disable-shared
|
|
||||||
endif
|
|
||||||
|
|
||||||
HOST_SOURCE+=gcc-source
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# build the first pass gcc compiler
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
GCC_BUILD_DIR1:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-initial
|
|
||||||
|
|
||||||
$(DL_DIR)/$(GCC_SOURCE):
|
|
||||||
mkdir -p $(DL_DIR)
|
|
||||||
$(call DOWNLOAD,$(GCC_SITE),$(GCC_SOURCE))
|
|
||||||
|
|
||||||
gcc-unpacked: $(GCC_DIR)/.patched
|
|
||||||
$(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
|
|
||||||
mkdir -p $(TOOLCHAIN_DIR)
|
|
||||||
$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
|
|
||||||
$(CONFIG_UPDATE) $(@D)
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
gcc-patched: $(GCC_DIR)/.patched
|
|
||||||
$(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
|
|
||||||
# Apply any files named gcc-*.patch from the source directory to gcc
|
|
||||||
ifneq ($(wildcard $(GCC_PATCH_DIR)),)
|
|
||||||
toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch
|
|
||||||
endif
|
|
||||||
# Note: The soft float situation has improved considerably with gcc 3.4.x.
|
|
||||||
# We can dispense with the custom spec files, as well as libfloat for the arm case.
|
|
||||||
# However, we still need a patch for arm. There's a similar patch for gcc 3.3.x
|
|
||||||
# which needs to be integrated so we can kill of libfloat for good, except for
|
|
||||||
# anyone (?) who might still be using gcc 2.95. mjn3
|
|
||||||
ifeq ($(BR2_SOFT_FLOAT),y)
|
|
||||||
ifeq ("$(strip $(ARCH))","arm")
|
|
||||||
toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional
|
|
||||||
endif
|
|
||||||
ifeq ("$(strip $(ARCH))","armeb")
|
|
||||||
toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
# The --without-headers option stopped working with gcc 3.0 and has never been
|
|
||||||
# fixed, so we need to actually have working C library header files prior to
|
|
||||||
# the step or libgcc will not build...
|
|
||||||
|
|
||||||
$(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
|
|
||||||
mkdir -p $(GCC_BUILD_DIR1)
|
|
||||||
(cd $(GCC_BUILD_DIR1); PATH=$(TARGET_PATH) \
|
|
||||||
$(HOST_CONFIGURE_OPTS) \
|
|
||||||
$(GCC_DIR)/configure $(QUIET) \
|
|
||||||
--prefix=$(STAGING_DIR)/usr \
|
|
||||||
--build=$(GNU_HOST_NAME) \
|
|
||||||
--host=$(GNU_HOST_NAME) \
|
|
||||||
--target=$(REAL_GNU_TARGET_NAME) \
|
|
||||||
--enable-languages=c \
|
|
||||||
--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
|
|
||||||
--disable-__cxa_atexit \
|
|
||||||
--enable-target-optspace \
|
|
||||||
--with-gnu-ld \
|
|
||||||
--disable-shared \
|
|
||||||
--disable-libssp \
|
|
||||||
$(GCC_WITH_HOST_GMP) \
|
|
||||||
$(GCC_WITH_HOST_MPFR) \
|
|
||||||
$(DISABLE_NLS) \
|
|
||||||
$(THREADS) \
|
|
||||||
$(MULTILIB) \
|
|
||||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
|
||||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
|
||||||
$(EXTRA_GCC_CONFIG_OPTIONS) \
|
|
||||||
$(QUIET) \
|
|
||||||
)
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
|
|
||||||
PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
gcc_initial=$(GCC_BUILD_DIR1)/.installed
|
|
||||||
$(gcc_initial) $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
|
|
||||||
PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
|
|
||||||
#rm -f $(STAGING_DIR)/bin/gccbug $(STAGING_DIR)/bin/gcov
|
|
||||||
#rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc $(STAGING_DIR)/share/locale
|
|
||||||
touch $(gcc_initial)
|
|
||||||
|
|
||||||
gcc_initial: uclibc-configured binutils $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
|
|
||||||
|
|
||||||
gcc_initial-clean:
|
|
||||||
rm -rf $(GCC_BUILD_DIR1)
|
|
||||||
|
|
||||||
gcc_initial-dirclean:
|
|
||||||
rm -rf $(GCC_BUILD_DIR1) $(GCC_DIR)
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# second pass compiler build. Build the compiler targeting
|
|
||||||
# the newly built shared uClibc library.
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Sigh... I had to rework things because using --with-gxx-include-dir
|
|
||||||
# causes issues with include dir search order for g++. This seems to
|
|
||||||
# have something to do with "path translations" and possibly doesn't
|
|
||||||
# affect gcc-target. However, I haven't tested gcc-target yet so no
|
|
||||||
# guarantees. mjn3
|
|
||||||
|
|
||||||
GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-final
|
|
||||||
$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
|
|
||||||
mkdir -p $(GCC_BUILD_DIR2)
|
|
||||||
# Important! Required for limits.h to be fixed.
|
|
||||||
ln -snf ../include $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
|
|
||||||
#-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
||||||
#ln -snf ../lib/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
||||||
(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
|
|
||||||
$(HOST_CONFIGURE_OPTS) \
|
|
||||||
GCC=$(TARGET_CROSS)gcc \
|
|
||||||
CPP=$(TARGET_CROSS)cpp \
|
|
||||||
LDFLAGS_FOR_TARGET="$(patsubst %,LDFLAGS+=-Wl$(comma)%,$(TARGET_LDFLAGS)) -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
|
|
||||||
$(GCC_DIR)/configure $(QUIET) \
|
|
||||||
--prefix=$(STAGING_DIR) \
|
|
||||||
--build=$(GNU_HOST_NAME) \
|
|
||||||
--host=$(GNU_HOST_NAME) \
|
|
||||||
--target=$(REAL_GNU_TARGET_NAME) \
|
|
||||||
--enable-languages=$(GCC_CROSS_LANGUAGES) \
|
|
||||||
--disable-__cxa_atexit \
|
|
||||||
--enable-target-optspace \
|
|
||||||
--with-gnu-ld \
|
|
||||||
--disable-libssp \
|
|
||||||
$(GCC_WITH_HOST_GMP) \
|
|
||||||
$(GCC_WITH_HOST_MPFR) \
|
|
||||||
$(GCC_SHARED_LIBGCC) \
|
|
||||||
$(DISABLE_NLS) \
|
|
||||||
$(THREADS) \
|
|
||||||
$(MULTILIB) \
|
|
||||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
|
||||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
|
||||||
$(GCC_USE_SJLJ_EXCEPTIONS) \
|
|
||||||
$(DISABLE_LARGEFILE) \
|
|
||||||
$(EXTRA_GCC_CONFIG_OPTIONS) \
|
|
||||||
)
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
|
|
||||||
PATH=$(TARGET_PATH) $(MAKE) $(HOST_CONFIGURE_OPTS) CPP=$(TARGET_CROSS)cpp -C $(GCC_BUILD_DIR2) all
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled
|
|
||||||
PATH=$(TARGET_PATH) \
|
|
||||||
$(MAKE) $(HOST_CONFIGURE_OPTS) \
|
|
||||||
LDFLAGS_FOR_TARGET="$(patsubst %,LDFLAGS+=-Wl$(comma)%,$(TARGET_LDFLAGS)) -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
|
|
||||||
-C $(GCC_BUILD_DIR2) install
|
|
||||||
if [ -d "$(STAGING_DIR)/usr/lib64" ]; then \
|
|
||||||
if [ ! -e "$(STAGING_DIR)/usr/lib" ]; then \
|
|
||||||
mkdir -p "$(STAGING_DIR)/usr/lib"; \
|
|
||||||
fi; \
|
|
||||||
mv "$(STAGING_DIR)/usr/lib64/"* "$(STAGING_DIR)/usr/lib/"; \
|
|
||||||
rmdir "$(STAGING_DIR)/usr/lib64"; \
|
|
||||||
fi
|
|
||||||
# Strip the host binaries
|
|
||||||
ifeq ($(GCC_STRIP_HOST_BINARIES),true)
|
|
||||||
strip --strip-all -R .note -R .comment $(filter-out %-gccbug %-embedspu,$(wildcard $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-*))
|
|
||||||
endif
|
|
||||||
# Make sure we have 'cc'.
|
|
||||||
if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ]; then \
|
|
||||||
ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
|
|
||||||
$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
|
|
||||||
fi
|
|
||||||
if [ ! -e $(STAGING_DIR)/usr/bin/gcc ]; then \
|
|
||||||
ln -snf gcc $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
|
|
||||||
fi
|
|
||||||
# Set up the symlinks to enable lying about target name.
|
|
||||||
set -e; \
|
|
||||||
(cd $(STAGING_DIR)/usr; \
|
|
||||||
ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
|
|
||||||
cd bin; \
|
|
||||||
for app in $(REAL_GNU_TARGET_NAME)-*; do \
|
|
||||||
ln -snf $${app} \
|
|
||||||
$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
|
|
||||||
done; \
|
|
||||||
)
|
|
||||||
#
|
|
||||||
# Now for the ugly 3.3.x soft float hack...
|
|
||||||
#
|
|
||||||
ifeq ($(BR2_SOFT_FLOAT),y)
|
|
||||||
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
|
|
||||||
# Make sure we have a soft float specs file for this arch
|
|
||||||
if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ]; then \
|
|
||||||
echo soft float configured but no specs file for this arch; \
|
|
||||||
/bin/false; \
|
|
||||||
fi
|
|
||||||
# Replace specs file with one that defaults to soft float mode.
|
|
||||||
if [ ! -f $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ]; then \
|
|
||||||
echo staging dir specs file is missing; \
|
|
||||||
/bin/false; \
|
|
||||||
fi
|
|
||||||
cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
#
|
|
||||||
# Ok... that's enough of that.
|
|
||||||
#
|
|
||||||
mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(STAMP_DIR)/gcc_libs_target_installed: $(GCC_BUILD_DIR2)/.installed
|
|
||||||
ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
|
|
||||||
# These are in /lib, so...
|
|
||||||
rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
|
|
||||||
-cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* \
|
|
||||||
$(TARGET_DIR)/lib/
|
|
||||||
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgcc_s*
|
|
||||||
endif
|
|
||||||
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
|
||||||
ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
|
|
||||||
mkdir -p $(TARGET_DIR)/usr/lib
|
|
||||||
-cp -dpf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/
|
|
||||||
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libstdc++.so*
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifeq ($(BR2_INSTALL_LIBGCJ),y)
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/usr/lib/
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/usr/lib/
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/usr/lib/
|
|
||||||
mkdir -p $(TARGET_DIR)/usr/lib/security
|
|
||||||
cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security \
|
|
||||||
$(TARGET_DIR)/usr/lib/security/
|
|
||||||
cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security \
|
|
||||||
$(TARGET_DIR)/usr/lib/security/
|
|
||||||
endif
|
|
||||||
mkdir -p $(@D)
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
cross_compiler:=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
|
|
||||||
cross_compiler gcc: gcc-config $(GCC_BUILD_DIR2)/.installed \
|
|
||||||
$(STAMP_DIR)/gcc_libs_target_installed \
|
|
||||||
$(GCC_TARGETS)
|
|
||||||
|
|
||||||
gcc-source: $(DL_DIR)/$(GCC_SOURCE)
|
|
||||||
|
|
||||||
gcc-config: uclibc-configured binutils gcc_initial $(LIBFLOAT_TARGET) \
|
|
||||||
uclibc $(GCC_BUILD_DIR2)/.configured
|
|
||||||
|
|
||||||
gcc-clean:
|
|
||||||
rm -rf $(GCC_BUILD_DIR2)
|
|
||||||
for prog in cpp gcc gcc-[0-9]* protoize unprotoize gcov gccbug cc; do \
|
|
||||||
rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-$$prog; \
|
|
||||||
rm -f $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \
|
|
||||||
done
|
|
||||||
|
|
||||||
gcc-dirclean: gcc_initial-dirclean
|
|
||||||
rm -rf $(GCC_BUILD_DIR2)
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Next build target gcc compiler
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
GCC_BUILD_DIR3:=$(BUILD_DIR)/gcc-$(GCC_VERSION)-target
|
|
||||||
|
|
||||||
$(GCC_BUILD_DIR3)/.prepared: $(STAMP_DIR)/gcc_libs_target_installed $(GCC_TARGET_PREREQ)
|
|
||||||
mkdir -p $(GCC_BUILD_DIR3)
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
|
|
||||||
(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
|
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
|
||||||
CFLAGS_FOR_BUILD="-g -O2 $(HOST_CFLAGS)" \
|
|
||||||
$(TARGET_GCC_FLAGS) \
|
|
||||||
$(GCC_DIR)/configure $(QUIET) \
|
|
||||||
--prefix=/usr \
|
|
||||||
--build=$(GNU_HOST_NAME) \
|
|
||||||
--host=$(REAL_GNU_TARGET_NAME) \
|
|
||||||
--target=$(REAL_GNU_TARGET_NAME) \
|
|
||||||
--enable-languages=$(GCC_TARGET_LANGUAGES) \
|
|
||||||
--with-gxx-include-dir=/usr/include/c++ \
|
|
||||||
--disable-__cxa_atexit \
|
|
||||||
--with-gnu-ld \
|
|
||||||
--with-gnu-as \
|
|
||||||
--disable-libssp \
|
|
||||||
$(GCC_SHARED_LIBGCC) \
|
|
||||||
$(GCC_WITH_TARGET_GMP) \
|
|
||||||
$(GCC_WITH_TARGET_MPFR) \
|
|
||||||
$(DISABLE_NLS) \
|
|
||||||
$(THREADS) \
|
|
||||||
$(MULTILIB) \
|
|
||||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
|
||||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
|
||||||
$(GCC_USE_SJLJ_EXCEPTIONS) \
|
|
||||||
$(DISABLE_LARGEFILE) \
|
|
||||||
$(EXTRA_GCC_CONFIG_OPTIONS) \
|
|
||||||
$(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \
|
|
||||||
)
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured
|
|
||||||
PATH=$(TARGET_PATH) \
|
|
||||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) \
|
|
||||||
CFLAGS_FOR_BUILD="-g -O2 $(HOST_CFLAGS)" \
|
|
||||||
$(TARGET_GCC_FLAGS) \
|
|
||||||
-C $(GCC_BUILD_DIR3) all
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
#
|
|
||||||
# gcc-lib dir changes names to gcc with 3.4.mumble
|
|
||||||
#
|
|
||||||
ifeq ($(findstring 3.4.,$(GCC_VERSION)),3.4.)
|
|
||||||
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
|
|
||||||
else
|
|
||||||
GCC_LIB_SUBDIR=lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
|
|
||||||
endif
|
|
||||||
# sigh... we need to find a better way
|
|
||||||
ifeq ($(findstring 4.0.,$(GCC_VERSION)),4.0.)
|
|
||||||
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
|
|
||||||
endif
|
|
||||||
ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.)
|
|
||||||
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
|
|
||||||
endif
|
|
||||||
ifeq ($(findstring 4.2,$(GCC_VERSION)),4.2)
|
|
||||||
ifneq ($(findstring 4.2.,$(GCC_VERSION)),4.2.)
|
|
||||||
REAL_GCC_VERSION=$(shell cat $(GCC_DIR)/gcc/BASE-VER)
|
|
||||||
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(REAL_GCC_VERSION)
|
|
||||||
else
|
|
||||||
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
$(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
|
|
||||||
PATH=$(TARGET_PATH) \
|
|
||||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) \
|
|
||||||
CFLAGS_FOR_BUILD="-g -O2 $(HOST_CFLAGS)" \
|
|
||||||
$(TARGET_GCC_FLAGS) \
|
|
||||||
DESTDIR=$(TARGET_DIR) \
|
|
||||||
-C $(GCC_BUILD_DIR3) install
|
|
||||||
# Remove broken specs file (cross compile flag is set).
|
|
||||||
rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs
|
|
||||||
#
|
|
||||||
# Now for the ugly 3.3.x soft float hack...
|
|
||||||
#
|
|
||||||
ifeq ($(BR2_SOFT_FLOAT),y)
|
|
||||||
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
|
|
||||||
# Add a specs file that defaults to soft float mode.
|
|
||||||
cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(TARGET_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
|
|
||||||
# Make sure gcc does not think we are cross compiling
|
|
||||||
$(SED) "s/^1/0/;" $(TARGET_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
#
|
|
||||||
# Ok... that's enough of that.
|
|
||||||
#
|
|
||||||
-(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1)
|
|
||||||
-(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1)
|
|
||||||
-(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIPCMD) cc1 cc1plus collect2 > /dev/null 2>&1)
|
|
||||||
-(cd $(TARGET_DIR)/usr/lib && $(STRIPCMD) libstdc++.so.*.*.* > /dev/null 2>&1)
|
|
||||||
-(cd $(TARGET_DIR)/lib && $(STRIPCMD) libgcc_s*.so.*.*.* > /dev/null 2>&1)
|
|
||||||
#
|
|
||||||
rm -f $(TARGET_DIR)/usr/lib/*.la*
|
|
||||||
#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
|
|
||||||
# $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
|
|
||||||
# Work around problem of missing syslimits.h
|
|
||||||
if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \
|
|
||||||
echo "warning: working around missing syslimits.h"; \
|
|
||||||
cp -f $(STAGING_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h \
|
|
||||||
$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/; \
|
|
||||||
fi
|
|
||||||
# Make sure we have 'cc'.
|
|
||||||
if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \
|
|
||||||
ln -snf gcc $(TARGET_DIR)/usr/bin/cc; \
|
|
||||||
fi
|
|
||||||
# These are in /lib, so...
|
|
||||||
#rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
|
|
||||||
#touch -c $(TARGET_DIR)/usr/bin/gcc
|
|
||||||
|
|
||||||
gcc_target: uclibc_target binutils_target $(TARGET_DIR)/usr/bin/gcc
|
|
||||||
|
|
||||||
gcc_target-clean:
|
|
||||||
rm -rf $(GCC_BUILD_DIR3)
|
|
||||||
rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)*
|
|
||||||
|
|
||||||
gcc_target-dirclean:
|
|
||||||
rm -rf $(GCC_BUILD_DIR3)
|
|
||||||
|
|
||||||
endif
|
|
||||||
# gcc-3.x only
|
|
||||||
|
|
||||||
endif
|
|
||||||
@ -17,9 +17,6 @@
|
|||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
# sysroot support works with gcc >= 4.2.0 only
|
|
||||||
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
|
|
||||||
|
|
||||||
ifneq ($(GCC_SNAP_DATE),)
|
ifneq ($(GCC_SNAP_DATE),)
|
||||||
GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION)
|
GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION)
|
||||||
else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
|
else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
|
||||||
@ -275,7 +272,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
|
|||||||
(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
|
(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
|
||||||
$(HOST_CONFIGURE_OPTS) \
|
$(HOST_CONFIGURE_OPTS) \
|
||||||
$(GCC_SRC_DIR)/configure $(QUIET) \
|
$(GCC_SRC_DIR)/configure $(QUIET) \
|
||||||
--prefix=$(BR2_SYSROOT_PREFIX)/usr \
|
--prefix=/usr \
|
||||||
--build=$(GNU_HOST_NAME) \
|
--build=$(GNU_HOST_NAME) \
|
||||||
--host=$(GNU_HOST_NAME) \
|
--host=$(GNU_HOST_NAME) \
|
||||||
--target=$(REAL_GNU_TARGET_NAME) \
|
--target=$(REAL_GNU_TARGET_NAME) \
|
||||||
@ -502,11 +499,3 @@ gcc_target-clean:
|
|||||||
|
|
||||||
gcc_target-dirclean:
|
gcc_target-dirclean:
|
||||||
rm -rf $(GCC_BUILD_DIR3)
|
rm -rf $(GCC_BUILD_DIR3)
|
||||||
|
|
||||||
gcc-status:
|
|
||||||
@echo GCC_VERSION=$(GCC_VERSION)
|
|
||||||
@echo GCC_PATCH_DIR=$(GCC_PATCH_DIR)
|
|
||||||
@echo GCC_SITE=$(GCC_SITE)
|
|
||||||
|
|
||||||
endif
|
|
||||||
# gcc-4.x only
|
|
||||||
|
|||||||
@ -438,21 +438,12 @@ uclibc-menuconfig: host-sed dirs $(UCLIBC_DIR)/.config
|
|||||||
|
|
||||||
|
|
||||||
$(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
|
$(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
|
||||||
ifneq ($(BR2_TOOLCHAIN_SYSROOT),y)
|
|
||||||
$(MAKE1) -C $(UCLIBC_DIR) \
|
|
||||||
ARCH="$(UCLIBC_TARGET_ARCH)" \
|
|
||||||
PREFIX= \
|
|
||||||
DEVEL_PREFIX=$(STAGING_DIR)/ \
|
|
||||||
RUNTIME_PREFIX=$(STAGING_DIR)/ \
|
|
||||||
install_runtime install_dev
|
|
||||||
else
|
|
||||||
$(MAKE1) -C $(UCLIBC_DIR) \
|
$(MAKE1) -C $(UCLIBC_DIR) \
|
||||||
ARCH="$(UCLIBC_TARGET_ARCH)" \
|
ARCH="$(UCLIBC_TARGET_ARCH)" \
|
||||||
PREFIX=$(STAGING_DIR) \
|
PREFIX=$(STAGING_DIR) \
|
||||||
DEVEL_PREFIX=/usr/ \
|
DEVEL_PREFIX=/usr/ \
|
||||||
RUNTIME_PREFIX=/ \
|
RUNTIME_PREFIX=/ \
|
||||||
install_runtime install_dev
|
install_runtime install_dev
|
||||||
endif
|
|
||||||
# Install the kernel headers to the staging dir if necessary
|
# Install the kernel headers to the staging dir if necessary
|
||||||
if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
|
if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
|
||||||
cp -pLR $(LINUX_HEADERS_DIR)/include/* \
|
cp -pLR $(LINUX_HEADERS_DIR)/include/* \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user