diff options
Diffstat (limited to 'toolchain')
-rw-r--r-- | toolchain/elf2flt/elf2flt.mk | 4 | ||||
-rw-r--r-- | toolchain/elf2flt/elf2flt/.cvsignore | 3 | ||||
-rw-r--r-- | toolchain/elf2flt/elf2flt/CVS/Entries | 17 | ||||
-rw-r--r-- | toolchain/elf2flt/elf2flt/CVS/Repository | 1 | ||||
-rw-r--r-- | toolchain/elf2flt/elf2flt/CVS/Root | 1 | ||||
-rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 30 | ||||
-rw-r--r-- | toolchain/kernel-headers/Config.in | 8 | ||||
-rw-r--r-- | toolchain/kernel-headers/linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch (renamed from toolchain/kernel-headers/linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch) | 0 | ||||
-rw-r--r-- | toolchain/toolchain-external/Config.in | 19 | ||||
-rw-r--r-- | toolchain/toolchain-external/ext-tool.mk | 10 | ||||
-rw-r--r-- | toolchain/toolchain-external/ext-toolchain-wrapper.c | 17 |
11 files changed, 40 insertions, 70 deletions
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk index 134034bf9..52e199cda 100644 --- a/toolchain/elf2flt/elf2flt.mk +++ b/toolchain/elf2flt/elf2flt.mk @@ -19,7 +19,7 @@ $(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched (cd $(ELF2FLT_DIR); rm -rf config.cache; \ - LDFLAGS=-lz \ + LDFLAGS="$(HOST_LDFLAGS) -lz" \ $(ELF2FLT_DIR)/configure $(QUIET) \ --with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \ --with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \ @@ -33,7 +33,7 @@ $(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured $(MAKE) -C $(ELF2FLT_DIR) all $(MAKE) -C $(ELF2FLT_DIR) install -elf2flt: uclibc_target uclibc-configured binutils gcc $(ELF2FLT_DIR)/$(ELF2FLT_BINARY) +elf2flt: uclibc_target uclibc-configured binutils gcc host-zlib $(ELF2FLT_DIR)/$(ELF2FLT_BINARY) elf2flt-clean: rm -rf $(ELF2FLT_SOURCE) diff --git a/toolchain/elf2flt/elf2flt/.cvsignore b/toolchain/elf2flt/elf2flt/.cvsignore deleted file mode 100644 index 18cff9ae1..000000000 --- a/toolchain/elf2flt/elf2flt/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -.cvsignore -.svn -maketarball.sh diff --git a/toolchain/elf2flt/elf2flt/CVS/Entries b/toolchain/elf2flt/elf2flt/CVS/Entries deleted file mode 100644 index 1b3750f10..000000000 --- a/toolchain/elf2flt/elf2flt/CVS/Entries +++ /dev/null @@ -1,17 +0,0 @@ -/LICENSE.TXT/1.1/Tue Jan 10 04:34:09 2006// -/README/1.5/Tue Jan 10 04:34:09 2006/-ko/ -/config.guess/1.2/Tue Jan 10 04:34:08 2006/-ko/ -/e1-elf2flt.ld/1.1/Tue Jan 10 04:34:09 2006// -/flat.h/1.6/Tue Jan 10 04:34:08 2006/-ko/ -/install-sh/1.1.1.1/Tue Jan 10 04:34:08 2006/-ko/ -/stubs.c/1.1/Tue Jan 10 04:34:08 2006// -/config.sub/1.8/Wed Jan 11 13:36:39 2006/-ko/ -/cygwin-elf.h/1.4/Wed Jan 11 13:36:39 2006// -/Makefile.in/1.17/Result of merge/-ko/ -/configure/1.12/Sun Jan 28 05:27:28 2007/-ko/ -/configure.in/1.10/Sun Jan 28 05:27:28 2007/-ko/ -/elf2flt.c/1.46/Result of merge/-ko/ -/elf2flt.ld/1.15/Sun Jan 28 05:27:28 2007/-ko/ -/flthdr.c/1.10/Sun Jan 28 05:27:28 2007/-ko/ -/ld-elf2flt.in/1.15/Sun Jan 28 05:27:28 2007// -D diff --git a/toolchain/elf2flt/elf2flt/CVS/Repository b/toolchain/elf2flt/elf2flt/CVS/Repository deleted file mode 100644 index 61a695f7c..000000000 --- a/toolchain/elf2flt/elf2flt/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -elf2flt diff --git a/toolchain/elf2flt/elf2flt/CVS/Root b/toolchain/elf2flt/elf2flt/CVS/Root deleted file mode 100644 index 0b9f52725..000000000 --- a/toolchain/elf2flt/elf2flt/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs.uclinux.org:/var/cvs diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 959568f7a..5be26c44c 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -180,6 +180,10 @@ endif GCC_HOST_PREREQ += host-mpc endif +ifeq ($(BR2_GCC_VERSION_4_4_7_ARC),y) +GCC_HOST_PREREQ += host-flex host-bison +endif + ifeq ($(BR2_GCC_SHARED_LIBGCC),y) GCC_SHARED_LIBGCC:=--enable-shared else @@ -199,7 +203,7 @@ GCC_TLS:=--disable-tls endif ifeq ($(BR2_PTHREADS_NONE),y) -THREADS:=--disable-threads +THREADS:=--disable-threads --disable-libitm --disable-libatomic else THREADS:=--enable-threads endif @@ -299,16 +303,16 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured $(Q)$(call MESSAGE,"Building gcc pass-1") ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) - $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc + $(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc else - $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc + $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc endif touch $@ gcc_initial=$(GCC_BUILD_DIR1)/.installed $(gcc_initial) $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled $(Q)$(call MESSAGE,"Installing gcc pass-1") - PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc + $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc touch $(gcc_initial) gcc_initial: $(GCC_HOST_PREREQ) host-binutils $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc @@ -370,9 +374,9 @@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured $(Q)$(call MESSAGE,"Building gcc pass-2") # gcc >= 4.3.0 have to also build all-target-libgcc ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) - $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc all-target-libgcc + $(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc all-target-libgcc else - $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc + $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc endif touch $@ @@ -381,9 +385,9 @@ $(gcc_intermediate): $(GCC_BUILD_DIR2)/.compiled $(Q)$(call MESSAGE,"Installing gcc pass-2") # gcc >= 4.3.0 have to also install install-target-libgcc ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) - PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc install-target-libgcc + $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc install-target-libgcc else - PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc + $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc endif touch $(gcc_intermediate) @@ -449,12 +453,12 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured $(Q)$(call MESSAGE,"Building gcc final") - $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR3) all + $(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR3) all touch $@ $(GCC_BUILD_DIR3)/.installed: $(GCC_BUILD_DIR3)/.compiled $(Q)$(call MESSAGE,"Installing gcc final") - PATH=$(TARGET_PATH) $(MAKE) \ + $(HOST_MAKE_ENV) $(MAKE) \ -C $(GCC_BUILD_DIR3) install if [ -d "$(STAGING_DIR)/lib64" ]; then \ if [ ! -e "$(STAGING_DIR)/lib" ]; then \ @@ -582,8 +586,8 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared $(GCC_BUILD_DIR4)/.compiled: $(GCC_BUILD_DIR4)/.configured $(Q)$(call MESSAGE,"Building gcc on target") - PATH=$(TARGET_PATH) \ - $(MAKE) -C $(GCC_BUILD_DIR4) all + $(TARGET_MAKE_ENV) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR4) all touch $@ GCC_LIB_SUBDIR=lib/gcc/$(GNU_TARGET_NAME)/$(GCC_VERSION) @@ -595,7 +599,7 @@ endif $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled $(Q)$(call MESSAGE,"Installing gcc on target") - PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \ + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ $(MAKE1) -C $(GCC_BUILD_DIR4) install # Remove broken specs file (cross compile flag is set). rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index fd52e825e..1bb9c0289 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION config BR2_DEFAULT_KERNEL_HEADERS string - default "3.0.77" if BR2_KERNEL_HEADERS_3_0 + default "3.0.80" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 default "3.2.44" if BR2_KERNEL_HEADERS_3_2 default "3.3.8" if BR2_KERNEL_HEADERS_3_3 - default "3.4.44" if BR2_KERNEL_HEADERS_3_4 + default "3.4.47" if BR2_KERNEL_HEADERS_3_4 default "3.5.7" if BR2_KERNEL_HEADERS_3_5 default "3.6.11" if BR2_KERNEL_HEADERS_3_6 default "3.7.10" if BR2_KERNEL_HEADERS_3_7 - default "3.8.12" if BR2_KERNEL_HEADERS_3_8 - default "3.9.1" if BR2_KERNEL_HEADERS_3_9 + default "3.8.13" if BR2_KERNEL_HEADERS_3_8 + default "3.9.4" if BR2_KERNEL_HEADERS_3_9 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch index 8777b7163..8777b7163 100644 --- a/toolchain/kernel-headers/linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch +++ b/toolchain/kernel-headers/linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 515c08674..47b2bf552 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -614,23 +614,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 Toolchain for the Blackfin architecture, from http://blackfin.uclinux.org. -config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 - bool "Blackfin.uclinux.org 2011R1-RC4" - depends on BR2_bfin - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - select BR2_INSTALL_LIBSTDCPP - select BR2_LARGEFILE - select BR2_INET_IPV6 - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_HOSTARCH_NEEDS_IA32_LIBS - help - Toolchain for the Blackfin architecture, from - http://blackfin.uclinux.org. - config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3 bool "Xilinx Little Endian Microblaze GNU Tools" depends on BR2_microblazeel @@ -784,8 +767,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109 default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203 default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209 - default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FLAT - default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FDPIC default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FLAT default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FDPIC default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FLAT diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index b18f9adb5..93b3b1513 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -248,12 +248,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209),y) TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/ TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y) -TOOLCHAIN_EXTERNAL_SITE_1 = http://blackfin.uclinux.org/gf/download/frsrelease/531/9509/ -TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2011R1-RC4.i386.tar.bz2 -TOOLCHAIN_EXTERNAL_SITE_2 = http://blackfin.uclinux.org/gf/download/frsrelease/531/9517/ -TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2011R1-RC4.i386.tar.bz2 -TOOLCHAIN_EXTERNAL_SOURCE = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2) else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y) TOOLCHAIN_EXTERNAL_SITE_1 = http://blackfin.uclinux.org/gf/download/frsrelease/559/9858/ TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-RC2.i386.tar.bz2 @@ -305,7 +299,7 @@ endif # contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories, # which themselves contain the toolchain. This is why we strip more # components than usual. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1): $(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_1)) @@ -446,7 +440,7 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked fi ; \ $(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \ $(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \ - if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \ + if [ -L $${ARCH_SYSROOT_DIR}/lib64 -o -d $${ARCH_SYSROOT_DIR}/lib64 ] ; then \ $(call create_lib64_symlinks) ; \ fi ; \ if test x"$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" == x"y"; then \ diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c index 9a2fc70b0..9d79d68ad 100644 --- a/toolchain/toolchain-external/ext-toolchain-wrapper.c +++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c @@ -61,7 +61,7 @@ int main(int argc, char **argv) char *relbasedir, *absbasedir; char *progpath = argv[0]; char *basename; - int ret; + int ret, i, count = 0; /* Calculate the relative paths */ basename = strrchr(progpath, '/'); @@ -77,7 +77,20 @@ int main(int argc, char **argv) absbasedir = realpath(relbasedir, NULL); } else { basename = progpath; - absbasedir = realpath("../..", NULL); + absbasedir = malloc(PATH_MAX + 1); + ret = readlink("/proc/self/exe", absbasedir, PATH_MAX); + if (ret < 0) { + perror(__FILE__ ": readlink"); + return 2; + } + absbasedir[ret] = '\0'; + for (i = ret; i > 0; i--) { + if (absbasedir[i] == '/') { + absbasedir[i] = '\0'; + if (++count == 3) + break; + } + } } if (absbasedir == NULL) { perror(__FILE__ ": realpath"); |