X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=d71f8bed0d9f4b081e6bab7c313a6bc2b99f540c;hp=26f505a083ada439415b8a9225055ca736390513;hb=abea89178afd57a491ea65898aef9b0befd05fbe;hpb=6f6a7fea7232c364a46839b5a189bcc53a8b2865

diff --git a/Makefile.upstream b/Makefile.upstream
index 26f505a..d71f8be 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -5,6 +5,7 @@
 
 # deal with Apple's brokenness
 setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))"
+setcc += PATH=`pwd`/upstream/install/bin:$$PATH
 
 # where to get stuff
 url_newlib-1.11.0      := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz
@@ -16,29 +17,64 @@ url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz
 
+.install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
+	cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz
+	cd upstream/darwin-linker/src/cctools; for A in ../../patches/*.patch; do patch -p0 < $$A; done
+	cp upstream/darwin-linker/src/cctools/ld/fake-mach.c upstream/darwin-linker/src/cctools/libstuff
+	cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; ../../links.sh
+	make -C upstream/darwin-linker/src/cctools/libstuff
+	make -C upstream/darwin-linker/src/cctools/misc
+	touch upstream/darwin-linker/src/cctools/misc/makeUser.c upstream/darwin-linker/src/cctools/misc/make.h
+	make -C upstream/darwin-linker/src/cctools/misc libtool.NEW
+	make -C upstream/darwin-linker/src/cctools/ld; true
+	make -C upstream/darwin-linker/src/cctools/as
+	make -C upstream/darwin-linker/src/cctools/ar
+	mkdir -p upstream/install/powerpc-apple-darwin/bin
+	cp upstream/darwin-linker/src/cctools/ld/ld_dir/ld.NEW upstream/install/powerpc-apple-darwin/bin/ld.NEW
+	echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ld.NEW -dylib_file /usr/lib/system/libmathCommon.A.dylib:"`pwd`"/upstream/install/powerpc-apple-darwin/lib/libmathCommon.A.dylib -L"`pwd`"/upstream/install/powerpc-apple-darwin/lib \$$@\n" > upstream/install/powerpc-apple-darwin/bin/ld
+	chmod +x upstream/install/powerpc-apple-darwin/bin/ld
+	echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/apple-libtool \$$1 -o \$$1\n" > upstream/install/powerpc-apple-darwin/bin/ranlib
+	chmod +x upstream/install/powerpc-apple-darwin/bin/ranlib
+	cp upstream/darwin-linker/src/cctools/misc/libtool.NEW upstream/install/powerpc-apple-darwin/bin/apple-libtool
+	cp upstream/darwin-linker/src/cctools/misc/strip.NEW upstream/install/powerpc-apple-darwin/bin/strip
+	cp upstream/darwin-linker/src/cctools/as/appc_dir/as upstream/install/powerpc-apple-darwin/bin/as
+	cp upstream/darwin-linker/src/cctools/ar/ar.NEW upstream/install/powerpc-apple-darwin/bin/ar
+	mkdir -p upstream/install/bin
+	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ld powerpc-apple-darwin-ld
+	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/as powerpc-apple-darwin-as
+	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ar powerpc-apple-darwin-ar
+	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ranlib powerpc-apple-darwin-ranlib
+	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/strip powerpc-apple-darwin-strip
+	echo -e "#!/bin/sh\nc++filt \$$@\n" > upstream/install/bin/c++filt3; chmod +x upstream/install/bin/c++filt3
+	touch $@
+
 # building gcc requires binutils
-configure_gcc-3.3: binutils-2.13.2.1 .configure_gcc-3.3
+.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)
 
 # how to configure it
 configure_gcc-3.3                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static
 configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as --enable-libgcj
-configure_gcc-3.3-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization
+configure_gcc-3.3-powerpc-apple-darwin  := --enable-threads=posix --disable-hash-synchronization --disable-multilib
+configure_gcc-3.3-powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/powerpc-apple-darwin/include
 configure_gcc-3.3-i686-pc-mingw32       := --enable-threads=win32 --enable-hash-synchronization
 configure_gcc-3.3-i686-pc-linux-gnu     := --enable-threads=posix --enable-hash-synchronization
 configure_gcc-3.3-sparc-sun-solaris2.7  := --enable-threads=posix --disable-multilib
 configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads
 
+.PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
+
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
-vendor: .vendor
+vendor: .vendor; @true
 .vendor:
 	@echo -e "\n\033[1mdownloading vendor-supplied headers and libraries...\033[0m"
+	mkdir -p upstream/install
 	curl http://www.megacz.com/vendor.tgz | tar xzf - -C upstream/install
+	mkdir -p upstream/install/i686-pc-mingw32
 	curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
 	curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
 	touch .vendor
 
-download_%: .download_%
 .download_%:
 	@echo -e "\n\033[1mdownloading $*...\033[0m"
 	mkdir -p upstream/$*
@@ -47,27 +83,25 @@ download_%: .download_%
 	(test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 < $$A; done); true
 	touch $@
 
-configure_%: .configure_%
-.configure_%: download_% 
+.configure_%_$(target): .download_% 
 	@echo -e "\n\033[1mconfiguring $*...\033[0m"
-	mkdir -p $*/build-$(target)
-	cd -p $*/build-$(target); \
+	mkdir -p upstream/$*/build-$(target)
+	cd upstream/$*/build-$(target); \
 		$(setcc) ../src/configure \
 		--target=$(target) \
 		--prefix=`pwd`/../../install \
 		$(configure_$*) \
-		$(configure_$*)-$(target)
+		$(configure_$*-$(target))
 	touch $@
 
-install_%: .install_%
-.install_%: configure_%
+.install_%_$(target): .configure_%_$(target)
 	@echo -e "\n\033[1mbuilding $*...\033[0m"
 	cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make
 	@echo -e "\n\033[1minstalling $*...\033[0m"
 	cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install
 	touch $@
 
-.install_freetype-2.1.4: download_freetype-2.1.4 install_binutils-2.13.2.1 install_gcc-3.3
+.install_freetype-2.1.4_$(target): .download_freetype-2.1.4_$(target) .install_binutils-2.13.2.1_$(target) .install_gcc-3.3_$(target)
 	@echo -e "\n\033[1mbuilding freetype $*...\033[0m"
 	cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../install/bin make CC=mips-gcc AR=mips-ar
 	../install/bin/mips-ranlib freetype-2.1.4/objs/libfreetype.a
@@ -90,4 +124,6 @@ install_%: .install_%
 	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
 	chmod +x .jikes