You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/22 22:45:56 UTC
svn commit: r957025 - in
/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino:
shared/x86/ shared/x86_or_x86_64/ unix/makefile
Author: hindessm
Date: Tue Jun 22 20:45:55 2010
New Revision: 957025
URL: http://svn.apache.org/viewvc?rev=957025&view=rev
Log:
Use HY_ARCH_FAMILY in drlvm jitrino makefile.
Added:
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/
- copied from r957014, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/
Removed:
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/
Modified:
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile?rev=957025&r1=957024&r2=957025&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile Tue Jun 22 20:45:55 2010
@@ -33,16 +33,10 @@ endif
OPT += -fexceptions
CXXFLAGS += -Wno-deprecated -fmessage-length=0 -Wall -Werror -Wno-uninitialized
-ifeq ($(HY_ARCH),ia64)
-JIT_ARCH := ia64
-else
-JIT_ARCH := x86_or_x86_64
-endif
-
INCLUDES := -I$(VM_HOME)include -I$(VM_HOME)vmcore/include \
-I$(VM_HOME)port/include \
-I$(SHAREDSUB)main -I$(SHAREDSUB)shared -I$(SHAREDSUB)vm \
- -I$(SHAREDSUB)codegenerator -I$(SHAREDSUB)$(JIT_ARCH)/codegenerator \
+ -I$(SHAREDSUB)codegenerator -I$(SHAREDSUB)$(HY_ARCH_FAMILY)/codegenerator \
-I$(SHAREDSUB)optimizer -I$(SHAREDSUB)dynopt \
-I$(SHAREDSUB)translator -I$(SHAREDSUB)translator/java \
$(INCLUDES)
@@ -122,6 +116,6 @@ MDLLIBFILES += $(LIBPATH)libapr-1.a $(LI
include $(HY_HDK)/build/make/rules.mk
-$(HY_BIN)%.o: $(SHAREDSUB)$(JIT_ARCH)/%.cpp
+$(HY_BIN)%.o: $(SHAREDSUB)$(HY_ARCH_FAMILY)/%.cpp
@mkdir -p $(@D)
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<