diff options
| author | James H. Hill <hillj@cs.iupui.edu> | 2015-10-16 16:07:25 -0400 |
|---|---|---|
| committer | James H. Hill <hillj@cs.iupui.edu> | 2015-10-16 16:07:25 -0400 |
| commit | ffa0b620162fa90cd50080406bb860e0cc1b2728 (patch) | |
| tree | 69032f1f8cf565e53190e6219b415c9dcf031850 /config | |
| parent | 31128630969b8268d13dd25942aadd1bbe6602d5 (diff) | |
| parent | 936c25655110aac1ff8879799579e11409a8a665 (diff) | |
| download | MPC-ffa0b620162fa90cd50080406bb860e0cc1b2728.tar.gz | |
Resolved conflicts for merge
Diffstat (limited to 'config')
| -rw-r--r-- | config/pin_base.mpb | 12 | ||||
| -rw-r--r-- | config/pintool.mpb | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/config/pin_base.mpb b/config/pin_base.mpb index 346e5e54..2af0a49d 100644 --- a/config/pin_base.mpb +++ b/config/pin_base.mpb @@ -62,13 +62,12 @@ project { } feature(ia32) { - includes += $(PIN_ROOT)/extras/xed-ia32/include \ - $(PIN_ROOT)/extras/xed2-ia32/include + includes += $(PIN_ROOT)/extras/xed-ia32/include libpaths += $(PIN_ROOT)/ia32/lib \ $(PIN_ROOT)/ia32/lib-ext \ $(PIN_ROOT)/extras/xed-ia32/lib \ - $(PIN_ROOT)/extras/xed2-ia32/lib + $(PIN_ROOT)/extras/components/lib/ia32 macros += TARGET_IA32 HOST_IA32 @@ -81,20 +80,19 @@ feature(ia32) { // DO NOT CHANGE ORDER lit_libs += libcpmt libcmt pinvm pin libxed ntdll-32 } - + specific (make, gnuace) { compile_flags += -m32 } } feature(intel64) { - includes += $(PIN_ROOT)/extras/xed-intel64/include \ - $(PIN_ROOT)/extras/xed2-intel64/include + includes += $(PIN_ROOT)/extras/xed-intel64/include libpaths += $(PIN_ROOT)/intel64/lib \ $(PIN_ROOT)/intel64/lib-ext \ $(PIN_ROOT)/extras/xed-intel64/lib \ - $(PIN_ROOT)/extras/xed2-intel64/lib + $(PIN_ROOT)/extras/components/lib/intel64 macros += TARGET_IA32E HOST_IA32E avoids += ia32 diff --git a/config/pintool.mpb b/config/pintool.mpb index 3e43496c..65a7575c 100644 --- a/config/pintool.mpb +++ b/config/pintool.mpb @@ -17,7 +17,7 @@ project : pin { LDFLAGS += -lpindwarf -lpinpthread -Wl,-exported_symbols_list -Wl,$(PIN_ROOT)/source/include/pin/pintool.exp LDFLAGS -= -lpthread else - CPPFLAGS += -DTARGET_LINUX + CPPFLAGS += -DTARGET_LINUX -Wl,--hash-style=sysv LDLIBS += -lpindwarf LDFLAGS += -Wl,-Bsymbolic -Wl,--version-script=$(PIN_ROOT)/source/include/pin/pintool.ver endif |