[vmkit-commits] [vmkit] r180423 - adjust vmjc flag

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:08:26 2013
New Revision: 180423

URL: http://llvm.org/viewvc/llvm-project?rev=180423&view=rev
Log:
adjust vmjc flag
(cherry picked from commit 1f2164ed9d6aed98ec5983920b7fcdcc50b467f3)

Modified:
    vmkit/trunk/Makefile.rules
    vmkit/trunk/lib/j3/VMCore/Precompiled.cpp

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180423&r1=180422&r2=180423&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:08:26 2013
@@ -35,14 +35,17 @@ endif
 ifeq ($(OPTIMIZED),1)
   LLC_FLAGS+= -O=3 -disable-cfi -disable-fp-elim 
   COMMON_CFLAGS+= -O3 -fno-strict-aliasing -fno-omit-frame-pointer 
+  OPT_MMTK_FLAGS= -std-compile-opts
 else
+  $(error "fix me: what are the good flags?")
   LLC_FLAGS+= -O0
+  OPT_FLAGS+=-inline
   COMMON_CFLAGS+= -O0
+  OPT_MMTK_FLAGS= 
 endif
 
 LLC_FLAGS+=-relocation-model=pic 
 
-OPT_MMTK_FLAGS= -std-compile-opts -strip-debug
 
 INCLUDES+=-I$(PROJ_SRC_CWD) -I$(PROJ_SRC_ROOT)/include -I$(PROJ_SRC_ROOT)/lib/vmkit/MMTk -I$(BUILD_DIR) \
 					-I$(shell $(LLVM_CONFIG) --includedir)
@@ -166,11 +169,12 @@ endif
 ###############################################################################
 ifdef NEED_GC
 LLC_FLAGS+=-load=$(PREPARE_CODE_LIB)
+OPT_FLAGS+=-load=$(PREPARE_CODE_LIB) -StaticGCPass -disable-cfi -disable-fp-elim -disable-opt
 GC_ID=-gc
 
 %$(GC_ID).bc: %.bc
 	$(Echo) "Performing GC pass on '$(notdir $<)'"
-	$(Verb) $(LOPT) $< -load=$(PREPARE_CODE_LIB) -StaticGCPass -disable-cfi -disable-fp-elim -disable-opt -o $@
+	$(Verb) $(LOPT) $< $(OPT_FLAGS) -o $@
 
 endif
 

Modified: vmkit/trunk/lib/j3/VMCore/Precompiled.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Precompiled.cpp?rev=180423&r1=180422&r2=180423&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Precompiled.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Precompiled.cpp Thu Apr 25 12:08:26 2013
@@ -83,6 +83,9 @@ extern "C" void vmjcAddPreCompiledClass(
   cl->classLoader = JCL;
 }
 
+extern "C" void vmjcAddString(const char* str) {
+  UNIMPLEMENTED();
+}
 
 extern "C" void vmjcGetClassArray(JnjvmClassLoader* JCL, ClassArray** ptr,
                                   const UTF8* name) {