| OLD | NEW |
| 1 CFLAGS = -g -O0 -Wall -Werror -Wextra -Wno-missing-field-initializers \ | 1 CFLAGS = -g -O0 -Wall -Werror -Wextra -Wno-missing-field-initializers \ |
| 2 -Wno-unused-parameter -I. | 2 -Wno-unused-parameter -I. |
| 3 LDFLAGS = -g | 3 LDFLAGS = -g |
| 4 CPPFLAGS = | 4 CPPFLAGS = |
| 5 DEPFLAGS = -MMD -MF $@.d | 5 DEPFLAGS = -MMD -MF $@.d |
| 6 MODS := allocator preload library debug maps x86_decode securemem sandbox \ | 6 MODS := allocator preload library debug maps x86_decode securemem sandbox \ |
| 7 syscall_entrypoint system_call_table \ | 7 syscall_entrypoint system_call_table \ |
| 8 trusted_thread trusted_thread_asm trusted_process \ | 8 trusted_thread trusted_thread_asm trusted_process \ |
| 9 access exit fault_handler_asm clone \ | 9 access exit fault_handler_asm clone \ |
| 10 getpid gettid ioctl ipc madvise mmap mprotect \ | 10 getpid gettid ioctl ipc madvise mmap mprotect \ |
| 11 munmap open prctl reference_trusted_thread sigaction sigprocmask \ | 11 munmap open prctl reference_trusted_thread sigaction sigprocmask \ |
| 12 socketcall stat tls_setup tls_setup_helper | 12 socketcall stat tls_setup tls_setup_helper |
| 13 TEST_MODS := \ | 13 TEST_MODS := \ |
| 14 tests/clone_test_helper \ | 14 tests/clone_test_helper \ |
| 15 tests/test_runner \ | 15 tests/test_runner \ |
| 16 tests/test_patching \ |
| 17 tests/test_patching_input \ |
| 16 tests/test_syscalls | 18 tests/test_syscalls |
| 17 OBJS64 := $(shell echo ${MODS} | xargs -n 1 | sed -e 's/$$/.o64/') | 19 OBJS64 := $(shell echo ${MODS} | xargs -n 1 | sed -e 's/$$/.o64/') |
| 18 OBJS32 := $(shell echo ${MODS} | xargs -n 1 | sed -e 's/$$/.o32/') | 20 OBJS32 := $(shell echo ${MODS} | xargs -n 1 | sed -e 's/$$/.o32/') |
| 19 TEST_OBJS64 := $(shell echo ${TEST_MODS} | xargs -n 1 | sed -e 's/$$/.o64/') | 21 TEST_OBJS64 := $(shell echo ${TEST_MODS} | xargs -n 1 | sed -e 's/$$/.o64/') |
| 20 TEST_OBJS32 := $(shell echo ${TEST_MODS} | xargs -n 1 | sed -e 's/$$/.o32/') | 22 TEST_OBJS32 := $(shell echo ${TEST_MODS} | xargs -n 1 | sed -e 's/$$/.o32/') |
| 21 ALL_OBJS = $(OBJS32) $(OBJS64) \ | 23 ALL_OBJS = $(OBJS32) $(OBJS64) \ |
| 22 $(TEST_OBJS32) $(TEST_OBJS64) \ | 24 $(TEST_OBJS32) $(TEST_OBJS64) \ |
| 23 timestats.o playground.o | 25 timestats.o playground.o |
| 24 DEP_FILES = $(wildcard $(foreach f,$(ALL_OBJS),$(f).d)) | 26 DEP_FILES = $(wildcard $(foreach f,$(ALL_OBJS),$(f).d)) |
| 25 | 27 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 118 |
| 117 .cc.o32: | 119 .cc.o32: |
| 118 ${CXX} ${CFLAGS} ${CPPFLAGS} ${DEPFLAGS} -m32 -fPIC -c -o $@ $< | 120 ${CXX} ${CFLAGS} ${CPPFLAGS} ${DEPFLAGS} -m32 -fPIC -c -o $@ $< |
| 119 | 121 |
| 120 .c.o32: | 122 .c.o32: |
| 121 ${CC} ${CFLAGS} ${CPPFLAGS} ${DEPFLAGS} -m32 --std=gnu99 -fPIC \ | 123 ${CC} ${CFLAGS} ${CPPFLAGS} ${DEPFLAGS} -m32 --std=gnu99 -fPIC \ |
| 122 -c -o $@ $< | 124 -c -o $@ $< |
| 123 | 125 |
| 124 .S.o32: | 126 .S.o32: |
| 125 ${CC} ${CFLAGS} ${CPPFLAGS} ${DEPFLAGS} -m32 -c -o $@ $< | 127 ${CC} ${CFLAGS} ${CPPFLAGS} ${DEPFLAGS} -m32 -c -o $@ $< |
| OLD | NEW |