Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 54140 invoked from network); 22 Jun 2010 20:46:45 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Jun 2010 20:46:45 -0000 Received: (qmail 27179 invoked by uid 500); 22 Jun 2010 20:46:45 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 27159 invoked by uid 500); 22 Jun 2010 20:46:44 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 27152 invoked by uid 99); 22 Jun 2010 20:46:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jun 2010 20:46:44 +0000 X-ASF-Spam-Status: No, hits=-1818.3 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jun 2010 20:46:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 367A52388980; Tue, 22 Jun 2010 20:45:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 22 Jun 2010 20:45:56 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100622204556.367A52388980@eris.apache.org> 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 $@ $<