From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Sep 2011 00:58:34 +0000 (+0200)
Subject: Merge remote branch 'origin/next' into arm-port
X-Git-Tag: v2.9-core54~13^2~68
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=7b321c2cbe910caeb0d5887cc4f4dc15836dd473

Merge remote branch 'origin/next' into arm-port

Conflicts:
	config/rootfiles/common/i586/gcc
	lfs/binutils
	lfs/cleanup-toolchain
	lfs/coreutils
	lfs/gcc
	lfs/glibc
	lfs/groff
	src/pakfire/pakfire.conf
	src/patches/gcc-4.1.2-specs-1.patch
---

7b321c2cbe910caeb0d5887cc4f4dc15836dd473
diff --cc lfs/binutils
index c1b660b583,b6b2c19b5a..e0d039800a
--- a/lfs/binutils
+++ b/lfs/binutils
@@@ -72,14 -52,7 +55,16 @@@ els
  endif
  endif
  
 -EXTRA_CONFIG += --build=$(BUILDTARGET)
 +ifeq "$(MACHINE_TYPE)" "arm"
 +	EXTRA_CONFIG += \
 +		--host=$(BUILDTARGET) \
 +		--build=$(BUILDTARGET) \
 +		--target=$(BUILDTARGET) \
 +		--with-abi=aapcs-linux \
 +		--with-float=soft
++else
++	EXTRA_CONFIG += --build=$(BUILDTARGET)
 +endif
  
  ###############################################################################
  # Top-level Rules
@@@ -124,24 -93,23 +105,23 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
  	@$(PREBUILD)
  	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
  	@mkdir $(DIR_SRC)/binutils-build
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-configure-1.patch
 -	cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 +	cd $(DIR_SRC)/binutils-build && MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
  ifeq "$(PASS)" "1"
 -	cd $(DIR_SRC)/binutils-build && make configure-host
 +	cd $(DIR_SRC)/binutils-build && make configure-host MAKEINFO=makeinfo MACHINE=
  endif
 -	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
 -	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 +	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING) MAKEINFO=makeinfo MACHINE=
 +	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MAKEINFO=makeinfo MACHINE=
  ifeq "$(ROOT)" ""
- ifneq "$(LFS_PASS)" "install"
  	cp -v $(DIR_APP)/include/libiberty.h /usr/include
- endif
  else
  ifeq "$(PASS)" "1"
 -	cd $(DIR_SRC)/binutils-build && make -C ld clean
 -	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib
 +	cd $(DIR_SRC)/binutils-build && make -C ld clean MACHINE=
 +	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib MACHINE=
  	cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
  else
 -	cd $(DIR_SRC)/binutils-build && make -C ld clean
 -	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
 +	cd $(DIR_SRC)/binutils-build && make -C ld clean MACHINE=
 +	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib MACHINE=
  	cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
  endif
  endif
diff --cc lfs/cleanup-toolchain
index 79d5db40a8,cc66a2d2fc..306b781c2f
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@@ -29,12 -29,6 +29,8 @@@ VER        = ipfir
  THISAPP    = cleanup-toolchain
  TARGET     = $(DIR_INFO)/$(THISAPP)-$(PASS)-tools
  
- ifeq "$(MACHINE_TYPE)" "arm"
- 	GCC_VER = 4.1.2
- else
- 	GCC_VER = 4.0.4
- endif
++GCC_VER    = 4.1.2
 +
  ###############################################################################
  # Top-level Rules
  ###############################################################################
diff --cc lfs/gcc
index 6605d5b935,95cc681c8c..785b965cf1
--- a/lfs/gcc
+++ b/lfs/gcc
@@@ -97,10 -52,9 +52,9 @@@ ifeq "$(PASS)" "1
  		--with-local-prefix=/tools \
  		--disable-nls \
  		--enable-shared \
 -		--enable-languages=c
 -  EXTRA_MAKE = bootstrap
 -  # BOOT_LDFLAGS="-static"
 +		--enable-languages=c \
 +		--disable-bootstrap
 +  EXTRA_MAKE = 
-   #bootstrap BOOT_LDFLAGS="-static"
    EXTRA_INSTALL = 
  else
    TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@@ -117,24 -71,7 +71,27 @@@
  endif
  endif
  
 -EXTRA_CONFIG += --build=$(BUILDTARGET) --host=$(BUILDTARGET) --target=$(BUILDTARGET)
 +ifeq "$(MACHINE_TYPE)" "arm"
 +	EXTRA_CONFIG += \
 +		--build=$(BUILDTARGET) \
 +		--host=$(BUILDTARGET) \
 +		--target=$(BUILDTARGET) \
 +		--with-float=soft \
 +		--disable-libmudflap \
 +		--disable-libssp \
 +		--disable-libgomp \
 +		--enable-threads=posix \
 +		--enable-long-long \
 +		--enable-c99 \
 +		--enable-__cxa_atexit \
 +		--disable-multilib
++else
++	EXTRA_CONFIG += --build=$(BUILDTARGET) --host=$(BUILDTARGET) \
++		--target=$(BUILDTARGET)
 +endif
 +
 +export XCFLAGS = $(CFLAGS)
 +export TCFLAGS = $(CFLAGS)
  
  ###############################################################################
  # Top-level Rules
@@@ -177,35 -110,9 +130,13 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
  	@$(PREBUILD)
  	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_linker_version_detection.patch
  	@mkdir $(DIR_SRC)/gcc-build
 +
 +	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/gcc-4.1.2-gcc_eh.patch
 +	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/gcc-4.1.2-arm-linux-soft-float.patch
 +
  ifeq "$(ROOT)" ""
- ifeq "$(INST)" "1"
- 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
- 	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
- 	cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) all-gcc
- 	cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install-gcc
- 	cd /opt/$(MACHINE)-uClibc/bin && for i in `ls -w1 $(MACHINE)-linux-uclibc-*`; do \
- 		ln -svf $$i $(MACHINE)-linux-`echo $$i | cut -c 19-`; \
- 	done
- 	ln -svf $(MACHINE)-linux-uclibc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux
- 	ln -svf gcc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/bin/cc
- else
- ifeq "$(INST)" "2"
- 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
- 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-locale.patch
- 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-libstdc++-pic.patch
- 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-sdk-libstdc++-includes.patch
- 	ln -snf ../include /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/sys-include
- 	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
- 	cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) $(EXTRA_MAKE)
- 	cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install $(EXTRA_INSTALL)
- 	cp -f /opt/$(MACHINE)-uClibc/lib/libgcc_s.so /lib
- 	cd /lib && ln -sf libgcc_s.so libgcc_s.so.1
- else
  	cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
  	cd $(DIR_APP) && sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in
  	cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
diff --cc lfs/glibc
index 5950b1c4e5,a81419a676..702aa05f8f
--- a/lfs/glibc
+++ b/lfs/glibc
@@@ -55,13 -51,7 +55,15 @@@ els
    EXTRA_INSTALL =
  endif
  
 -EXTRA_CONFIG += --build=$(BUILDTARGET)
 +ifeq "$(MACHINE_TYPE)" "arm"
 +	# Disable hardware FP for ARM.
 +	EXTRA_CONFIG += \
 +		--build=arm \
 +		--host=$(BUILDTARGET) \
 +		--without-fp
++else
++	EXTRA_CONFIG += --build=$(BUILDTARGET)
 +endif
  
  ###############################################################################
  # Top-level Rules
diff --cc lfs/qemu
index 049efff3ea,20f594241a..da2ea34ba2
--- a/lfs/qemu
+++ b/lfs/qemu
@@@ -31,9 -31,8 +31,9 @@@ DL_FILE    = $(THISAPP).tar.g
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
 +SUP_ARCH   = i586
  PROG       = qemu
- PAK_VER    = 11
+ PAK_VER    = 13
  
  DEPS       = "sdl"
  
diff --cc make.sh
index b3abaceb4f,99fc86f491..e229b98fa9
--- a/make.sh
+++ b/make.sh
@@@ -978,14 -952,14 +977,14 @@@ toolchain
  	prepareenv
  	beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
  	buildtoolchain
- 	echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
+ 	echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | tee -a $LOGFILE
  	test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
- 	cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
+ 	cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
  		build/{bin,etc,usr/bin,usr/local} \
 -		build/tools/{bin,etc,*-linux-gnu,include,lib,libexec,sbin,share,var} \
 +		build/tools/{bin,etc,*-linux-gnu*,include,lib,libexec,sbin,share,var} \
  		log >> $LOGFILE
- 	md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
- 		> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.md5
+ 	md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
+ 		> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5
  	stdumount
  	;;
  gettoolchain)