X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=f78f3cafff9cbc12d8d05e46ab4b496200cff58b;hp=32a90e2a07ab685c8a158217b378cb664850413c;hb=05ed18319e07e45668a6837356e33723dc61fcfc;hpb=e3813c6d457e973859f55b9f7014abc328bb86f4

diff --git a/upstream/Makefile b/upstream/Makefile
index 32a90e2..f78f3ca 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -44,24 +44,15 @@ export PATH
 # Solaris' patch doesn't work, use gnu patch on solaris
 PATCH = $(shell test `uname` = SunOS && echo gpatch || echo patch)
 
-tasks/full_toolchain: tasks/build_binutils tasks/build_gcc_step2 tasks/build_libc
-	for f in crt0.o support.o support_aux.o; do \
-		rm -f "$(usr)/mips-unknown-elf/lib/$$f"; \
-		ln -s "$(root)/build/org/ibex/nestedvm/$$f" "$(usr)/mips-unknown-elf/lib/$$f"; \
-	done
+tasks/build_gcc: tasks/build_linker
+tasks/build_newlib: tasks/build_gcc
 
-	rm -f "$(usr)/mips-unknown-elf/lib/linker.ld"
-	ln -s "$(root)/src/org/ibex/nestedvm/linker.ld" "$(usr)/mips-unknown-elf/lib/linker.ld"
+cross_root := $(usr)/mips-unknown-elf
+libc_a := $(cross_root)/lib/libc.a
 
-	if [ ! -e "$(usr)/mips-unknown-elf/include/getopt.h" ]; then \
-		echo '#include <unistd.h>' > "$(usr)/mips-unknown-elf/include/getopt.h"; \
-	fi
-	
-	mips-unknown-elf-gcc -dumpspecs \
-		| sed '/startfile:$$/{n;s/crt0%O%s/crt0%O%s support%O%s support_aux%O%s/;};' \
-		| sed '/link_command:$$/{n;s/%{T\*}/%{T*} %{!T:-T linker.ld%s}/;};' \
-		> "$(usr)/lib/gcc-lib/mips-unknown-elf/$(version_gcc)/specs"
-		
+tasks/build_extraheaders: $(upstream)/patches/newlib-extraheaders.sh tasks/build_newlib
+	# Add extra nestedvm specific headers to include
+	cd $(cross_root)/include && sh $<
 	touch $@
 
 tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob
@@ -91,9 +82,6 @@ clean_%:
 gpc := $(usr)/bin/mips-unknown-elf-gpc
 gpc_flags := --big-endian -w -lgpc -lc $(usr)/mips-unknown-elf/lib/support*.o
 gpc_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld
-g77 := $(usr)/bin/mips-unknown-elf-g77
-g77_flags := --big-endian -w -lg2c -lc $(usr)/mips-unknown-elf/lib/support*.o
-g77_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld
 
 # FIXME ugly path hacks evil bad
 nestedvm := java -cp $(usr)/../build/bcel/bcel-5.1.jar:$(usr)/../../build org.ibex.nestedvm.Compiler -outformat class
@@ -122,6 +110,7 @@ tasks/build_tex: build/tex/tex.mips
 tasks/extract_texinputs: tasks/build_tex tasks/download_texinputs
 	cd build/tex; tar xvzf ../../download/texinputs-1.0.tgz
 	touch $@
+
 tasks/extract_linpack: tasks/download_linpack ; touch $@
 tasks/download_linpack:
 	mkdir -p build/linpack
@@ -183,16 +172,16 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	if [ ! -e "$(usr)/mips-unknown-elf/include/getopt.h" ]; then \
 		echo '#include <unistd.h>' > "$(usr)/mips-unknown-elf/include/getopt.h"; \
 	fi
-
+	
 	mips-unknown-elf-gcc -dumpspecs \
 		| sed '/startfile:$$/{n;s/crt0%O%s/crt0%O%s support%O%s support_aux%O%s/;};' \
 		| sed '/link_command:$$/{n;s/%{T\*}/%{T*} %{!T:-T linker.ld%s}/;};' \
 		> "$(usr)/lib/gcc-lib/mips-unknown-elf/$(version_gcc)/specs"
-
+		
 	mkdir -p $(usr)
 	mkdir -p build/gcc-obj && cd build/gcc-obj && \
 		echo | ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
-		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/bin/mips-unknown-elf-gcc && \
+		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/install/bin/mips-unknown-elf-gcc && \
 		$(MAKE) install
 	touch $@