X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=c8cede7ff4bd00fd84c4e257a657cc85fa150715;hp=e8082da0db076e6b1f62d5b81e7e97715997e8b8;hb=583406fcf43b576446e24c20df5a28d7fa879822;hpb=3a9347de699c1d52ae6ffe35c21fa30cea1c8033

diff --git a/upstream/Makefile b/upstream/Makefile
index e8082da..c8cede7 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -36,23 +36,6 @@ export PATH
 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
-
-	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"
-
-	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"
-		
 	touch $@
 
 tasks/build_gcc: tasks/build_binutils
@@ -104,6 +87,23 @@ tasks/build_%: tasks/patch_%
 	touch $@
 
 tasks/build_gcc_step2: tasks/patch_gcc 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
+
+	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"
+
+	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 && \
 		../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
@@ -163,11 +163,10 @@ version_boehmgc = 6.3alpha2
 url_boehmgc = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc$(version_boehmgc).tar.gz
 patches_boehmgc = boehm-gc.patch
 
-version_busybox = 0.60.5
+version_busybox = 1.00-pre9
 url_busybox = http://busybox.net/downloads/busybox-$(version_busybox).tar.gz
 patches_busybox = busybox.patch
 
-
 tasks/extract_libjpeg: tasks/download_libjpeg
 	mkdir -p build
 	cd build && \
@@ -236,5 +235,10 @@ tasks/build_busybox: tasks/patch_busybox tasks/full_toolchain
 	cd build && \
 		rm -f busybox && \
 		ln -s busybox-$(version_busybox) busybox
-	cd build/busybox && $(MAKE) SHELL=/bin/bash LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -g"
+	cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g"
+	touch $@
+
+tasks/build_gcclass:
+	cd build &&  darcs get --verbose http://darcs.brianweb.net/gcclass
+	cd build/gcclass && make
 	touch $@