diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Makefile.in | 21 | ||||
| -rw-r--r-- | toolchain/binutils/binutils.mk | 39 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 11 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 76 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 452 | ||||
| -rw-r--r-- | toolchain/sstrip/sstrip.mk | 10 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 90 |
7 files changed, 604 insertions, 95 deletions
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in index 6f7cc013d..703e8e6db 100644 --- a/toolchain/Makefile.in +++ b/toolchain/Makefile.in @@ -10,13 +10,26 @@ else MULTILIB:=--disable-multilib endif -ifeq ($(BR2_PREFER_STATIC_LIB),y) -PREFERRED_LIB_FLAGS:=--enable-static --disable-shared +ifeq ($(BR2_TOOLCHAIN_SYSROOT),y) +BR2_SYSROOT_PREFIX=# nothing, straight into /usr +BR2_SYSROOT_STAGING_DESTDIR=DESTDIR=$(STAGING_DIR)/ +BR2_SYSROOT_TARGET_DESTDIR=DESTDIR=$(TARGET_DIR)/ +BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ +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_SYSROOT=--sysroot=$(STAGING_DIR)/ +BR2_ISYSROOT=-isysroot $(STAGING_DIR) else -PREFERRED_LIB_FLAGS:=--disable-static --enable-shared +BR2_SYSROOT_PREFIX=$(STAGING_DIR) +BR2_SYSROOT_STAGING_DESTDIR=# nothing +BR2_SYSROOT_TARGET_DESTDIR=# nothing +BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ +BR2_CONFIGURE_STAGING_SYSROOT=# nothing +BR2_CONFIGURE_BUILD_TOOLS=# nothing +BR2_SYSROOT=# nothing +BR2_ISYSROOT=#nothing endif - # FIXME -- this is temporary OPTIMIZE_FOR_CPU=$(ARCH) diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 2b4fc0938..193236072 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -52,8 +52,9 @@ ifndef BINUTILS_NO_MPFR BINUTILS_HOST_PREREQ:=$(TOOL_BUILD_DIR)/gmp/lib/libgmp$(HOST_SHREXT) \ $(TOOL_BUILD_DIR)/mpfr/lib/libmpfr$(HOST_SHREXT) -BINUTILS_TARGET_PREREQ:=$(TARGET_DIR)/lib/libgmp$(LIBTGTEXT) \ - $(TARGET_DIR)/lib/libmpfr$(LIBTGTEXT) +BINUTILS_TARGET_PREREQ:=$(TARGET_DIR)/usr/lib/libgmp$(LIBTGTEXT) \ + $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) + EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-gmp="$(GMP_HOST_DIR)" EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_HOST_DIR)" @@ -74,6 +75,7 @@ $(DL_DIR)/$(BINUTILS_SOURCE): binutils-unpacked: $(BINUTILS_DIR)/.unpacked $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE) mkdir -p $(TOOL_BUILD_DIR) + rm -rf $(BINUTILS_DIR) $(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - $(CONFIG_UPDATE) $(BINUTILS_DIR) touch $@ @@ -85,15 +87,15 @@ $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched mkdir -p $(BINUTILS_DIR1) - (cd $(BINUTILS_DIR1); \ - CC="$(HOSTCC)" \ + (cd $(BINUTILS_DIR1); rm -rf config.cache ; \ + $(HOST_CONFIGURE_OPTS) \ $(BINUTILS_DIR)/configure \ - --prefix=$(STAGING_DIR) \ + --prefix=$(BR2_SYSROOT_PREFIX)/usr \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ - --with-build-sysroot="$(TOOL_BUILD_DIR)/uClibc_dev/" \ - --with-sysroot="$(TOOL_BUILD_DIR)/uClibc_dev/" \ + $(BR2_CONFIGURE_DEVEL_SYSROOT) \ + $(BR2_CONFIGURE_STAGING_SYSROOT) \ $(DISABLE_NLS) \ $(MULTILIB) \ --disable-werror \ @@ -106,15 +108,20 @@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured # Make install will put gettext data in staging_dir/share/locale. # Unfortunatey, it isn't configureable. -$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump - $(MAKE) -C $(BINUTILS_DIR1) install +$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld: $(BINUTILS_DIR1)/binutils/objdump + $(MAKE) -C $(BINUTILS_DIR1) $(BR2_SYSROOT_STAGING_DESTDIR) install + # tooldir=/usr build_tooldir=/usr install + #rm -f $(STAGING_DIR)/usr/bin/{ar,as,ld,nm,objdump,ranlib,strip} -binutils: dependencies uclibc-configured $(BINUTILS_HOST_PREREQ) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/ld +binutils: dependencies uclibc-configured $(BINUTILS_HOST_PREREQ) $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld binutils-source: $(DL_DIR)/$(BINUTILS_SOURCE) binutils-clean: - rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)* + rm -rf $(STAGING_DIR)/usr/bin/*{ar,as,ld,nm,objdump,ranlib,strip} \ + $(STAGING_DIR)/usr/lib/{libiberty*,ldscripts} + -$(MAKE) -C $(BINUTILS_DIR1) DESTDIR=$(STAGING_DIR) \ + tooldir=/usr build_tooldir=/usr uninstall -$(MAKE) -C $(BINUTILS_DIR1) clean binutils-dirclean: @@ -130,11 +137,8 @@ binutils-dirclean: BINUTILS_DIR2:=$(BUILD_DIR)/binutils-$(BINUTILS_VERSION)-target $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched mkdir -p $(BINUTILS_DIR2) - (cd $(BINUTILS_DIR2); \ - CC_FOR_BUILD="$(HOSTCC)" \ - PATH=$(TARGET_PATH) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CFLAGS_FOR_BUILD="-O2 -g" \ + (cd $(BINUTILS_DIR2); rm -rf config.cache ; \ + $(TARGET_CONFIGURE_OPTS) \ $(BINUTILS_DIR)/configure \ --prefix=/usr \ --exec-prefix=/usr \ @@ -149,8 +153,7 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched touch $@ $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured - PATH=$(TARGET_PATH) \ - $(MAKE) -C $(BINUTILS_DIR2) all + PATH=$(TARGET_PATH) $(MAKE) -C $(BINUTILS_DIR2) all $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump PATH=$(TARGET_PATH) \ diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index f705f59eb..3dc5352ca 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -110,6 +110,17 @@ config BR2_GCC_VERSION default "4.2.0" if BR2_GCC_VERSION_4_2_0 default "4.3" if BR2_GCC_VERSION_4_3 +config BR2_TOOLCHAIN_SYSROOT +# bool "Enable toolchain with --sysroot support" + bool + depends on !BR2_GCC_VERSION_3_3_5 && !BR2_GCC_VERSION_3_3_6 && !BR2_GCC_VERSION_3_4_2 && !BR2_GCC_VERSION_3_4_3 && !BR2_GCC_VERSION_3_4_4 && !BR2_GCC_VERSION_3_4_5 && !BR2_GCC_VERSION_3_4_6 + 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. config BR2_GCC_USE_SJLJ_EXCEPTIONS bool "Enable setjmp/longjmp exceptions?" diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 8d6de7ed3..8d8e6f21e 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -19,6 +19,9 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) +# only for gcc-3.x +ifeq ($(findstring y,$(BR2_GCC_VERSION_3_3_5)$(BR2_GCC_VERSION_3_3_6)$(BR2_GCC_VERSION_3_4_2)$(BR2_GCC_VERSION_3_4_3)$(BR2_GCC_VERSION_3_4_4)$(BR2_GCC_VERSION_3_4_5)$(BR2_GCC_VERSION_3_4_6)),y) + ifeq ($(GCC_SNAP_DATE),) GCC_OFFICIAL_VER:=$(GCC_VERSION) GCC_SITE:=http://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION) @@ -69,7 +72,7 @@ GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc endif GCC_TARGET_PREREQ = -GCC_STAGING_PREREQ= $(STAGING_DIR)/lib/libc.a +GCC_STAGING_PREREQ= $(STAGING_DIR)/usr/lib/libc.a ifndef GCC_NO_MPFR GCC_WITH_HOST_GMP=--with-gmp=$(GMP_HOST_DIR) @@ -150,11 +153,11 @@ endif # the step or libgcc will not build... $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched - mkdir -p $(GCC_BUILD_DIR1) + -mkdir -p $(GCC_BUILD_DIR1) (cd $(GCC_BUILD_DIR1); PATH=$(TARGET_PATH) \ CC="$(HOSTCC)" \ $(GCC_DIR)/configure \ - --prefix=$(STAGING_DIR) \ + --prefix=$(STAGING_DIR)/usr \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ @@ -178,12 +181,12 @@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc touch $@ -$(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled +$(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 -gcc_initial: uclibc-configured binutils $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc +gcc_initial: uclibc-configured binutils $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc gcc_initial-clean: rm -rf $(GCC_BUILD_DIR1) @@ -203,14 +206,17 @@ gcc_initial-dirclean: # 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 - +comma:=, GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) - mkdir -p $(GCC_BUILD_DIR2) + -mkdir -p $(GCC_BUILD_DIR2) # Important! Required for limits.h to be fixed. - ln -snf ../include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - (cd $(GCC_BUILD_DIR2); PATH=$(TARGET_PATH) \ - CC="$(HOSTCC)" \ + 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) \ + LDFLAGS_FOR_TARGET="$(patsubst %,LDFLAGS+=-Wl$(comma)%,$(TARGET_LDFLAGS)) -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ $(GCC_DIR)/configure \ --prefix=$(STAGING_DIR) \ --build=$(GNU_HOST_NAME) \ @@ -239,28 +245,28 @@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install - if [ -d "$(STAGING_DIR)/lib64" ] ; then \ - if [ ! -e "$(STAGING_DIR)/lib" ] ; then \ - mkdir "$(STAGING_DIR)/lib" ; \ + if [ -d "$(STAGING_DIR)/usr/lib64" ] ; then \ + if [ ! -e "$(STAGING_DIR)/usr/lib" ] ; then \ + mkdir "$(STAGING_DIR)/usr/lib" ; \ fi ; \ - mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/" ; \ - rmdir "$(STAGING_DIR)/lib64" ; \ + 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 $(STAGING_DIR)/bin/* + -strip --strip-all -R .note -R .comment $(STAGING_DIR)/usr/bin/* endif # Make sure we have 'cc'. - if [ ! -e $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-cc ] ; then \ + if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ] ; then \ ln -snf $(REAL_GNU_TARGET_NAME)-gcc \ - $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ + $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ fi; - if [ ! -e $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/cc ] ; then \ - ln -snf gcc $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/cc ; \ + 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); \ + (cd $(STAGING_DIR)/usr; \ ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ cd bin; \ for app in $(REAL_GNU_TARGET_NAME)-* ; do \ @@ -279,11 +285,11 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) /bin/false ; \ fi; # Replace specs file with one that defaults to soft float mode. - if [ ! -f $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \ + 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)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs + cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif endif # @@ -295,17 +301,17 @@ $(GCC_BUILD_DIR2)/.libs_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)/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ + -cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgcc_s* endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) - -cp -dpf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/lib/ + -cp -dpf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/ $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libstdc++.so* endif ifeq ($(BR2_INSTALL_LIBGCJ),y) - -cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/ - -cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/ - -cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/ + -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/ @@ -321,8 +327,8 @@ gcc-source: $(DL_DIR)/$(GCC_SOURCE) 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)/bin/$(REAL_GNU_TARGET_NAME)-$$prog \ - rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-$$prog; \ + 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 @@ -341,9 +347,8 @@ $(GCC_BUILD_DIR3)/.prepared: $(GCC_BUILD_DIR2)/.libs_installed $(GCC_TARGET_PRER $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared (cd $(GCC_BUILD_DIR3); rm -rf config.cache ; \ - PATH=$(TARGET_PATH) \ - CC_FOR_BUILD="$(HOSTCC)" \ - CFLAGS_FOR_BUILD="-g -O2" \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS_FOR_BUILD="-g -O2 $(HOST_CFLAGS)" \ $(TARGET_GCC_FLAGS) \ $(GCC_DIR)/configure \ --prefix=/usr \ @@ -432,7 +437,7 @@ endif # 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)/$(GCC_LIB_SUBDIR)/include/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'. @@ -453,3 +458,6 @@ gcc_target-dirclean: rm -rf $(GCC_BUILD_DIR3) endif +# gcc-3.x only + +endif diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk new file mode 100644 index 000000000..3c556d17d --- /dev/null +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -0,0 +1,452 @@ +# 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 + +# gcc-4.x only +ifeq ($(findstring y,$(BR2_GCC_VERSION_3_3_5)$(BR2_GCC_VERSION_3_3_6)$(BR2_GCC_VERSION_3_4_2)$(BR2_GCC_VERSION_3_4_3)$(BR2_GCC_VERSION_3_4_4)$(BR2_GCC_VERSION_3_4_5)$(BR2_GCC_VERSION_3_4_6)),) +ifeq ($(GCC_SNAP_DATE),) +GCC_OFFICIAL_VER:=$(GCC_VERSION) +GCC_SITE:=http://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION) +#GCC_SITE:=ftp://ftp.ibiblio.org/pub/mirrors/gnu/ftp/gnu/gcc/gcc-$(GCC_OFFICIAL_VER) +else +GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE) +GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_OFFICIAL_VER) +endif + +GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2 +GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER) +GCC_CAT:=$(BZCAT) +GCC_STRIP_HOST_BINARIES:=true + + +ifeq ($(findstring x3.,x$(GCC_VERSION)),x3.) +GCC_NO_MPFR:=y +endif +ifeq ($(findstring x4.0.,x$(GCC_VERSION)),x4.0.) +GCC_NO_MPFR:=y +endif + +############################################################# +# +# Setup some initial stuff +# +############################################################# + +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)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so +#GCC_STAGING_PREREQ+= $(TOOL_BUILD_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 + +ifneq ($(BR2_ENABLE_LOCALE),y) +GCC_ENABLE_CLOCALE:=--disable-clocale +endif + + +$(DL_DIR)/$(GCC_SOURCE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE) + +gcc-unpacked: $(GCC_DIR)/.unpacked +$(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) + mkdir -p $(TOOL_BUILD_DIR) + rm -rf $(GCC_DIR) + $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(GCC_DIR) + touch $@ + +gcc-patched: $(GCC_DIR)/.patched +$(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked + # Apply any files named gcc-*.patch from the source directory to gcc +ifeq ($(GCC_SNAP_DATE),) + toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) \*.patch +else +ifneq ($(wildcard toolchain/gcc/$(GCC_OFFICIAL_VER)),) + toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_OFFICIAL_VER) \*.patch +else + toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) \*.patch +endif +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 + # Not yet updated to 3.4.1. + #ifeq ("$(strip $(ARCH))","i386") + #toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc i386-gcc-soft-float.patch + #endif +endif + touch $@ + +############################################################# +# +# build the first pass gcc compiler +# +############################################################# +GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial + + +# 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); rm -rf config.cache ; \ + $(HOST_CONFIGURE_OPTS) \ + $(GCC_DIR)/configure \ + --prefix=$(STAGING_DIR)/usr \ + --build=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --target=$(REAL_GNU_TARGET_NAME) \ + --enable-languages=c \ + $(BR2_CONFIGURE_DEVEL_SYSROOT) \ + --disable-__cxa_atexit \ + --enable-target-optspace \ + --with-gnu-ld \ + --disable-shared \ + $(GCC_WITH_HOST_GMP) \ + $(GCC_WITH_HOST_MPFR) \ + $(DISABLE_NLS) \ + $(THREADS) \ + $(MULTILIB) \ + $(SOFT_FLOAT_CONFIG_OPTION) \ + $(GCC_WITH_CPU) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ + $(EXTRA_GCC_CONFIG_OPTIONS)); + touch $@ + +$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured + $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc + touch $@ + +$(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)/usr/bin/gccbug $(STAGING_DIR)/usr/bin/gcov + #rm -rf $(STAGING_DIR)/usr/info $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc $(STAGING_DIR)/usr/share/locale + +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:=$(TOOL_BUILD_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_DIR)/configure \ + --prefix=$(BR2_SYSROOT_PREFIX)/usr \ + --build=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --target=$(REAL_GNU_TARGET_NAME) \ + --enable-languages=$(GCC_TARGET_LANGUAGES) \ + $(BR2_CONFIGURE_STAGING_SYSROOT) \ + $(BR2_CONFIGURE_BUILD_TOOLS) \ + --disable-__cxa_atexit \ + --enable-target-optspace \ + --with-gnu-ld \ + $(GCC_SHARED_LIBGCC) \ + $(GCC_WITH_HOST_GMP) \ + $(GCC_WITH_HOST_MPFR) \ + $(DISABLE_NLS) \ + $(THREADS) \ + $(MULTILIB) \ + $(SOFT_FLOAT_CONFIG_OPTION) \ + $(GCC_WITH_CPU) $(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 + $(MAKE) -C $(GCC_BUILD_DIR2) all + touch $@ + +$(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled + PATH=$(TARGET_PATH) $(MAKE) $(BR2_SYSROOT_STAGING_DESTDIR) \ + -C $(GCC_BUILD_DIR2) install + if [ -d "$(STAGING_DIR)/lib64" ] ; then \ + if [ ! -e "$(STAGING_DIR)/lib" ] ; then \ + mkdir "$(STAGING_DIR)/lib" ; \ + fi ; \ + mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/" ; \ + rmdir "$(STAGING_DIR)/lib64" ; \ + fi + # Strip the host binaries +ifeq ($(GCC_STRIP_HOST_BINARIES),true) + -strip --strip-all -R .note -R .comment $(STAGING_DIR)/bin/* +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/cc ] ; then \ + ln -snf gcc $(STAGING_DIR)/usr/bin/cc ; \ + fi; + # Set up the symlinks to enable lying about target name. + set -e; \ + (cd $(STAGING_DIR); \ + ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ + cd usr/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)/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)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs +endif +endif + # + # Ok... that's enough of that. + # + touch $@ + +$(GCC_BUILD_DIR2)/.libs_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)/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ +endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) + -cp -dpf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/lib/ +endif +ifeq ($(BR2_INSTALL_LIBGCJ),y) + -cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/ + -cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/ + -cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/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 + touch $@ + +gcc: uclibc-configured binutils gcc_initial $(LIBFLOAT_TARGET) uclibc \ + $(GCC_BUILD_DIR2)/.installed $(GCC_BUILD_DIR2)/.libs_installed \ + $(GCC_TARGETS) + +gcc-source: $(DL_DIR)/$(GCC_SOURCE) + +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)/bin/$(REAL_GNU_TARGET_NAME)-$$prog \ + rm -f $(STAGING_DIR)/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: $(GCC_BUILD_DIR2)/.libs_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) \ + $(TARGET_GCC_FLAGS) \ + $(GCC_DIR)/configure \ + --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 \ + $(GCC_SHARED_LIBGCC) \ + $(GCC_WITH_TARGET_GMP) \ + $(GCC_WITH_TARGET_MPFR) \ + $(DISABLE_NLS) \ + $(THREADS) \ + $(MULTILIB) \ + $(SOFT_FLOAT_CONFIG_OPTION) \ + $(GCC_WITH_CPU) $(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) -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 +#XXX: FIXME: cleanup BR2_ARCH selection and establish BR2_CPU +#GCC_WITH_ARCH=--with-arch=$(BR2_ARCH) +#GCC_WITH_TUNE=--with-tune=$(BR2_ARCH) +#GCC_WITH_CPU=--with-cpu=$(BR2_ARCH) +endif + +$(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled + PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \ + $(MAKE) -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 $(STRIP) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIP) cc1 cc1plus collect2 > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/lib && $(STRIP) libstdc++.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/lib && $(STRIP) 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)/$(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 $@ + +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-4.x only diff --git a/toolchain/sstrip/sstrip.mk b/toolchain/sstrip/sstrip.mk index d18853118..cb1bed534 100644 --- a/toolchain/sstrip/sstrip.mk +++ b/toolchain/sstrip/sstrip.mk @@ -12,13 +12,13 @@ SSTRIP_SOURCE_FILE:=$(TOPDIR)/toolchain/sstrip/sstrip.c # ###################################################################### -SSTRIP_HOST:=$(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-sstrip +SSTRIP_HOST:=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip $(SSTRIP_HOST): $(SSTRIP_SOURCE_FILE) ln -snf ../../bin/$(REAL_GNU_TARGET_NAME)-sstrip \ - $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/sstrip + $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/sstrip ln -snf $(REAL_GNU_TARGET_NAME)-sstrip \ - $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-sstrip + $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip $(HOSTCC) $(SSTRIP_SOURCE_FILE) -o $(SSTRIP_HOST) sstrip_host: $(SSTRIP_HOST) @@ -27,8 +27,8 @@ sstrip_host-source: $(SSTRIP_SOURCE_FILE) sstrip_host-clean: rm -f $(SSTRIP_HOST) - rm -f $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/sstrip - rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-sstrip + rm -f $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/sstrip + rm -f $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip sstrip_host-dirclean: true diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index b730a9622..038c9cf37 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -59,6 +59,7 @@ UCLIBC_TARGET_ENDIAN:=$(shell $(SHELL) -c "echo $(ARCH) | sed \ -e 's/mipsel/LITTLE/' \ -e 's/mips/BIG/' \ ") + ifneq ($(UCLIBC_TARGET_ENDIAN),LITTLE) ifneq ($(UCLIBC_TARGET_ENDIAN),BIG) UCLIBC_TARGET_ENDIAN:= @@ -88,6 +89,7 @@ endif uclibc-unpacked: $(UCLIBC_DIR)/.unpacked $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA) [ -d $(TOOL_BUILD_DIR) ] || $(INSTALL) -d $(TOOL_BUILD_DIR) + rm -rf $(UCLIBC_DIR) $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) toolchain/patch-kernel.sh $(UCLIBC_DIR) toolchain/uClibc/ uClibc-$(UCLIBC_VER)-\*.patch @@ -97,7 +99,7 @@ endif ifneq ($(BR2_ENABLE_LOCALE),) cp -dpf $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE) $(UCLIBC_DIR)/extra/locale/ endif - touch $(UCLIBC_DIR)/.unpacked + touch $@ # Some targets may wish to provide their own UCLIBC_CONFIG_FILE... $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE) @@ -126,15 +128,6 @@ ifeq ($(BR2_ARM_OABI),y) endif endif ifneq ($(UCLIBC_TARGET_ENDIAN),) - $(SED) '/^# ARCH_$(UCLIBC_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=y,g}' \ - -e '/^# ARCH_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=n,g}' \ - $(UCLIBC_DIR)/.config - - $(SED) '/^# ARCH_WANTS_$(UCLIBC_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=y,g}' \ - -e '/^# ARCH_WANTS_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=n,g}' \ - $(UCLIBC_DIR)/.config -endif -ifneq ($(UCLIBC_TARGET_ENDIAN),) # The above doesn't work for me, so redo $(SED) 's/.*\(ARCH_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN\).*/# \1 is not set/g' \ -e 's/.*\(ARCH_WANTS_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN\).*/# \1 is not set/g' \ @@ -158,7 +151,9 @@ ifeq ($(BR2_SOFT_FLOAT),y) $(UCLIBC_DIR)/.config #$(SED) 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=n\nHAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config else - $(SED) 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=y\nHAS_FPU=y\nUCLIBC_HAS_FLOATS=y\n,g' $(UCLIBC_DIR)/.config + $(SED) '/UCLIBC_HAS_FLOATS/d' \ + -e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=y\nHAS_FPU=y\nUCLIBC_HAS_FLOATS=y\n,g' \ + $(UCLIBC_DIR)/.config endif $(SED) '/UCLIBC_HAS_THREADS/d' $(UCLIBC_DIR)/.config $(SED) '/LINUXTHREADS/d' $(UCLIBC_DIR)/.config @@ -235,7 +230,7 @@ endif RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ HOSTCC="$(HOSTCC)" \ oldconfig - touch $(UCLIBC_DIR)/.config + touch -c $@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config set -x && $(MAKE1) -C $(UCLIBC_DIR) \ @@ -245,6 +240,12 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config HOSTCC="$(HOSTCC)" \ pregen install_dev # Install the kernel headers to the first stage gcc include dir if necessary +ifeq ($(LINUX_HEADERS_IS_KERNEL),y) + if [ ! -f $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/linux/version.h ] ; \ + then \ + cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \ + fi +else if [ ! -f $(STAGING_DIR)/include/linux/version.h ] ; then \ cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \ cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \ @@ -253,7 +254,8 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \ fi; \ fi; - touch $(UCLIBC_DIR)/.configured +endif + touch $@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET) $(MAKE1) -C $(UCLIBC_DIR) \ @@ -262,7 +264,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET) RUNTIME_PREFIX=/ \ HOSTCC="$(HOSTCC)" \ all - touch -c $(UCLIBC_DIR)/lib/libc.a + touch -c $@ uclibc-menuconfig: host-sed $(UCLIBC_DIR)/.config $(MAKE1) -C $(UCLIBC_DIR) \ @@ -272,45 +274,59 @@ uclibc-menuconfig: host-sed $(UCLIBC_DIR)/.config HOSTCC="$(HOSTCC)" \ menuconfig && \ cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) && \ - touch $(UCLIBC_DIR)/.config + touch -c $(UCLIBC_DIR)/.config -$(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a +$(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a +ifeq ($(findstring y,$(BR2_GCC_VERSION_3_3_5)$(BR2_GCC_VERSION_3_3_6)$(BR2_GCC_VERSION_3_4_2)$(BR2_GCC_VERSION_3_4_3)$(BR2_GCC_VERSION_3_4_4)$(BR2_GCC_VERSION_3_4_5)$(BR2_GCC_VERSION_3_4_6)),y) $(MAKE1) -C $(UCLIBC_DIR) \ PREFIX= \ DEVEL_PREFIX=$(STAGING_DIR)/ \ RUNTIME_PREFIX=$(STAGING_DIR)/ \ install_runtime install_dev +else + $(MAKE1) -C $(UCLIBC_DIR) \ + PREFIX=$(STAGING_DIR) \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=/ \ + install_runtime install_dev +endif # Install the kernel headers to the staging dir if necessary - if [ ! -f $(STAGING_DIR)/include/linux/version.h ] ; then \ - cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(STAGING_DIR)/include/ ; \ - cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(STAGING_DIR)/include/ ; \ +ifeq ($(LINUX_HEADERS_IS_KERNEL),y) + if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \ + cp -pLR $(LINUX_HEADERS_DIR)/include/* $(STAGING_DIR)/usr/include/ ; \ + fi +else + + if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \ + cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(STAGING_DIR)/usr/include/ ; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(STAGING_DIR)/usr/include/ ; \ if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \ cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ - $(STAGING_DIR)/include/ ; \ + $(STAGING_DIR)/usr/include/ ; \ fi; \ fi; +endif # Build the host utils. Need to add an install target... $(MAKE1) -C $(UCLIBC_DIR)/utils \ PREFIX=$(STAGING_DIR) \ HOSTCC="$(HOSTCC)" \ hostutils - install -c $(UCLIBC_DIR)/utils/ldd.host $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/ldd - (cd $(STAGING_DIR)/bin; ln -s ../$(REAL_GNU_TARGET_NAME)/bin/ldd $(GNU_TARGET_NAME)-ldd) - (cd $(STAGING_DIR)/bin; ln -s ../$(REAL_GNU_TARGET_NAME)/bin/ldd $(REAL_GNU_TARGET_NAME)-ldd) - install -c $(UCLIBC_DIR)/utils/ldconfig.host $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/ldconfig - (cd $(STAGING_DIR)/bin; ln -s ../$(REAL_GNU_TARGET_NAME)/bin/ldconfig $(GNU_TARGET_NAME)-ldconfig) - (cd $(STAGING_DIR)/bin; ln -s ../$(REAL_GNU_TARGET_NAME)/bin/ldconfig $(REAL_GNU_TARGET_NAME)-ldconfig) - touch -c $(STAGING_DIR)/lib/libc.a + install -c $(UCLIBC_DIR)/utils/ldd.host $(STAGING_DIR)/usr/bin/ldd + ln -sf ldd $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ldd + install -c $(UCLIBC_DIR)/utils/ldconfig.host $(STAGING_DIR)/usr/bin/ldconfig + ln -sf ldconfig $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ldconfig + ln -sf ldconfig $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig + touch -c $@ ifneq ($(TARGET_DIR),) -$(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a +$(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a $(MAKE1) -C $(UCLIBC_DIR) \ PREFIX=$(TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ install_runtime - touch -c $(TARGET_DIR)/lib/libc.so.0 + touch -c $@ $(TARGET_DIR)/usr/bin/ldd: $(MAKE1) -C $(UCLIBC_DIR) $(TARGET_CONFIGURE_OPTS) \ @@ -320,7 +336,7 @@ ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) install -c $(TARGET_DIR)/usr/bin/ldd \ $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/ldd endif - touch -c $(TARGET_DIR)/usr/bin/ldd + touch -c $@ UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0 endif @@ -328,8 +344,7 @@ endif uclibc-configured: dependencies kernel-headers $(UCLIBC_DIR)/.configured -uclibc: $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/lib/libc.a \ - $(UCLIBC_TARGETS) +uclibc: $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/lib/libc.a $(UCLIBC_TARGETS) uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE) @@ -351,13 +366,19 @@ uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd # ############################################################# -$(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a +$(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/usr/lib/libc.a $(MAKE1) -C $(UCLIBC_DIR) \ PREFIX=$(TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ install_dev # Install the kernel headers to the target dir if necessary +ifeq ($(LINUX_HEADERS_IS_KERNEL),y) + if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ] ; \ + then \ + cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TARGET_DIR)/usr/include/ ; \ + fi +else if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ] ; then \ cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TARGET_DIR)/usr/include/ ; \ cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TARGET_DIR)/usr/include/ ; \ @@ -366,7 +387,8 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a $(TARGET_DIR)/usr/include/ ; \ fi; \ fi; - touch -c $(TARGET_DIR)/usr/lib/libc.a +endif + touch -c $@ uclibc_target: gcc uclibc $(TARGET_DIR)/usr/lib/libc.a $(TARGET_DIR)/usr/bin/ldd |