diff options
| author | Caleb Kirby <milkproducktionskirby@gmail.com> | 2021-02-03 12:12:36 -0500 |
|---|---|---|
| committer | Caleb Kirby <milkproducktionskirby@gmail.com> | 2021-02-03 12:12:36 -0500 |
| commit | 0bec2ed9c2f032d8a2157df302e80492d50ec251 (patch) | |
| tree | e804cdc1980ffd02658f283cc526f11d64af944e /config | |
| parent | fc5c4f4269c353e22a03c2a4f47a0ca4e7732077 (diff) | |
| download | MPC-0bec2ed9c2f032d8a2157df302e80492d50ec251.tar.gz | |
moved architecture specific commands to intel64 feature
Diffstat (limited to 'config')
| -rw-r--r-- | config/pin_base.mpb | 10 | ||||
| -rw-r--r-- | config/pintool.mpb | 13 |
2 files changed, 17 insertions, 6 deletions
diff --git a/config/pin_base.mpb b/config/pin_base.mpb index 69389733..26bb6d5d 100644 --- a/config/pin_base.mpb +++ b/config/pin_base.mpb @@ -36,7 +36,8 @@ project { } specific (gnuace, make) { - compile_flags += -O3 -funwind-tables -fno-stack-protector -fasynchronous-unwind-tables -fomit-frame-pointer -fno-strict-aliasing -fno-rtti -faligned-new -fPIC -isystem $(PIN_ROOT)/extras/stlport/include -isystem $(PIN_ROOT)/extras/libstdc++/include -isystem $(PIN_ROOT)/extras/crt/include -isystem $(PIN_ROOT)/extras/crt/include/arch-x86_64 -isystem $(PIN_ROOT)/extras/crt/include/kernel/uapi -isystem $(PIN_ROOT)/extras/crt/include/kernel/asm-x86_64 -I$(PIN_ROOT)/source/include/pin -I$(PIN_ROOT)/source/include/pin/gen -I$(PIN_ROOT)/extras/components/include -I$(PIN_ROOT)/extras/xed-intel64/include/xed -nostdlib -fpermissive -Wno-error=all -fno-exceptions + compile_flags += -O3 -funwind-tables -fno-stack-protector -fasynchronous-unwind-tables -fomit-frame-pointer -fno-strict-aliasing -fno-rtti -faligned-new -fPIC -nostdlib -fpermissive -Wno-error=all -fno-exceptions + compile_flags += '-isystem $(PIN_ROOT)/extras/stlport/include -isystem $(PIN_ROOT)/extras/libstdc++/include -isystem $(PIN_ROOT)/extras/crt/include -isystem $(PIN_ROOT)/extras/crt/include/kernel/uapi' compile_flags -= -Wunused-parameter libs += xed @@ -88,7 +89,8 @@ feature(ia32) { } feature(intel64) { - includes += $(PIN_ROOT)/extras/xed-intel64/include + includes += $(PIN_ROOT)/extras/xed-intel64/include \ + $(PIN_ROOT)/extras/xed-intel64/include/xed libpaths += $(PIN_ROOT)/intel64/lib \ $(PIN_ROOT)/intel64/lib-ext \ @@ -103,4 +105,8 @@ feature(intel64) { lit_libs += libcpmt libcmt pinvm pin libxed ntdll-64 } + specific (make, gnuace) { + compile_flags += -isystem $(PIN_ROOT)/extras/crt/include/arch-x86_64 -isystem $(PIN_ROOT)/extras/crt/include/kernel/asm-x86_64 + } + } diff --git a/config/pintool.mpb b/config/pintool.mpb index 00546a34..bf795467 100644 --- a/config/pintool.mpb +++ b/config/pintool.mpb @@ -14,11 +14,11 @@ project : pin { verbatim (make, macros) { ifeq ($(shell uname -s), Darwin) CPPFLAGS += -DTARGET_MAC - LDFLAGS += $(PIN_ROOT)/intel64/runtime/pincrt/crtbeginS.o -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf -lpinpthread -Wl,-exported_symbols_list -Wl,$(PIN_ROOT)/source/include/pin/pintool.exp + LDFLAGS += -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf -lpinpthread -Wl,-exported_symbols_list -Wl,$(PIN_ROOT)/source/include/pin/pintool.exp LDFLAGS -= -lpthread else - CPPFLAGS += -DTARGET_LINUX -fno-rtti -Wl,--hash-style=sysv $(PIN_ROOT)/intel64/runtime/pincrt/crtendS.o - LDLIBS += -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf -L$(PIN_ROOT)/intel64/runtime/pincrt + CPPFLAGS += -DTARGET_LINUX -fno-rtti -Wl,--hash-style=sysv + LDLIBS += -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf LDFLAGS += -Wl,-Bsymbolic -Wl,--version-script=$(PIN_ROOT)/source/include/pin/pintool.ver endif } @@ -30,7 +30,7 @@ project : pin { LDFLAGS -= -lpthread else CPPFLAGS += -DTARGET_LINUX -Wl,--hash-style=sysv - LIBS += -lpindwarf -L$(PIN_ROOT)/intel64/runtime/pincrt + LIBS += -lpindwarf LDFLAGS += -Wl,-Bsymbolic -Wl,--version-script=$(PIN_ROOT)/source/include/pin/pintool.ver endif } @@ -54,4 +54,9 @@ feature (intel64) { specific (vc10, vc11, vc12, vc14, vs2017, vs2019) { EntryPointSymbol = Ptrace_DllMainCRTStartup } + + specific (make, gnuace) { + compile_flags += $(PIN_ROOT)/intel64/runtime/pincrt/crtendS.o + libpaths += $(PIN_ROOT)/intel64/runtime/pincrt + } } |