X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=7f1d74af494cd1345d0cb91480619dc3dd34f85b;hp=a67c9e52d00081bc23e247555aece6dd40b62220;hb=71a2f5a6107cc7d5d63b6ddd0f01dc0341c18af3;hpb=8e190fb0ff508ccf4962bbfbf8295a431805c12b diff --git a/Makefile b/Makefile index a67c9e5..7f1d74a 100644 --- a/Makefile +++ b/Makefile @@ -18,12 +18,12 @@ target := $(target_$(platform)) all: Java2 Linux Win32 Darwin Solaris -clean: ; rm -rf build; rm .preprocessor +clean: ; rm -rf build; rm build/class/org/ibex/util/Preprocessor.class dist-clean: rm -rf .configure* .install* build .compile .build* find upstream -name config.cache -exec rm {} \; - test -e upstream/nestedvm && make -C upstream/nestedvm clean - rm .install_nestedvm + test -e upstream/org.ibex.nestedvm && make -C upstream/org.ibex.nestedvm clean + rm .install_org.ibex.nestedvm libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/ libwing_Linux += upstream/install/i686-pc-linux-gnu/lib/libWINGs.a @@ -33,12 +33,12 @@ libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/ libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libwraster.a -Java2: build/Java2/ibex.jar -JVM:; make Java2 -Linux: ; make gcj platform=Linux link_flags="$(libwing_Linux) -lXpm -lX11 -lXext" -Solaris: ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread" -Win32: ; make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32" -Darwin: ; make gcj platform=Darwin link_flags="$(darwin_linker_flags)" +Java2: build/Java2/ibex.jar +JVM:; @make Java2 +Linux: ; @make gcj platform=Linux link_flags="$(libwing_Linux) -lXpm -lX11 -lXext" +Solaris: ; @make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread" +Win32: ; @make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32" +Darwin: ; @make gcj platform=Darwin link_flags="$(darwin_linker_flags)" darwin_libdir := upstream/install/powerpc-apple-darwin/lib darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib @@ -48,16 +48,12 @@ darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU -# stupid broke-ass darwin linker... -darwin_linker_flags += build/Darwin/org/ibex/plat/OpenGL.java.o build/Darwin/org/ibex/plat/POSIX.java.o - target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z) target_bin_extension_Win32 := exe target_bin_extension_Java2 := jar target_bin_extension := $(target_bin_extension_$(platform)) target_bin := ibex.$(target_bin_extension) -javac := javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar:build/class -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src gcc_optimizations := -Os #gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls #gcc_optimizations += -finline-functions -funroll-loops -ffunction-sections -fdata-sections @@ -70,10 +66,16 @@ gcj += -foptimize-static-class-initialization -feliminate-dwarf2- gcjh := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh g++ := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar gcc := upstream/install/bin/$(target)-gcc $(gcc_flags) +nm := upstream/install/$(target)/bin/nm jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar) +ifeq ($(platform),Java2) +javac := javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar -d build/class/ -sourcepath build/java/ +else +javac := $(gcj) -fCLASSPATH=upstream/bcel-5.1/src/bcel-5.1.jar -d build/class/ -Ibuild/java -Iupstream/gnu.regexp-1.1.4/src/src -C +endif gcj: .install_gcc-3.3_$(target) - make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform) + @make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform) include Makefile.upstream @@ -84,15 +86,16 @@ include Makefile.upstream # @grep -s extends src/$(subst .,/,$*).java | sed s_.\*extends\ __ | head -n 1 | sed s_\ .\*__ |\ # xargs --replace make -s superclass_org.ibex.plat.{} -plat_classes_AWT := org.ibex.plat.AWT -plat_classes_Java2 := org.ibex.plat.Java2 org.ibex.plat.JVM $(plat_classes_AWT) -plat_classes_GCJ := org.ibex.plat.GCJ -plat_classes_Win32 := org.ibex.plat.Win32 $(plat_classes_GCJ) -plat_classes_POSIX := org.ibex.plat.POSIX $(plat_classes_GCJ) -plat_classes_X11 := org.ibex.plat.X11 $(plat_classes_POSIX) -plat_classes_Linux := org.ibex.plat.Linux $(plat_classes_X11) -plat_classes_Solaris := org.ibex.plat.Solaris $(plat_classes_X11) -plat_classes_Darwin := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes_POSIX) +plat_classes_Platform := org.ibex.plat.Platform +plat_classes_AWT := org.ibex.plat.AWT $(plat_classes_Platform) +plat_classes_Java2 := org.ibex.plat.Java2 org.ibex.plat.JVM $(plat_classes_AWT) +plat_classes_GCJ := org.ibex.plat.GCJ $(plat_classes_Platform) +plat_classes_Win32 := org.ibex.plat.Win32 $(plat_classes_GCJ) +plat_classes_POSIX := org.ibex.plat.POSIX $(plat_classes_GCJ) +plat_classes_X11 := org.ibex.plat.X11 $(plat_classes_POSIX) +plat_classes_Linux := org.ibex.plat.Linux $(plat_classes_X11) +plat_classes_Solaris := org.ibex.plat.Solaris $(plat_classes_X11) +plat_classes_Darwin := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes_POSIX) plat_java_src_sources := $(patsubst %,build/java/%.java,$(subst .,/,$(plat_classes_$(platform)))) java_src_sources := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v /plat/) @@ -104,76 +107,105 @@ java_sources += build/java/org/xwt/mips/util/SeekableByteArray.java java_sources += build/java/org/xwt/mips/util/SeekableData.java java_sources += build/java/org/xwt/mips/util/SeekableFile.java java_sources += build/java/org/xwt/mips/util/SeekableInputStream.java -java_sources += build/java/org/xwt/mips/ClassFileCompiler.java -java_sources += build/java/org/xwt/mips/ELF.java java_sources += build/java/org/xwt/mips/Registers.java java_sources += build/java/org/xwt/mips/Runtime.java -java_sources += build/java/org/xwt/mips/UnixRuntime.java java_sources += build/java/org/xwt/mips/UsermodeConstants.java +java_sources += build/java/org/ibex/crypto/DER.java +java_sources += build/java/org/ibex/crypto/Digest.java +java_sources += build/java/org/ibex/crypto/HMAC.java +java_sources += build/java/org/ibex/crypto/MD2.java +java_sources += build/java/org/ibex/crypto/MD5.java +java_sources += build/java/org/ibex/crypto/PKCS1.java +java_sources += build/java/org/ibex/crypto/RC4.java +java_sources += build/java/org/ibex/crypto/RSA.java +java_sources += build/java/org/ibex/crypto/SHA1.java +java_sources += build/java/org/ibex/crypto/X509.java +java_sources += build/java/org/ibex/crypto/Base64.java +java_sources += build/java/org/ibex/net/ssl/RootCerts.java +java_sources += build/java/org/ibex/net/SSL.java + +java_sources += build/java/gnu/regexp/CharIndexed.java +java_sources += build/java/gnu/regexp/CharIndexedCharArray.java +java_sources += build/java/gnu/regexp/CharIndexedInputStream.java +java_sources += build/java/gnu/regexp/CharIndexedString.java +java_sources += build/java/gnu/regexp/CharIndexedStringBuffer.java +java_sources += build/java/gnu/regexp/RE.java +java_sources += build/java/gnu/regexp/REException.java +java_sources += build/java/gnu/regexp/REFilterInputStream.java +java_sources += build/java/gnu/regexp/REMatch.java +java_sources += build/java/gnu/regexp/REMatchEnumeration.java +java_sources += build/java/gnu/regexp/RESyntax.java +java_sources += build/java/gnu/regexp/REToken.java +java_sources += build/java/gnu/regexp/RETokenAny.java +java_sources += build/java/gnu/regexp/RETokenBackRef.java +java_sources += build/java/gnu/regexp/RETokenChar.java +java_sources += build/java/gnu/regexp/RETokenEnd.java +java_sources += build/java/gnu/regexp/RETokenEndSub.java +java_sources += build/java/gnu/regexp/RETokenLookAhead.java +java_sources += build/java/gnu/regexp/RETokenWordBoundary.java +java_sources += build/java/gnu/regexp/RETokenOneOf.java +java_sources += build/java/gnu/regexp/RETokenPOSIX.java +java_sources += build/java/gnu/regexp/RETokenRange.java +java_sources += build/java/gnu/regexp/RETokenRepeated.java +java_sources += build/java/gnu/regexp/RETokenStart.java +java_sources += build/java/gnu/regexp/UncheckedRE.java +java_sources += build/java/gnu/regexp/CharIndexedReader.java +java_sources += build/java/gnu/regexp/REFilterReader.java + java_classes := $(java_sources:build/java/%.java=build/class/%.class) java_classes += build/class/gnu/regexp/CharUnit.class build/class/gnu/regexp/IntPair.class -### Java Source Files ############################################################################## - -build/java/gnu/regexp: .download_gnu.regexp-1.1.4 - mkdir -p $(@D); cd $(@D); ln -sf ../../../upstream/gnu.regexp-1.1.4/src/src/gnu/regexp -build/java/org/xwt/mips: .download_nestedvm - mkdir -p $(@D); cd $(@D); ln -sf ../../../../upstream/nestedvm/src/org/xwt/mips -build/java/org/ibex/crypto: .download_org.ibex.crypto - mkdir -p $(@D); cd $(@D); ln -sf ../../../../upstream/org.ibex.crypto/src/org/ibex/crypto - mkdir -p build/java/org/ibex/net; - cd build/java/org/ibex/net; ln -sf ../../../../../upstream/org.ibex.crypto/src/org/ibex/net/SSL.java - cd build/java/org/ibex/net; ln -sf ../../../../../upstream/org.ibex.crypto/src/org/ibex/net/ssl +.PRECIOUS: $(java_classes) $(java_sources) *.java -ifeq ($(platform),Java2) -.preprocessor: build/java/gnu/regexp src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/org/xwt/mips build/java/org/ibex/crypto +### Java Source Files ############################################################################## - @mkdir -p build/class/org/ibex/util build/class/gnu/regexp - $(javac) src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/gnu/regexp/*.java -d build/class - @touch $@ -else -.preprocessor: build/java/gnu/regexp src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/org/xwt/mips build/java/org/ibex/crypto - @mkdir -p build/class/org/ibex/util build/class/gnu/regexp - $(gcj) -Isrc -C src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/gnu/regexp/*.java -d build/class - @touch $@ -endif build/cc/%.cc: src/%.c ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@ build/res/%: src/% ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@ -build/java/org/ibex/%.java: src/org/ibex/%.java .preprocessor - @echo -e "\n\033[1mpreprocessing .java -> .java: $<\033[0m" - mkdir -p `dirname $@`; java -cp build/class:build/java org.ibex.util.Preprocessor < $^ > $@ -build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@ +build/java/org/ibex/%.java: src/org/ibex/%.java build/class/org/ibex/util/Preprocessor.class + @echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m" + @mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@ + +upstream/org.ibex.crypto/%.java:; @make .download_org.ibex.crypto +upstream/org.ibex.nestedvm/%.java:; @make .download_org.ibex.nestedvm +link_upstream = build/java/$(1): $(2)/$(1); +link_upstream += @echo -e "\033[1mlinking .java -> .java: $$@\033[0m"; +link_upstream += mkdir -p $$(@D); +link_upstream += ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@ +$(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm) +$(call link_upstream,org/ibex/crypto/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto) +$(call link_upstream,org/ibex/net/ssl/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto) +$(call link_upstream,org/ibex/net/SSL.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto) +$(call link_upstream,gnu/regexp/%.java,upstream/gnu.regexp-1.1.4/src/src) +$(call link_upstream,%.java,src) +$(call link_upstream,%.cc,src) -### Java Class Files ############################################################################## -build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_nestedvm - mkdir -p build/java/org/ibex/util - @echo -e "\n\033[1mtranslating .mips -> .class: $<\033[0m" - java -cp upstream/nestedvm/build:upstream/nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \ - org.xwt.mips.Compiler org.ibex.translators.MIPSApps $< -outfile $@ -#-o onepage,pagesize=8m +### Java Class Files ############################################################################## compile: .compile -.compile: .download_nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@ - -ifeq ($(platform),Java2) -build/class/%.class: build/java/%.java .preprocessor - @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" - mkdir -p build/class - @$(javac) $< -d build/class -else -build/class/%.class: build/java/%.java - @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" - mkdir -p $(@D) - $(gcj) -I$(bcel_jar) -C -O0 $< -d build/class -endif +.compile: .download_org.ibex.nestedvm .download_bcel-5.1 .download_gnu.regexp-1.1.4 $(java_sources) + @echo -e "\n\033[1mcompiling .java -> .class\033[0m" + @mkdir -p build/java build/class + @mkdir -p build/class/org/ibex/util build/class/gnu/regexp build/java build/class + @test -e build/class/org/ibex/util/Preprocessor.class || \ + $(javac) src/org/ibex/util/Preprocessor.java \ + src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java + @echo $(java_sources) | tr ' ' '\n' | sed 's_build/java/_ _' | sed 's_/_._g' | sed 's_.java$$__g' + @$(javac) $(java_sources) -d build/class + + +build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm + @mkdir -p build/java/org/ibex/util + @echo -e "\n\033[1mtranslating .mips -> .class: $<\033[0m" + java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \ + org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@ build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class @echo -e "\n\033[1marchiving .class -> .jar: build/Java2/ibex.jar\033[0m" mkdir -p build/Java2 - echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/Java2/.manifest + echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest cd build/class/org/ibex; ln -sf ../../../res/builtin.jar cd build/class; $(jar) cfm ../Java2/ibex.jar ../Java2/.manifest `find . -name \*.class -or -name \*.jar` @@ -181,7 +213,6 @@ build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/M ### Headers ################################################################################## java_headers := $(java_sources:build/java/%.java=build/h/%.h) -build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@ build/h/%.h: build/class/%.class .compile @echo -e "\n\033[1mextracting .class -> .h: $<\033[0m" mkdir -p `dirname $@` @@ -215,13 +246,20 @@ build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform). bcel_jar := upstream/bcel-5.1/src/bcel-5.1.jar build/$(platform)/ibex.pruned.jar: .compile $(java_classes) .install_jpeg-6b_$(target) build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o @echo -e "\n\033[1mpruning .jar -> .jar\033[0m" +ifneq ($(platform),Darwin) cp upstream/install/share/java/libgcj-3.3.jar build/$(platform)/ibex.jar cd build/class; jar uf ../$(platform)/ibex.jar $(java_classes:build/class/%.class=%*.class) - (nm $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\ + ($(nm) $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\ grep _ZN | c++filt --format java | grep " U " | sed 's_ * U __' | sed 's_(.*__' \ | java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar | tee nanogoat.log mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; rm gnu/gcj/runtime/FirstThread*; cp ../build/class/org/ibex/plat/GCJ* org/ibex/plat/; cp -r ../build/class/org/xwt/mips/* org/xwt/mips/; mkdir -p $(shell pwd)/build/$(platform)/java/lang; mv java/lang/Class.class $(shell pwd)/build/$(platform)/java/lang; fastjar cvf ../build/$(platform)/ibex.jar.pruned .; cd ..; rm -rf tmp mv build/$(platform)/ibex.jar.pruned $@ +endif +ifeq ($(platform),Darwin) + cd build/class; jar cf ../$(platform)/ibex.pruned.jar \ + org/ibex/plat/Platform*.class \ + $(filter-out org/ibex/util/NanoGoat%,$(java_classes:build/class/%.class=%*.class)) +endif ifeq ($(platform),Win32) filedes := $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileWin32.cc @@ -235,6 +273,7 @@ ifneq ($(target_bin_extension),jar) build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/plat/*.cc build/$(platform)/builtin.o $(java_headers) @echo -e "\n\033[1mlinking .jar -> $(target_bin).phat\033[0m" +ifneq ($(platform),Darwin) # -Os cd build/$(platform); $(shell pwd)/upstream/install/bin/$(target)-gcj \ -fCLASSPATH=$(shell pwd)/upstream/install/share/java/libgcj-3.3.jar \ @@ -243,9 +282,9 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/ -c java/lang/Class.class cd upstream/gcc-3.3/src/libjava/java/lang;\ ln -sf ../../../../build-$(target)/$(target)/libjava/java/lang/natConcreteProcess.cc +endif # we need -fno-store-check since we can't dynamically resolve references to array classes PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \ - -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive \ --main=org.ibex.plat.$(platform) \ -Dfile.encoding=UTF8 \ -DPREFIX=\"\" \ @@ -268,15 +307,23 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/ -Ufile \ build/$(platform)/ibex.pruned.jar \ src/org/ibex/plat/$(platform).cc \ - $(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \ - $(filedes) \ build/$(platform)/builtin.o \ upstream/jpeg-6b/build-$(target)/libjpeg.a \ $(link_flags) \ $(libjava_dir)/../boehm-gc/.libs/libgcjgc.a \ +ifneq ($(platform),Darwin) + $(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \ + $(filedes) \ build/$(platform)/Class.o \ - $(libjava_dir)/gnu/gcj/runtime/FirstThread.o \ - -lz -o $@.phat + $(libjava_dir)/gnu/gcj/runtime/FirstThread.o \ + -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive \ + -lz -o $@.phat \ +else + $(libjava_dir)/.libs/libgcj.a \ + -o $@ \ +endif + +ifneq ($(platform),Darwin) @echo; ls -l $@.phat @echo -e "\n\033[1mstripping $(target_bin).phat -> $(target_bin)\033[0m" @@ -287,6 +334,7 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/ upx-ucl-beta $@ @echo; ls -l $@.phat endif +endif ### Builtin Resources ############################################################################## @@ -310,7 +358,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar echo "};") > .builtin.c $(gcc) -c .builtin.c -o build/$(platform)/builtin.o -build/mips/%.c.o: src/%.c .download_libmspack-20030726 .install_nestedvm +build/mips/%.c.o: src/%.c .download_libmspack-20030726 .install_org.ibex.nestedvm make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf mkdir -p $(@D) @@ -328,8 +376,8 @@ build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/o upstream/install/bin/mips-unknown-elf-gcc \ --static \ -march=mips1 \ - -T upstream/mips/org/xwt/mips/linker.ld \ - -L upstream/mips/build/org/xwt/mips/ \ + -T upstream/nestedvm/src/org/xwt/mips/linker.ld \ + -L upstream/nestedvm/build/org/xwt/mips/ \ -L upstream/freetype-2.1.4/src/objs \ -L upstream/libmspack-20030726/build-mips-unknown-elf/ \ -o $@ \ @@ -358,7 +406,7 @@ dist: compile echo -e "\n\n\n*** DONE ******************************************" propose-patch: - @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/ + @darcs push --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/ @(echo "To: patches@xwt.org";\ SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\ echo "Subject: $$SUB";\ @@ -373,5 +421,3 @@ doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/util/Doc.cla cd $(@D); java -cp ../../build/class org.ibex.util.Doc slides < `basename $*`.xml > `basename $*`.tex cd $(@D); pdflatex `basename $*`.tex open doc/$*.pdf - -