OLD | NEW |
---|---|
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
145 # handle bundle_lock pad-to-end correctly. | 145 # handle bundle_lock pad-to-end correctly. |
146 # TODO(jpp): fix this. | 146 # TODO(jpp): fix this. |
147 FORCEASM_LIT_TEST_EXCLUDES = --filter='^(?!.*/x86/sandboxing.ll).*' | 147 FORCEASM_LIT_TEST_EXCLUDES = --filter='^(?!.*/x86/sandboxing.ll).*' |
148 else | 148 else |
149 FORCEASM_FLAG = | 149 FORCEASM_FLAG = |
150 FORCEASM_XTEST_EXCLUDES = | 150 FORCEASM_XTEST_EXCLUDES = |
151 FORCEASM_LIT_PARAM = | 151 FORCEASM_LIT_PARAM = |
152 FORCEASM_LIT_TEST_EXCLUDES = | 152 FORCEASM_LIT_TEST_EXCLUDES = |
153 endif | 153 endif |
154 | 154 |
155 ifdef LINUX_MALLOC_PROFILE | |
Jim Stichnoth
2016/03/12 00:12:57
Update OBJDIR, something like:
OBJDIR := $(OBJD
sehr
2016/03/15 00:36:45
Done.
| |
156 CXX_DEFINES += -DALLOW_LINUX_MALLOC_PROFILE=1 | |
Jim Stichnoth
2016/03/12 00:12:58
Can you update BASE_CXX_DEFINES instead of CXX_DEF
sehr
2016/03/15 00:36:45
Done.
| |
157 LD_EXTRA += -Wl,--export-dynamic | |
158 endif | |
159 | |
155 SB_OBJDIR := $(OBJDIR)+Sandboxed | 160 SB_OBJDIR := $(OBJDIR)+Sandboxed |
156 SBB_OBJDIR := $(OBJDIR)+SandboxedBrowser | 161 SBB_OBJDIR := $(OBJDIR)+SandboxedBrowser |
157 | 162 |
158 $(info -----------------------------------------------) | 163 $(info -----------------------------------------------) |
159 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH)) | 164 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH)) |
160 $(info Using SB_LLVM_PATH = $(SB_LLVM_PATH)) | 165 $(info Using SB_LLVM_PATH = $(SB_LLVM_PATH)) |
161 $(info Using NACL_ROOT = $(NACL_ROOT)) | 166 $(info Using NACL_ROOT = $(NACL_ROOT)) |
162 $(info Using TOOLCHAIN_ROOT = $(TOOLCHAIN_ROOT)) | 167 $(info Using TOOLCHAIN_ROOT = $(TOOLCHAIN_ROOT)) |
163 $(info Using PNACL_TOOLCHAIN_ROOT = $(PNACL_TOOLCHAIN_ROOT)) | 168 $(info Using PNACL_TOOLCHAIN_ROOT = $(PNACL_TOOLCHAIN_ROOT)) |
164 $(info Using PNACL_BIN_PATH = $(PNACL_BIN_PATH)) | 169 $(info Using PNACL_BIN_PATH = $(PNACL_BIN_PATH)) |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
283 IceTypes.cpp \ | 288 IceTypes.cpp \ |
284 main.cpp \ | 289 main.cpp \ |
285 PNaClTranslator.cpp | 290 PNaClTranslator.cpp |
286 | 291 |
287 ifndef MINIMAL | 292 ifndef MINIMAL |
288 SRCS += \ | 293 SRCS += \ |
289 IceConverter.cpp \ | 294 IceConverter.cpp \ |
290 IceTypeConverter.cpp | 295 IceTypeConverter.cpp |
291 endif | 296 endif |
292 | 297 |
298 ifdef LINUX_MALLOC_PROFILE | |
299 SRCS += LinuxMallocProfiling.cpp | |
Jim Stichnoth
2016/03/12 00:12:57
I actually think this source file should be added
sehr
2016/03/15 00:36:45
I added the source unconditionally, and the bodies
| |
300 endif | |
301 | |
293 OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS)) | 302 OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS)) |
294 SB_OBJS=$(patsubst %.cpp, $(SB_OBJDIR)/%.o, $(SRCS)) | 303 SB_OBJS=$(patsubst %.cpp, $(SB_OBJDIR)/%.o, $(SRCS)) |
295 SBB_OBJS=$(patsubst %.cpp, $(SBB_OBJDIR)/%.o, $(SRCS)) | 304 SBB_OBJS=$(patsubst %.cpp, $(SBB_OBJDIR)/%.o, $(SRCS)) |
296 | 305 |
297 UNITTEST_SRCS = \ | 306 UNITTEST_SRCS = \ |
298 BitcodeMunge.cpp \ | 307 BitcodeMunge.cpp \ |
299 IceELFSectionTest.cpp \ | 308 IceELFSectionTest.cpp \ |
300 IceParseInstsTest.cpp | 309 IceParseInstsTest.cpp |
301 | 310 |
302 # The X86 assembler tests take too long to compile. Given how infrequently the | 311 # The X86 assembler tests take too long to compile. Given how infrequently the |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
612 | 621 |
613 help-check-xtest: | 622 help-check-xtest: |
614 @cat Makefile.standalone-help/check-xtest.txt | 623 @cat Makefile.standalone-help/check-xtest.txt |
615 | 624 |
616 clean: | 625 clean: |
617 rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \ | 626 rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \ |
618 $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json | 627 $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json |
619 | 628 |
620 clean-all: clean | 629 clean-all: clean |
621 rm -rf build/ crosstest/Output/ | 630 rm -rf build/ crosstest/Output/ |
OLD | NEW |