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

Side by Side Diff: Makefile.standalone

Issue 1424923005: Add workaround to allow testing of ARM integrated assembler. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Remove unnecessary addition of ARM32 local (assembler) label. Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | src/IceAssemblerARM32.h » ('j') | src/IceInstARM32.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # The following variables will likely need to be modified, depending on where 1 # The following variables will likely need to be modified, depending on where
2 # and how you built LLVM & Clang. They can be overridden in a command-line 2 # and how you built LLVM & Clang. They can be overridden in a command-line
3 # invocation of make, like: 3 # invocation of make, like:
4 # 4 #
5 # make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \ 5 # make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
6 # PNACL_BIN_PATH=<path> ... 6 # PNACL_BIN_PATH=<path> ...
7 # 7 #
8 8
9 # LLVM_SRC_PATH is the path to the root of the checked out source code. This 9 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
10 # directory should contain the configure script, the include/ and lib/ 10 # directory should contain the configure script, the include/ and lib/
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 OBJDIR := $(OBJDIR)+Min 79 OBJDIR := $(OBJDIR)+Min
80 BASE_CXX_DEFINES += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \ 80 BASE_CXX_DEFINES += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \
81 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 \ 81 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 \
82 -DALLOW_MINIMAL_BUILD=1 82 -DALLOW_MINIMAL_BUILD=1
83 else 83 else
84 BASE_CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \ 84 BASE_CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
85 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \ 85 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \
86 -DALLOW_MINIMAL_BUILD=0 86 -DALLOW_MINIMAL_BUILD=0
87 endif 87 endif
88 88
89 ifdef IASM_SAFE
90 # Only allow integrated assembler to translate instructions that are
91 # marked as safe.
92 OBJDIR := $(OBJDIR)+Safe
93 BASE_CXX_DEFINES += -DIASM_SAFE=1
94 else
95 BASE_CXX_DEFINES += -DIASM_SAFE=0
96 endif
97
98
89 SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1 99 SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1
90 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0 100 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
91 101
92 ifdef NOASSERT 102 ifdef NOASSERT
93 ASSERTIONS = -DNDEBUG 103 ASSERTIONS = -DNDEBUG
94 else 104 else
95 ASSERTIONS = 105 ASSERTIONS =
96 OBJDIR := $(OBJDIR)+Asserts 106 OBJDIR := $(OBJDIR)+Asserts
97 endif 107 endif
98 108
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 456
447 docs: 457 docs:
448 doxygen Doxyfile 458 doxygen Doxyfile
449 @echo See file://`pwd`/docs/html/index.html 459 @echo See file://`pwd`/docs/html/index.html
450 460
451 clean: 461 clean:
452 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json 462 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
453 463
454 clean-all: clean 464 clean-all: clean
455 rm -rf build/ docs/ 465 rm -rf build/ docs/
OLDNEW
« no previous file with comments | « no previous file | src/IceAssemblerARM32.h » ('j') | src/IceInstARM32.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698