make plain old gcc -o foo foo.c work

[nestedvm.git] / upstream / Makefile

diff --git a/upstream/Makefile b/upstream/Makefile
index d525669..5360084 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -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,44 @@ 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)
+       @[ "$*" = "newlib" ] && rm -f $(usr)/mips-unknown-elf/lib/crt0.o || true
        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 $@