X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbinutils;h=8ad6902e85bf7c418764e5701e25d0e4c26c6618;hb=51f9e7ace124dbf23d2c4ebf8bfb1aa475c71bb9;hp=464ac52fc37d91350f3da7bbcaba1663fa1b11f6;hpb=2f7e68cde0470f082bc90e79cdbc18b436a66ba9;p=ipfire-2.x.git

diff --git a/lfs/binutils b/lfs/binutils
index 464ac52fc3..8ad6902e85 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,13 +24,20 @@
 
 include Config
 
-VER        = 2.17
+ifeq "$(MACHINE)" "arm"
+	VER = 2.18
+else
+	VER = 2.17
+endif
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+# XXX maybe we can remove that ugly MACHINE= by this
+#unexport MACHINE
+
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
@@ -55,7 +62,7 @@ else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror --disable-gprof
-  EXTRA_MAKE = LDFLAGS="-all-static"
+  #EXTRA_MAKE = LDFLAGS="-all-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@ -65,6 +72,15 @@ else
 endif
 endif
 
+ifeq "$(MACHINE)" "arm"
+	EXTRA_CONFIG += \
+		--host=$(BUILDTARGET) \
+		--build=$(BUILDTARGET) \
+		--target=$(BUILDTARGET) \
+		--with-abi=aapcs-linux \
+		--with-float=soft
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -73,7 +89,11 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1
+ifeq "$(MACHINE)" "arm"
+	$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
+else
+	$(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1
+endif
 
 install : $(TARGET)
 
@@ -104,24 +124,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(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_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