X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=67b8655e49e7e516970f01af87802bfcc0dc7308;hb=c8f04834582049dce7f80507a1b2b6c6210d5c3f;hp=c93b9a28bc319ec97dc69bc566dcb8481acdba4f;hpb=769cf53f52755d6b8c976edb561e3c21700447aa;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index c93b9a2..67b8655 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -61,19 +61,18 @@ endif
 ifneq ($(shell uname),$(platform))
 configure_gcc-3.3                       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 endif
-configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
+configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi --without-libffi
 configure_gcc-3.3                       += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
 configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
 ifneq ($(platform),Darwin)
 configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as
 endif
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-libgcj
-configure_gcc-3.3                       += --disable-shared --enable-static
+configure_gcc-3.3                       += --disable-shared --enable-static --disable-jni
 configure_binutils-2.13.2.1             += --disable-shared --enable-static
 configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
 configure_gcc-3.3_i686-pc-mingw32       += --enable-threads=win32 --enable-hash-synchronization
-configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --disable-hash-synchronization
-#configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --enable-hash-synchronization
+configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --enable-hash-synchronization
 configure_gcc-3.3_sparc-sun-solaris2.7  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
 
 configure_WindowMaker-0.80.2_$(target)  += --prefix=$(shell pwd)/upstream/install/$(target)