Commit 4af6496e authored by Martin Banky's avatar Martin Banky Committed by Peter Korsgaard
Browse files

Add gcc 4.5.1 to buildroot

parent 5e12a71e
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ source "package/grep/Config.in"
endif
source "package/intltool/Config.in"
source "package/make/Config.in"
source "package/mpc/Config.in"
source "package/mpfr/Config.in"
source "package/libtool/Config.in"
source "package/m4/Config.in"

package/mpc/Config.in

0 → 100644
+19 −0
Original line number Diff line number Diff line
config BR2_PACKAGE_LIBMPC
	bool "mpc"
	select BR2_PACKAGE_LIBMPFR
	select BR2_PACKAGE_LIBGMP
	help
	  Mpc is a C library for the arithmetic of complex numbers with
	  arbitrarily high precision and correct rounding of the result.
	  It is built upon and follows the same principles as Mpfr.
	  
	  http://www.multiprecision.org/


config BR2_PACKAGE_LIBMPC_HEADERS
	bool "mpc headers for target"
	depends on BR2_PACKAGE_LIBMPC
	select BR2_PACKAGE_LIBMPFR_HEADERS
	select BR2_PACKAGE_LIBGMP_HEADERS
	help
	  Install the mpc headers for the target.

package/mpc/mpc.mk

0 → 100644
+111 −0
Original line number Diff line number Diff line
#libmpc: libgmp libmpfr $(TARGET_DIR)/usr/lib/libmpc$(LIBTGTEXT)

#############################################################
#
# mpc
#
#############################################################
MPC_VERSION:=0.8.2
MPC_SOURCE:=mpc-$(MPC_VERSION).tar.gz
MPC_SITE:=http://www.multiprecision.org/mpc/download/$(MPC_SOURCE)
MPC_CAT:=$(ZCAT)
MPC_DIR:=$(TOOLCHAIN_DIR)/mpc-$(MPC_VERSION)
MPC_TARGET_DIR:=$(BUILD_DIR)/mpc-$(MPC_VERSION)
MPC_BINARY:=libmpc$(LIBTGTEXT)
MPC_HOST_BINARY:=libmpc$(HOST_LIBEXT)
MPC_LIBVERSION:=1.0.0

$(DL_DIR)/$(MPC_SOURCE):
	 $(call DOWNLOAD,$(MPC_SITE),$(MPC_SOURCE))

libmpc-source: $(DL_DIR)/$(MPC_SOURCE)

$(MPC_DIR)/.unpacked: $(DL_DIR)/$(MPC_SOURCE)
	$(MPC_CAT) $(DL_DIR)/$(MPC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
	toolchain/patch-kernel.sh $(MPC_DIR) package/mpc/ \*.patch
	$(CONFIG_UPDATE) $(@D)
	touch $@

$(MPC_TARGET_DIR)/.configured: $(MPC_DIR)/.unpacked
	mkdir -p $(MPC_TARGET_DIR)
	(cd $(MPC_TARGET_DIR); rm -rf config.cache; \
		$(TARGET_CONFIGURE_OPTS) \
		$(TARGET_CONFIGURE_ARGS) \
		$(MPC_DIR)/configure $(QUIET) \
		--target=$(GNU_TARGET_NAME) \
		--host=$(GNU_TARGET_NAME) \
		--build=$(GNU_HOST_NAME) \
		--prefix=/usr \
		$(PREFERRED_LIB_FLAGS) \
		--with-mpfr-lib=$(TARGET_DIR)/usr/lib/ \
		--with-gmp-lib=$(TARGET_DIR)/usr/lib/ \
		--with-mpfr-include=$(STAGING_DIR)/usr/include/ \
		--with-gmp-include=$(STAGING_DIR)/usr/include/ \
		$(DISABLE_NLS) \
	)
	touch $@

$(MPC_TARGET_DIR)/.libs/$(MPC_BINARY): $(MPC_TARGET_DIR)/.configured
	#$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MPC_TARGET_DIR)
	$(MAKE) -C $(MPC_TARGET_DIR)

$(STAGING_DIR)/usr/lib/$(MPC_BINARY): $(MPC_TARGET_DIR)/.libs/$(MPC_BINARY)
	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(MPC_TARGET_DIR) install
	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/libmpc$(LIBTGTEXT)*

$(TARGET_DIR)/usr/lib/libmpc.so $(TARGET_DIR)/usr/lib/libmpc.so.$(MPC_LIBVERSION) $(TARGET_DIR)/usr/lib/libmpc.a: $(STAGING_DIR)/usr/lib/$(MPC_BINARY)
	cp -dpf $(STAGING_DIR)/usr/lib/libmpc$(LIBTGTEXT)* $(TARGET_DIR)/usr/lib/
ifeq ($(BR2_PACKAGE_LIBMPC_HEADERS),y)
	test -d $(TARGET_DIR)/usr/include || mkdir -p $(TARGET_DIR)/usr/include
	cp -dpf $(STAGING_DIR)/usr/include/mpc.h $(TARGET_DIR)/usr/include/
endif

libmpc: $(TARGET_DIR)/usr/lib/libmpc$(LIBTGTEXT)
stage-libmpc: $(STAGING_DIR)/usr/lib/$(MPC_BINARY)

libmpc-clean:
	rm -f $(TARGET_DIR)/usr/lib/libmpc.* $(TARGET_DIR)/usr/include/mpc.h \
		$(STAGING_DIR)/usr/lib/libmpc* $(STAGING_DIR)/usr/include/mpc.h
	-$(MAKE) -C $(MPC_TARGET_DIR) clean

libmpc-dirclean:
	rm -rf $(MPC_TARGET_DIR) $(MPC_DIR)

MPC_DIR2:=$(TOOLCHAIN_DIR)/mpc-$(MPC_VERSION)-host
MPC_HOST_DIR:=$(TOOLCHAIN_DIR)/mpc
$(MPC_DIR2)/.configured: $(MPC_DIR)/.unpacked
	mkdir -p $(MPC_DIR2)
	(cd $(MPC_DIR2); rm -rf config.cache; \
		$(HOST_CONFIGURE_OPTS) \
		$(MPC_CPP_FLAGS) \
		$(MPC_DIR)/configure $(QUIET) \
		--prefix="$(MPC_HOST_DIR)" \
		--build=$(GNU_HOST_NAME) \
		--host=$(GNU_HOST_NAME) \
		--disable-shared \
		--enable-static \
		--with-mpfr=$(MPFR_HOST_DIR) \
		--with-gmp=$(GMP_HOST_DIR) \
		$(DISABLE_NLS) \
	)
	touch $@

$(MPC_HOST_DIR)/lib/libmpc$(HOST_LIBEXT): $(MPC_DIR2)/.configured
	$(MAKE) -C $(MPC_DIR2) install

host-libmpc: $(MPC_HOST_DIR)/lib/$(MPC_HOST_BINARY)
host-libmpc-source: libmpc-source
host-libmpc-clean:
	rm -rf $(MPC_HOST_DIR)
	-$(MAKE) -C $(MPC_DIR2) clean
host-libmpc-dirclean:
	rm -rf $(MPC_HOST_DIR) $(MPC_DIR2)

#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(BR2_PACKAGE_LIBMPC),y)
TARGETS+=libmpc
endif
+16 −0
Original line number Diff line number Diff line
@@ -29,6 +29,22 @@ EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_HOST_DIR)"
BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp="$(GMP_TARGET_DIR)"
BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)"

ifeq ($(BR2_PACKAGE_LIBMPC),y)
BINUTILS_ADD_MPC = y
endif

ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
BINUTILS_ADD_MPC = y
endif

ifeq ($(BINUTILS_ADD_MPC),y)
BINUTILS_HOST_PREREQ += $(TOOLCHAIN_DIR)/mpc/lib/libmpc$(HOST_LIBEXT)
HOST_SOURCE += host-libmpc-source
BINUTILS_TARGET_PREREQ += $(TARGET_DIR)/usr/lib/libmpc$(LIBTGTEXT)
EXTRA_BINUTILS_CONFIG_OPTIONS += --with-mpc="$(MPC_HOST_DIR)"
BINUTILS_TARGET_CONFIG_OPTIONS += --with-mpc="$(MPC_TARGET_DIR)"
endif

BINUTILS_PATCH_DIR:=toolchain/binutils/$(BINUTILS_VERSION)

ifneq ($(filter xtensa%,$(ARCH)),)
+33 −0
Original line number Diff line number Diff line
--- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh
+++ gcc/contrib/regression/objs-gcc.sh
@@ -105,6 +105,10 @@
  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/libjava/classpath/ltconfig
+++ gcc/libjava/classpath/ltconfig
@@ -603,7 +603,7 @@
 
 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
 case $host_os in
-linux-gnu*) ;;
+linux-gnu*|linux-uclibc*) ;;
 linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
 esac
 
@@ -1251,7 +1251,7 @@
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
Loading