Changeset 65

Timestamp:

06/16/06 08:14:56 (3 years ago)

Author:

wbx

Message:

cleanup toolchain Makefiles, Config.in is removed, we should always use a working and very well tested toolchain, developers who care about compiler optimizations should be able to change the settings

Files:

• trunk/freewrt/Config.in (modified) (1 diff)
• trunk/freewrt/toolchain/Config.in (deleted)
• trunk/freewrt/toolchain/binutils/Config.in (deleted)
• trunk/freewrt/toolchain/binutils/Makefile (modified) (3 diffs)
• trunk/freewrt/toolchain/gcc/Config.in (deleted)
• trunk/freewrt/toolchain/gcc/Makefile (modified) (7 diffs)
• trunk/freewrt/toolchain/uClibc/Config.in (deleted)
• trunk/freewrt/toolchain/uClibc/Makefile (modified) (2 diffs)

trunk/freewrt/Config.in

@@ -102 +102 @@
-source "target/linux/Config.in"
-source "package/Config.in"
-source "toolchain/Config.in"

trunk/freewrt/toolchain/binutils/Makefile

@@ +1 @@
+# $FreeWRT$
+
-include $(TOPDIR)/rules.mk
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        ftp://gatekeeper.dec.com/pub/GNU/ \
-        ftp://ftp.uu.net/archive/systems/gnu/ \
@@ -20 +10 @@
-        ftp://ftp.funet.fi/pub/gnu/prep/ \
-        ftp://ftp.leo.org/pub/comp/os/unix/gnu/ 
-
-ifeq ($(BINUTILS_VERSION),2.16.1)
-BINUTILS_SITE:=$(BINUTILS_STABLE_SITE)
-endif
-
-BINUTILS_SOURCE:=binutils-$(BINUTILS_VERSION).tar.bz2
@@ -55 +41 @@
-                --target=$(REAL_GNU_TARGET_NAME) \
-                --disable-werror \
-
-
-
+
+
-        touch $(BINUTILS_DIR1)/.configured
-

trunk/freewrt/toolchain/gcc/Makefile

@@ -21 +21 @@
-include $(TOPDIR)/rules.mk
-
-
-
-
+
-GCC_SITE:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(GCC_VERSION) \
-        http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(GCC_VERSION)
@@ -32 +30 @@
-GCC_STRIP_HOST_BINARIES:=true
-
-#############################################################
-#
-# Setup some initial stuff
-#
-#############################################################
-
-ifeq ($(BR2_INSTALL_LIBGCJ),y)
-TARGET_LANGUAGES:=c,c++,java
-else
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-TARGET_LANGUAGES:=c,c++
-else
-TARGET_LANGUAGES:=c
-endif
-endif
-
-#############################################################
@@ -63 +47 @@
-        mkdir -p $(TOOL_BUILD_DIR)
-        $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | (cd $(TOOL_BUILD_DIR); $(TAR_EXTRACT) )
-(GCC_DIR)/.unpacked
+@
-
-$(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
-        # Apply any files named gcc-*.patch from the source directory to gcc
-        $(SCRIPT_DIR)/patch-kernel.sh $(GCC_DIR) ./$(GCC_VERSION) \*.patch
-        # 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.
-ifeq ($(BR2_SOFT_FLOAT),y)
-ifeq ("$(strip $(ARCH))","arm")
-        $(SCRIPT_DIR)/patch-kernel.sh $(GCC_DIR) ./$(GCC_VERSION) arm-softfloat.patch.conditional
-endif
-ifeq ("$(strip $(ARCH))","armeb")
-        $(SCRIPT_DIR)/patch-kernel.sh $(GCC_DIR) ./$(GCC_VERSION) arm-softfloat.patch.conditional
-endif
-endif
-        $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (FreeWrt)\2,' $(GCC_DIR)/gcc/version.c
-        $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:http://www.freewrt.org/development>\2,' $(GCC_DIR)/gcc/version.c
-
-
-
-
-
+
-
-$(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
@@ -102 +70 @@
-                --enable-target-optspace \
-                --with-gnu-ld \
-
-
-
-
-
-
+
+
+
+
-
-$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
-        PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
-(GCC_BUILD_DIR1)/.compiled
+@
-
-$(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
@@ -122 +88 @@
-#
-#############################################################
-#
-# 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
@@ -148 +108 @@
-                --enable-target-optspace \
-                --with-gnu-ld \
-
-
-
-
-
-
-
+
+
+
+
-
-$(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
-        PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) all
-(GCC_BUILD_DIR2)/.compiled
+@
-
-gcc-install: $(GCC_BUILD_DIR2)/.compiled
@@ -173 +130 @@
-                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 ./$(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) ./$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
-endif
-endif
-# We do another ugly hack here because the standard behaviour is
-# to include a reference to libgcc.so.1 in all binaries. For flash space

trunk/freewrt/toolchain/uClibc/Makefile

@@ +1 @@
+# $FreeWRT$
+
-include $(TOPDIR)/rules.mk
-
-#############################################################
-#
-# uClibc (the C library)
-#
-#############################################################
-
-ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
-# Be aware that this changes daily....
-UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc
-UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2
-#"
-UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
-UCLIBC_VER:=PKG_VERSION:=0.${shell date +"%G%m%d"}
-else
-UCLIBC_VER:=0.9.28
-UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VER)
-UCLIBC_SOURCE:=uClibc-$(UCLIBC_VER).tar.bz2
-UCLIBC_SITE:=http://www.uclibc.org/downloads
-endif
-
-UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
@@ -51 +38 @@
-        $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \
-                $(UCLIBC_DIR)/.config
-ifeq ($(BR2_LARGEFILE),y)
-        $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.config
-else
-        $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.config
-endif
-        $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
-ifeq ($(BR2_SOFT_FLOAT),y)
-        $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config
-endif
-        mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
-        mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib