Rename x86 -> x64, since JIT is x64-only.

pull/13171/head
Joshua Haberman 13 years ago
parent 7a0e63ec61
commit 7d986946b7
  1. 10
      Makefile
  2. 0
      upb/pb/decoder_x64.dasc

@ -105,7 +105,7 @@ PB= \
clean_leave_profile: clean_leave_profile:
rm -rf $(LIBUPB) $(LIBUPB_PIC) rm -rf $(LIBUPB) $(LIBUPB_PIC)
rm -rf $(call rwildcard,,*.o) $(call rwildcard,,*.lo) $(call rwildcard,,*.dSYM) rm -rf $(call rwildcard,,*.o) $(call rwildcard,,*.lo) $(call rwildcard,,*.dSYM)
rm -rf upb/pb/decoder_x86.h rm -rf upb/pb/decoder_x64.h
rm -rf benchmark/google_messages.proto.pb benchmark/google_messages.pb.* benchmarks/b.* benchmarks/*.pb* rm -rf benchmark/google_messages.proto.pb benchmark/google_messages.pb.* benchmarks/b.* benchmarks/*.pb*
rm -rf upb/pb/jit_debug_elf_file.o rm -rf upb/pb/jit_debug_elf_file.o
rm -rf upb/pb/jit_debug_elf_file.h rm -rf upb/pb/jit_debug_elf_file.h
@ -129,7 +129,7 @@ OBJ=$(patsubst %.c,%.o,$(SRC))
PICOBJ=$(patsubst %.c,%.lo,$(SRC)) PICOBJ=$(patsubst %.c,%.lo,$(SRC))
ifdef USE_JIT ifdef USE_JIT
upb/pb/decoder.o upb/pb/decoder.lo: upb/pb/decoder_x86.h upb/pb/decoder.o upb/pb/decoder.lo: upb/pb/decoder_x64.h
endif endif
$(LIBUPB): $(OBJ) $(LIBUPB): $(OBJ)
$(E) AR $(LIBUPB) $(E) AR $(LIBUPB)
@ -156,9 +156,9 @@ upb/def.lo: upb/def.c
$(E) 'CC -fPIC' $< $(E) 'CC -fPIC' $<
$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) $(DEF_OPT) -c -o $@ $< -fPIC $(Q) $(CC) $(CFLAGS) $(CPPFLAGS) $(DEF_OPT) -c -o $@ $< -fPIC
upb/pb/decoder_x86.h: upb/pb/decoder_x86.dasc upb/pb/decoder_x64.h: upb/pb/decoder_x64.dasc
$(E) DYNASM $< $(E) DYNASM $<
$(Q) lua dynasm/dynasm.lua upb/pb/decoder_x86.dasc > upb/pb/decoder_x86.h $(Q) lua dynasm/dynasm.lua upb/pb/decoder_x64.dasc > upb/pb/decoder_x64.h
ifneq ($(shell uname), Darwin) ifneq ($(shell uname), Darwin)
upb/pb/jit_debug_elf_file.o: upb/pb/jit_debug_elf_file.s upb/pb/jit_debug_elf_file.o: upb/pb/jit_debug_elf_file.s
@ -168,7 +168,7 @@ upb/pb/jit_debug_elf_file.o: upb/pb/jit_debug_elf_file.s
upb/pb/jit_debug_elf_file.h: upb/pb/jit_debug_elf_file.o upb/pb/jit_debug_elf_file.h: upb/pb/jit_debug_elf_file.o
$(E) XXD $< $(E) XXD $<
$(Q) xxd -i upb/pb/jit_debug_elf_file.o > upb/pb/jit_debug_elf_file.h $(Q) xxd -i upb/pb/jit_debug_elf_file.o > upb/pb/jit_debug_elf_file.h
upb/pb/decoder_x86.h: upb/pb/jit_debug_elf_file.h upb/pb/decoder_x64.h: upb/pb/jit_debug_elf_file.h
endif endif
# Function to expand a wildcard pattern recursively. # Function to expand a wildcard pattern recursively.

Loading…
Cancel
Save