X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=da19b957e915b40d28058c9bad6dec29aa20fc3a;hb=1ef940dbcce338b0a8a0fb56ac2c9e5c7405a352;hp=f50bd06684753d6d26c3725aa65c6c5a572709ef;hpb=904576609f86da57ecc4ef20718728ed031bc5ff;p=attic%2Ftoolchain-noeabi.git

diff --git a/Makefile b/Makefile
index f50bd06..da19b95 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
@@ -148,9 +148,8 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
 		AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
 		$(WORK)/gcc-$(GCC_VERSION)/configure --prefix=$(CROSSTOOLS) \
 		--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-multilib --with-sysroot=$(CLFS) --disable-nls \
+		--without-headers --with-newlib --disable-decimal-float \
 		--disable-libgomp --disable-libmudflap --disable-libssp \
 		--with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) \
 		--disable-shared --disable-threads --enable-languages=c && \
@@ -172,8 +171,8 @@ $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2:
 
 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2:
 	wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-ports-$(GLIBC_VERSION).tar.bz2
-$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2
 
+$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2
 	tar -C $(WORK) -xvjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2
 	cd $(WORK)/glibc-$(GLIBC_VERSION) && \
 		tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \
@@ -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) \
@@ -243,28 +242,18 @@ gcc-final-distclean: gcc-final-clean
 
 
 # TEST THE TOOLCHAIN
-$(WORK)/build-test:
-	mkdir -p $(WORK)/build-test
-	touch $(WORK)/build-test
-
-$(WORK)/build-test/hello.c: $(WORK)/build-test
-	echo '#include <stdio.h>' > $(WORK)/build-test/hello.c
-	echo 'int main(int argc,char ** argv){printf("Hello World!\n");return 0;}' >> $(WORK)/build-test/hello.c
-	touch $(WORK)/build-test/hello.c
-
-$(WORK)/build-test/hello: $(WORK)/build-test/hello.c
-	cd $(WORK)/build-test && \
-		export PATH=$$PATH:$(CROSSTOOLS)/bin && \
-		unset CFLAGS && unset CXXFLAGS && unset CC && \
-		AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
-		$(TARGET)-gcc -Wall -o hello hello.c
-	[ "$$(file -b $(WORK)/build-test/hello | cut -d',' -f2 | sed 's| ||g' )" == "ARM"  ] || exit 1
-	touch $(WORK)/build-test/hello
+$(WORK)/test: $(WORK)/test.c
+	export PATH=$$PATH:$(CROSSTOOLS)/bin && \
+	unset CFLAGS && unset CXXFLAGS && unset CC && \
+	AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
+	$(TARGET)-gcc -Wall -o $(WORK)/test $(WORK)/test.c
+	[ "`file -b $(WORK)/test | cut -d',' -f2 | sed 's| ||g'`" = "ARM"  ] || exit 1
+	touch $(WORK)/test
 
-test: gcc-final $(WORK)/build-test/hello
+test: gcc-final $(WORK)/test
 
 test-clean:
-	rm -vrf $(WORK)/build-test
+	rm -vrf $(WORK)/test
 
 test-distclean: test-clean