Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Makefile.am

Issue 1821293002: Replace libdisasm with capstone Base URL: https://chromium.googlesource.com/breakpad/breakpad.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | Makefile.in » ('j') | src/build/common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 41bab385e015b03e4e699f3f08b4564a8ae0f60e..2f545cb77aaeddadc21f1e8d5dac3985740d7f43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,9 @@
# This allows #includes to be relative to src/
-AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/third_party/capstone/include
AM_CFLAGS =
AM_CXXFLAGS =
@@ -148,7 +150,7 @@ endif
if !DISABLE_PROCESSOR
lib_LIBRARIES += src/libbreakpad.a
pkgconfig_DATA += breakpad.pc
-noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a
+noinst_LIBRARIES += src/third_party/capstone/libcapstone.a
endif
if LINUX_HOST
@@ -302,33 +304,29 @@ src_libbreakpad_a_SOURCES = \
src/processor/tokenize.cc \
src/processor/tokenize.h
-src_third_party_libdisasm_libdisasm_a_SOURCES = \
- src/third_party/libdisasm/ia32_implicit.c \
- src/third_party/libdisasm/ia32_implicit.h \
- src/third_party/libdisasm/ia32_insn.c \
- src/third_party/libdisasm/ia32_insn.h \
- src/third_party/libdisasm/ia32_invariant.c \
- src/third_party/libdisasm/ia32_invariant.h \
- src/third_party/libdisasm/ia32_modrm.c \
- src/third_party/libdisasm/ia32_modrm.h \
- src/third_party/libdisasm/ia32_opcode_tables.c \
- src/third_party/libdisasm/ia32_opcode_tables.h \
- src/third_party/libdisasm/ia32_operand.c \
- src/third_party/libdisasm/ia32_operand.h \
- src/third_party/libdisasm/ia32_reg.c \
- src/third_party/libdisasm/ia32_reg.h \
- src/third_party/libdisasm/ia32_settings.c \
- src/third_party/libdisasm/ia32_settings.h \
- src/third_party/libdisasm/libdis.h \
- src/third_party/libdisasm/qword.h \
- src/third_party/libdisasm/x86_disasm.c \
- src/third_party/libdisasm/x86_format.c \
- src/third_party/libdisasm/x86_imm.c \
- src/third_party/libdisasm/x86_imm.h \
- src/third_party/libdisasm/x86_insn.c \
- src/third_party/libdisasm/x86_misc.c \
- src/third_party/libdisasm/x86_operand_list.c \
- src/third_party/libdisasm/x86_operand_list.h
+# Currently building capstone with x86 support only (includes x86-64).
+# To add more architectures to the capstone build, add the arch-specific
+# sources to the list below (look in src/third_party/capstone/Makefile
+# to determine the necessary sources), and add the proper -DCAPSTONE_HAS_
+# define to the CPPFLAGS below SOURCES.
+src_third_party_capstone_libcapstone_a_SOURCES = \
+ src/third_party/capstone/arch/X86/X86DisassemblerDecoder.c \
+ src/third_party/capstone/arch/X86/X86Disassembler.c \
+ src/third_party/capstone/arch/X86/X86IntelInstPrinter.c \
+ src/third_party/capstone/arch/X86/X86ATTInstPrinter.c \
+ src/third_party/capstone/arch/X86/X86Mapping.c \
+ src/third_party/capstone/arch/X86/X86Module.c \
+ src/third_party/capstone/cs.c \
+ src/third_party/capstone/utils.c \
+ src/third_party/capstone/SStream.c \
+ src/third_party/capstone/MCInst.c \
+ src/third_party/capstone/MCInstrDesc.c \
+ src/third_party/capstone/MCRegisterInfo.c
+src_third_party_capstone_libcapstone_a_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir)/src/third_party/capstone \
+ -DCAPSTONE_USE_SYS_DYN_MEM \
+ -DCAPSTONE_HAS_X86
## Programs
bin_PROGRAMS += \
@@ -775,7 +773,7 @@ src_processor_exploitability_unittest_LDADD = \
src/processor/stackwalker_x86.o \
src/processor/symbolic_constants_win.o \
src/processor/tokenize.o \
- src/third_party/libdisasm/libdisasm.a \
+ src/third_party/capstone/libcapstone.a \
$(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
@@ -785,7 +783,7 @@ src_processor_disassembler_x86_unittest_CPPFLAGS = \
$(AM_CPPFLAGS) $(TEST_CFLAGS)
src_processor_disassembler_x86_unittest_LDADD = \
src/processor/disassembler_x86.o \
- src/third_party/libdisasm/libdisasm.a \
+ src/third_party/capstone/libcapstone.a \
$(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
@@ -885,7 +883,7 @@ src_processor_minidump_processor_unittest_LDADD = \
src/processor/stackwalker_x86.o \
src/processor/symbolic_constants_win.o \
src/processor/tokenize.o \
- src/third_party/libdisasm/libdisasm.a \
+ src/third_party/capstone/libcapstone.a \
$(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
@@ -914,7 +912,7 @@ src_processor_proc_maps_linux_unittest_CPPFLAGS = \
src_processor_proc_maps_linux_unittest_LDADD = \
src/processor/logging.o \
src/processor/pathname_stripper.o \
- src/third_party/libdisasm/libdisasm.a \
+ src/third_party/capstone/libcapstone.a \
$(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
@@ -1146,7 +1144,7 @@ src_processor_microdump_stackwalk_LDADD = \
src/processor/stackwalker_sparc.o \
src/processor/stackwalker_x86.o \
src/processor/tokenize.o \
- src/third_party/libdisasm/libdisasm.a
+ src/third_party/capstone/libcapstone.a
src_processor_minidump_stackwalk_SOURCES = \
src/processor/minidump_stackwalk.cc
@@ -1184,7 +1182,7 @@ src_processor_minidump_stackwalk_LDADD = \
src/processor/stackwalker_x86.o \
src/processor/symbolic_constants_win.o \
src/processor/tokenize.o \
- src/third_party/libdisasm/libdisasm.a
+ src/third_party/capstone/libcapstone.a
endif !DISABLE_PROCESSOR
« no previous file with comments | « DEPS ('k') | Makefile.in » ('j') | src/build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698