From a5efa5eefc25c5a58b2d593615c5931638636969 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Thu, 25 Mar 2010 09:23:16 +0100 Subject: [PATCH] Reverted eabi changes --- Makefile | 7 +++---- vars.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9fe0dd9..88d423f 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ $(CLFS)/usr/include/libiberty.h: $(WORK)/build-binutils AR=ar AS=as \ $(WORK)/binutils-$(BINUTILS_VERSION)/configure --prefix=$(CROSSTOOLS) \ --host=$(HOST) --target=$(TARGET) --with-sysroot=$(CLFS) \ - --disable-nls --enable-shared --disable-multilib --nfp && \ + --disable-nls --enable-shared --disable-multilib && \ make configure-host && make && make install || exit 1 cp -va $(WORK)/binutils-$(BINUTILS_VERSION)/include/libiberty.h $(CLFS)/usr/include touch $(CLFS)/usr/include/libiberty.h @@ -150,7 +150,6 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION) --build=$(HOST) --host=$(HOST) --target=$(TARGET) \ --disable-multilib --disable-nls \ --without-headers --enable-__cxa_atexit --enable-symvers=gnu --disable-decimal-float \ - --nfp --without-fp --with-softfloat-support=internal \ --disable-libgomp --disable-libmudflap --disable-libssp \ --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) \ --disable-shared --disable-threads --enable-languages=c && \ @@ -198,7 +197,7 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) $(WORK)/glibc-$(GLIBC_VERSION)/configure --prefix=/usr \ --libexecdir=/usr/lib/glibc --host=$(TARGET) --build=$(HOST) \ --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \ - --with-__thread --with-binutils=$(CROSSTOOLS)/bin --with-fp=no \ + --with-__thread --with-binutils=$(CROSSTOOLS)/bin \ --with-headers=$(CLFS)/usr/include --cache-file=config.cache && \ make && make install || exit 1 touch $(CLFS)/usr/lib/libc.so @@ -224,7 +223,7 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION) AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \ $(WORK)/gcc-$(GCC_VERSION)/configure --prefix=$(CROSSTOOLS) \ --build=$(HOST) --host=$(HOST) --target=$(TARGET) \ - -with-fp=no --with-headers=$(CLFS)/usr/include \ + --with-headers=$(CLFS)/usr/include \ --disable-multilib --with-sysroot=$(CLFS) --disable-nls \ --enable-languages=c,c++ --enable-__cxa_atexit \ --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) \ diff --git a/vars.mk b/vars.mk index acd8138..0fb2f35 100644 --- a/vars.mk +++ b/vars.mk @@ -3,7 +3,7 @@ # HOST = $(shell echo $$MACHTYPE | sed "s/$$(echo $$MACHTYPE | cut -d- -f2)/cross/") -TARGET = arm-crux-linux-gnueabi +TARGET = arm-crux-linux-gnu PWD = $(shell pwd) CLFS = $(PWD)/clfs -- 2.26.2