diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | third_party/dynasm/LICENSE (renamed from dynasm/COPYRIGHT) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/README.google | 10 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_arm.h (renamed from dynasm/dasm_arm.h) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_arm.lua (renamed from dynasm/dasm_arm.lua) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_mips.h (renamed from dynasm/dasm_mips.h) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_mips.lua (renamed from dynasm/dasm_mips.lua) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_ppc.h (renamed from dynasm/dasm_ppc.h) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_ppc.lua (renamed from dynasm/dasm_ppc.lua) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_proto.h (renamed from dynasm/dasm_proto.h) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_x64.lua (renamed from dynasm/dasm_x64.lua) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_x86.h (renamed from dynasm/dasm_x86.h) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dasm_x86.lua (renamed from dynasm/dasm_x86.lua) | 0 | ||||
| -rw-r--r-- | third_party/dynasm/dynasm.lua (renamed from dynasm/dynasm.lua) | 0 | ||||
| -rw-r--r-- | upb/pb/compile_decoder_x64.c | 4 |
15 files changed, 14 insertions, 4 deletions
@@ -182,7 +182,7 @@ obj/upb/pb/compile_decoder_x64.lo : CSTD = -std=gnu89 upb/pb/compile_decoder_x64.h: upb/pb/compile_decoder_x64.dasc $(E) DYNASM $< - $(Q) $(LUA) dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) + $(Q) $(LUA) third_party/dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) endif upb_json_SRCS = \ @@ -256,7 +256,7 @@ upb/descriptor/descriptor.pb: upb/descriptor/descriptor.proto genfiles: upb/descriptor/descriptor.pb tools/upbc ./tools/upbc upb/descriptor/descriptor.pb upb/descriptor/descriptor google_protobuf_descriptor - $(LUA) dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) + $(LUA) third_party/dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) # upbc depends on these Lua extensions. UPBC_LUA_EXTS = \ diff --git a/dynasm/COPYRIGHT b/third_party/dynasm/LICENSE index 6f2a45b..6f2a45b 100644 --- a/dynasm/COPYRIGHT +++ b/third_party/dynasm/LICENSE diff --git a/third_party/dynasm/README.google b/third_party/dynasm/README.google new file mode 100644 index 0000000..dd829a0 --- /dev/null +++ b/third_party/dynasm/README.google @@ -0,0 +1,10 @@ +URL: http://repo.or.cz/w/luajit-2.0.git/tree/6c05739684527919293e25668589f17c35a7c129:/dynasm +Version: 6c05739684527919293e25668589f17c35a7c129 +License: MIT +License File: LICENSE +Description: +Taken from the larger LuaJIT project, DynASM is a tiny preprocessor and +runtime for generating machine code at runtime. + +Local Modifications: +No modifications. diff --git a/dynasm/dasm_arm.h b/third_party/dynasm/dasm_arm.h index b770c2d..b770c2d 100644 --- a/dynasm/dasm_arm.h +++ b/third_party/dynasm/dasm_arm.h diff --git a/dynasm/dasm_arm.lua b/third_party/dynasm/dasm_arm.lua index cc4fa17..cc4fa17 100644 --- a/dynasm/dasm_arm.lua +++ b/third_party/dynasm/dasm_arm.lua diff --git a/dynasm/dasm_mips.h b/third_party/dynasm/dasm_mips.h index af87d99..af87d99 100644 --- a/dynasm/dasm_mips.h +++ b/third_party/dynasm/dasm_mips.h diff --git a/dynasm/dasm_mips.lua b/third_party/dynasm/dasm_mips.lua index aa33f0c..aa33f0c 100644 --- a/dynasm/dasm_mips.lua +++ b/third_party/dynasm/dasm_mips.lua diff --git a/dynasm/dasm_ppc.h b/third_party/dynasm/dasm_ppc.h index bf5957e..bf5957e 100644 --- a/dynasm/dasm_ppc.h +++ b/third_party/dynasm/dasm_ppc.h diff --git a/dynasm/dasm_ppc.lua b/third_party/dynasm/dasm_ppc.lua index dc2af69..dc2af69 100644 --- a/dynasm/dasm_ppc.lua +++ b/third_party/dynasm/dasm_ppc.lua diff --git a/dynasm/dasm_proto.h b/third_party/dynasm/dasm_proto.h index 3002811..3002811 100644 --- a/dynasm/dasm_proto.h +++ b/third_party/dynasm/dasm_proto.h diff --git a/dynasm/dasm_x64.lua b/third_party/dynasm/dasm_x64.lua index bae72ac..bae72ac 100644 --- a/dynasm/dasm_x64.lua +++ b/third_party/dynasm/dasm_x64.lua diff --git a/dynasm/dasm_x86.h b/third_party/dynasm/dasm_x86.h index 7c6dcd3..7c6dcd3 100644 --- a/dynasm/dasm_x86.h +++ b/third_party/dynasm/dasm_x86.h diff --git a/dynasm/dasm_x86.lua b/third_party/dynasm/dasm_x86.lua index 3bebb83..3bebb83 100644 --- a/dynasm/dasm_x86.lua +++ b/third_party/dynasm/dasm_x86.lua diff --git a/dynasm/dynasm.lua b/third_party/dynasm/dynasm.lua index 2ef8164..2ef8164 100644 --- a/dynasm/dynasm.lua +++ b/third_party/dynasm/dynasm.lua diff --git a/upb/pb/compile_decoder_x64.c b/upb/pb/compile_decoder_x64.c index 3ce11e4..9b78c65 100644 --- a/upb/pb/compile_decoder_x64.c +++ b/upb/pb/compile_decoder_x64.c @@ -129,8 +129,8 @@ static char *upb_vasprintf(const char *fmt, va_list ap); static char *upb_asprintf(const char *fmt, ...); #endif -#include "dynasm/dasm_proto.h" -#include "dynasm/dasm_x86.h" +#include "third_party/dynasm/dasm_proto.h" +#include "third_party/dynasm/dasm_x86.h" #include "upb/pb/compile_decoder_x64.h" static jitcompiler *newjitcompiler(mgroup *group) { |