X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=430c2e027ba30358350dc6ff74768ac725c83480;hp=d5256694ebe5d794a6cb1285ff68cbfbd5b1f25e;hb=5f9b5f0992c13f83ed4204f8f49335501f21fb14;hpb=3eb15f58ca0911489d7d9bdc0ac2c575d27a68d8

diff --git a/upstream/Makefile b/upstream/Makefile
index d525669..430c2e0 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -14,7 +14,7 @@ configure_binutils = --target=mips-unknown-elf
 
 version_newlib = 1.11.0
 url_newlib = http://mirrors.rcn.net/pub/sourceware/newlib/newlib-$(version_newlib).tar.gz
-patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch
+patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-vasprintf.patch
 configure_newlib = --enable-multilib --target=mips-unknown-elf
 
 url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz
@@ -27,24 +27,38 @@ url_bcel = http://mirrors.mix5.com/apache/jakarta/bcel/binaries/bcel-$(version_b
 
 upstream = $(shell pwd)
 root = $(shell dirname "`pwd`")
-prefix = $(upstream)/install
+usr = $(upstream)/install
 
-PATH := $(prefix)/bin:$(PATH)
+PATH := $(usr)/bin:$(PATH)
 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
+
+	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
 tasks/build_newlib: tasks/build_gcc
 
 tasks/build_libc: tasks/build_newlib tasks/build_regex tasks/build_openbsdglob
-	rm -f install/mips-unknown-elf/lib/crt0.o
-	ln -s $(root)/build/org/xwt/mips/crt0.o install/mips-unknown-elf/lib/crt0.o 
-	echo '#include <unistd.h>' > install/mips-unknown-elf/include/getopt.h
 	touch $@
 
 clean_%:
@@ -82,44 +96,43 @@ tasks/patch_%: tasks/extract_%
 	touch $@
 
 tasks/build_%: tasks/patch_%
-	mkdir -p install
-	@[ "$*" = "newlib" ] && rm -f install/mips-unknown-elf/lib/crt0.o || true
+	mkdir -p $(usr)
 	mkdir -p build/$*-obj && cd build/$*-obj && \
-		../$*-$(version_$*)/configure --prefix=$(prefix) $(configure_$*) && \
+		../$*-$(version_$*)/configure --prefix=$(usr) $(configure_$*) && \
 		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
 		$(MAKE) install
 	touch $@
 
 tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
-	mkdir -p install
+	mkdir -p $(usr)
 	mkdir -p build/gcc-obj && cd build/gcc-obj && \
-		../gcc-$(version_gcc)/configure --prefix=$(prefix) $(configure_gcc_step2) && \
+		../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
 		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
 		$(MAKE) install
 	touch $@
 
 tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib
-	@mkdir -p install/mips-unknown-elf/{include,lib}
+	@mkdir -p $(usr)/mips-unknown-elf/{include,lib}
 	cd build && gzip -dc ../download/openbsdglob.tar.gz | tar xf -
 	cd build/openbsdglob && \
 		mips-unknown-elf-gcc '-Dissetugid()=0' -DARG_MAX=65536 $(MIPS_CFLAGS) -I. -c -o glob.o glob.c && \
 		mips-unknown-elf-gcc -O2 -Wall -Werror -I. -c -o fnmatch.o fnmatch.c && \
 		mips-unknown-elf-ar cr libglob.a *.o && \
 		mips-unknown-elf-ranlib libglob.a && \
-		cp *.h ../../install/mips-unknown-elf/include && \
-		cp *.a ../../install/mips-unknown-elf/lib
+		cp *.h $(usr)/mips-unknown-elf/include && \
+		cp *.a $(usr)/mips-unknown-elf/lib
 	touch $@
 
 tasks/build_regex: tasks/download_regex tasks/build_newlib
-	@mkdir -p install/mips-unknown-elf/{include,lib}
+	@mkdir -p $(usr)/mips-unknown-elf/{include,lib}
 	mkdir -p build/regex build/regex/fake
 	cd build/regex && \
 		sh ../../download/regex.shar && \
 		make CC=mips-unknown-elf-gcc CFLAGS="-I. $(MIPS_CFLAGS)" regcomp.o regexec.o regerror.o regfree.o && \
 		mips-unknown-elf-ar cr libregex.a regcomp.o regexec.o regerror.o regfree.o && \
 		mips-unknown-elf-ranlib libregex.a && \
-		cp regex.h ../../install/mips-unknown-elf/include && \
-		cp libregex.a ../../install/mips-unknown-elf/lib 
+		cp regex.h $(usr)/mips-unknown-elf/include && \
+		cp libregex.a $(usr)/mips-unknown-elf/lib 
 	touch $@
 
 
@@ -150,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 && \
@@ -223,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 $@