Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: Makefile.standalone

Issue 1224173006: Adds the x86-64 assembler. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Addresses comments; make format Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/IceAssemblerX8664.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index c39b926194ce44754bf00b81434619e2562a4085..746d216208d0b2a44bd29ab67c931e4cf2ddba99 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -168,7 +168,6 @@ SB_LDFLAGS := $(LINKOPTLEVEL) $(LD_EXTRA)
SRCS = \
IceAssembler.cpp \
- IceAssemblerX8664.cpp \
IceBrowserCompileServer.cpp \
IceCfg.cpp \
IceCfgNode.cpp \
@@ -212,9 +211,24 @@ SB_OBJS=$(patsubst %.cpp, $(SB_OBJDIR)/%.o, $(SRCS))
UNITTEST_SRCS = \
BitcodeMunge.cpp \
- IceAssemblerX8632Test.cpp \
IceELFSectionTest.cpp \
- IceParseInstsTest.cpp
+ IceParseInstsTest.cpp \
+ AssemblerX8632/LowLevel.cpp \
+ AssemblerX8632/DataMov.cpp \
+ AssemblerX8632/Locked.cpp \
+ AssemblerX8632/GPRArith.cpp \
+ AssemblerX8632/XmmArith.cpp \
+ AssemblerX8632/ControlFlow.cpp \
+ AssemblerX8632/Other.cpp \
+ AssemblerX8632/X87.cpp \
+ AssemblerX8664/LowLevel.cpp \
+ AssemblerX8664/DataMov.cpp \
+ AssemblerX8664/Locked.cpp \
+ AssemblerX8664/GPRArith.cpp \
+ AssemblerX8664/XmmArith.cpp \
+ AssemblerX8664/ControlFlow.cpp \
+ AssemblerX8664/Other.cpp
+
UNITTEST_OBJS = $(patsubst %.cpp, $(OBJDIR)/unittest/%.o, $(UNITTEST_SRCS))
UNITTEST_LIB_OBJS = $(filter-out $(OBJDIR)/main.o,$(OBJS))
@@ -271,6 +285,7 @@ $(UNITTEST_OBJS): $(OBJDIR)/unittest/%.o: unittest/%.cpp \
unittest/*.h src/*.h src/*.def
$(CXX) -c $(CXXFLAGS) \
-Isrc/ \
+ -Iunittest/ \
-I$(LLVM_SRC_PATH)/utils/unittest/googletest/include \
-I$(LLVM_SRC_PATH) \
-DGTEST_HAS_RTTI=0 -DGTEST_USE_OWN_TR1_TUPLE \
@@ -279,7 +294,7 @@ $(UNITTEST_OBJS): $(OBJDIR)/unittest/%.o: unittest/%.cpp \
$(OBJS): | $(OBJDIR)
$(SB_OBJS): | $(SB_OBJDIR)
-$(UNITTEST_OBJS): | $(OBJDIR)/unittest
+$(UNITTEST_OBJS): | $(OBJDIR)/unittest $(OBJDIR)/unittest/AssemblerX8632 $(OBJDIR)/unittest/AssemblerX8664
$(OBJDIR):
@mkdir -p $@
@@ -289,6 +304,11 @@ $(SB_OBJDIR):
$(OBJDIR)/unittest: $(OBJDIR)
@mkdir -p $@
+$(OBJDIR)/unittest/AssemblerX8632: $(OBJDIR)/unittest
+ @mkdir -p $@
+$(OBJDIR)/unittest/AssemblerX8664: $(OBJDIR)/unittest
+ @mkdir -p $@
+
RT_SRC := runtime/szrt.c runtime/szrt_ll.ll runtime/szrt_profiler.c
RT_OBJ := build/runtime/szrt_native_x8632.o build/runtime/szrt_sb_x8632.o \
build/runtime/szrt_native_arm32.o build/runtime/szrt_sb_arm32.o
« no previous file with comments | « no previous file | src/IceAssemblerX8664.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698