Reverted eabi changes

diff --git a/Makefile b/Makefile
index 9fe0dd945654225af48d6a03a6476e7cdc13ae66..88d423f2f63723562a68f095efbc4b0b61d8cb2c 100644 (file)
--- 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 acd81384ee79b2526a58f89c95e0c30c7d2cb743..0fb2f359dc87def7bfe78cb96a2f54f7d852cc64 100644 (file)
--- 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