Commit 5fd095b3 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

toolchain: remove gcc 4.1.2 and non-sysroot support 



Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 144e4ed0

CHANGES

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 


	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,

	removed yaboot. Support building u-boot from custom tarball.

Makefile

+0 −10
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ include toolchain/dependencies/dependencies.mk 
include toolchain/binutils/binutils.mk

include toolchain/ccache/ccache.mk

include toolchain/elf2flt/elf2flt.mk

include toolchain/gcc/gcc-uclibc-3.x.mk

include toolchain/gcc/gcc-uclibc-4.x.mk

include toolchain/gdb/gdb.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):

	@mkdir -p $(STAGING_DIR)/bin

	@mkdir -p $(STAGING_DIR)/lib

ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)

	@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/bin

package/Makefile.in

+0 −2
Original line number Diff line number Diff line
@@ -83,10 +83,8 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) 
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include

TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib

TARGET_CXXFLAGS=$(TARGET_CFLAGS)

ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)

TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)

TARGET_LDFLAGS+= $(BR2_SYSROOT)

endif



#########################################################################

else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)

toolchain/Config.in.2

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ config BR2_GCC_CROSS_CXX 


config BR2_INSTALL_LIBSTDCPP

	bool "Build/install c++ compiler and libstdc++?"

	select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_BUILDROOT)

	select BR2_GCC_CROSS_CXX

	help

	  If you are building your own toolchain and want to build and install

toolchain/Makefile.in

+0 −12
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ else 
MULTILIB:=--disable-multilib

endif



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=$(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_SYSROOT=--sysroot=$(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....

include toolchain/gcc/Makefile.in