X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=d9f4d122c9695bc3f6b45cbd779499c3db67f347;hb=d674a01d6f4685821c46df6bb8ccf6f1e34d23fa;hp=342585556e151be843763b60cc197e5775ed65d6;hpb=809f99d7ff5f73c97cf7b65ff946ef557f8339eb;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 3425855..d9f4d12 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -54,16 +54,17 @@ endif
 	cd upstream/install/powerpc-apple-darwin/bin; ln -sf ../../bin/c++filt3
 	touch $@
 
-# building gcc requires binutils
-.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)      
 
 # how to configure it
 ifneq ($(shell uname),$(platform))
 configure_gcc-3.3                       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 endif
 configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
-configure_gcc-3.3                       += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld --with-gnu-ld
-configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as --with-gnu-as
+configure_gcc-3.3                       += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
+configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
+ifneq ($(platform),Darwin)
+configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as
+endif
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
 configure_gcc-3.3                       += --disable-shared --enable-static
 configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
@@ -103,24 +104,39 @@ ifeq ($(shell uname),Linux)
 endif
 	touch .vendor
 
+.download_gcc-3.3_powerpc-apple-darwin:
+	@echo -e "\n\033[1mdownloading $*...\033[0m"
+	mkdir -p upstream/gcc-3.3
+	curl $(url_gcc-3.3) | tar xzf - -C upstream/gcc-3.3
+	mv upstream/gcc-3.3/gcc-3.3 upstream/gcc-3.3/src-darwin; true
+	mv upstream/gcc-3.3/libmspack upstream/gcc-3.3/src-darwin; true
+	(test -e upstream/gcc-3.3/patches && cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
+	(test -e upstream/gcc-3.3/patches-darwin && cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true
+	touch $@
+
 .download_%:
 	@echo -e "\n\033[1mdownloading $*...\033[0m"
 	mkdir -p upstream/$*
 	curl $(url_$*) | tar xzf - -C upstream/$*
-ifeq ($(target),powerpc-apple-darwin)
-	mv upstream/$*/$* upstream/$*/src-darwin; true
-	mv upstream/$*/libmspack upstream/$*/src-darwin; true
-	(test -e upstream/$*/patches && cd upstream/$*/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-	(test -e upstream/$*/patches-darwin && cd upstream/$*/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-endif
-ifneq ($(target),powerpc-apple-darwin)
 	mv upstream/$*/$* upstream/$*/src; true
 	mv upstream/$*/libmspack upstream/$*/src; true
 	(test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-endif
 	touch $@
 
-.configure_%_$(target): .download_% 
+.configure_gcc-3.3_powerpc-apple-darwin: .download_gcc-3.3_powerpc-apple-darwin .install_binutils-2.13.2.1_powerpc-apple-darwin
+	@echo -e "\n\033[1mconfiguring gcc...\033[0m"
+	mkdir -p upstream/gcc-3.3/build-$(target)
+	cd upstream/gcc-3.3/build-$(target); \
+		$(setcc) $(environment_gcc-3.3_$(target)) ../src-darwin/configure \
+		--target=$(target) \
+		--prefix=`cd ../..; pwd`/install \
+		$(configure_gcc-3.3) \
+		$(configure_gcc-3.3_$(target))
+	touch $@
+
+.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)
+
+.configure_%_$(target): .vendor .download_%
 	@echo -e "\n\033[1mconfiguring $*...\033[0m"
 	mkdir -p upstream/$*/build-$(target)
 	cd upstream/$*/build-$(target); \
@@ -136,18 +152,14 @@ endif
 	cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
 	touch $@
 
+.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@
+.install_gcc-3.3_mips-unknown-elf:           .install_mips2java; touch $@
 .install_mips2java:
 	mkdir -p upstream/install
 	echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass
 	cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips
-	cd upstream/mips/upstream; ln -s `cd ../..; pwd`/install
-	make -C upstream/mips
-	touch $@
-
-.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java
-	touch $@
-
-.install_gcc-3.3_mips-unknown-elf: .install_mips2java
+	cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
+	(cd upstream/mips; make)
 	touch $@
 
 .install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4
@@ -182,8 +194,7 @@ endif
 .jikes:
 	@echo -e "\n\033[1mdetecting your jikes installation...\033[0m"
 	echo "#!/bin/sh" > .jikes
-	#echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
-	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
+	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class:upstream/mips/build $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
 	(type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target=
 	echo -n "$(jikes_flags) -bootclasspath " >> .jikes
 	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
@@ -192,8 +203,6 @@ endif
 	java -cp . GetBootClassPath >> .jikes
 	rm GetBootClassPath.*
 	echo 'EXIT=$$?' >> .jikes
-	#echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
-	#echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
 	echo 'exit $$EXIT' >> .jikes
 	mv .jikes .jikes+
 	cp .jikes+ .jikes