From aa8db6ab5ea18848247b8c4ac4715cf344941e94 Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Thu, 24 Oct 2013 13:18:10 -0700 Subject: Build fix for Mac OS X. --- Makefile | 4 ++-- upb/pb/compile_decoder_x64.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f8af8e2..3cb6d00 100644 --- a/Makefile +++ b/Makefile @@ -253,8 +253,8 @@ $(SIMPLE_CXX_TESTS): % : %.cc $(E) CXX $< $(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ tests/testmain.o $< $(LIBUPB) -VALGRIND=valgrind --leak-check=full --error-exitcode=1 --track-origins=yes -#VALGRIND= +#VALGRIND=valgrind --leak-check=full --error-exitcode=1 --track-origins=yes +VALGRIND= test: tests @set -e # Abort on error. @for test in $(SIMPLE_TESTS) $(SIMPLE_CXX_TESTS); do \ diff --git a/upb/pb/compile_decoder_x64.c b/upb/pb/compile_decoder_x64.c index 4659716..2e8132e 100644 --- a/upb/pb/compile_decoder_x64.c +++ b/upb/pb/compile_decoder_x64.c @@ -263,7 +263,7 @@ void upb_pbdecoder_jit(upb_pbdecoderplan *plan) { } char *jit_code = mmap(NULL, jc->plan->jit_size, PROT_READ | PROT_WRITE, - MAP_32BIT | MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); + MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); dasm_encode(jc, jit_code); mprotect(jit_code, jc->plan->jit_size, PROT_EXEC | PROT_READ); upb_reg_jit_gdb(jc); -- cgit v1.2.3