diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-14 08:20:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 08:20:06 +0100 |
| commit | 33c20e2c48c225ba57e7784c543a7d8c02d76d06 (patch) | |
| tree | 70971b37c2b88081d3b614478da700cddcac162a | |
| parent | fa040f2b1e7459119c23d94b18aa0529e5375b3d (diff) | |
| parent | b8876e40ebba5e596d07277130519dd517aa438e (diff) | |
| download | MPC-33c20e2c48c225ba57e7784c543a7d8c02d76d06.tar.gz | |
Merge pull request #176 from saipavanmeruga/pin-3.x
fix: added support for static tools in pin-3.26
| -rw-r--r-- | config/pin_base.mpb | 8 | ||||
| -rw-r--r-- | config/pin_static.mpb | 1 | ||||
| -rw-r--r-- | config/pintool.mpb | 4 | ||||
| -rw-r--r-- | config/pintool_static.mpb | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/config/pin_base.mpb b/config/pin_base.mpb index bcc6b0b5..7cf8eda9 100644 --- a/config/pin_base.mpb +++ b/config/pin_base.mpb @@ -4,8 +4,8 @@ project { includes += $(PIN_ROOT)/source/include \ $(PIN_ROOT)/source/include/pin \ $(PIN_ROOT)/source/include/pin/gen \ - $(PIN_ROOT)/extras/stlport/include \ - $(PIN_ROOT)/extras/libstdc++/include \ + $(PIN_ROOT)/extras/cxx/include \ + $(PIN_ROOT)/extras/libstdc++/include \ $(PIN_ROOT)/extras/crt/include \ $(PIN_ROOT)/extras/crt/include/kernel/uapi \ $(PIN_ROOT)/extras/crt/include/kernel/uapi/asm-x86 \ @@ -42,10 +42,10 @@ project { specific (gnuace, make) { compile_flags += -O3 -funwind-tables -fno-stack-protector -fasynchronous-unwind-tables -fomit-frame-pointer -fno-strict-aliasing -fno-rtti -fPIC -nostdlib -fpermissive -Wno-error=all -fno-exceptions - compile_flags -= -Wunused-parameter + compile_flags -= -Wunused-parameter -nostdlib libs += xed - libs += c-dynamic m-dynamic stlport-dynamic unwind-dynamic + libs += c-dynamic m-dynamic c++ c++abi unwind-dynamic } verbatim (make, macros) { diff --git a/config/pin_static.mpb b/config/pin_static.mpb index fc257ad7..a716e616 100644 --- a/config/pin_static.mpb +++ b/config/pin_static.mpb @@ -1,4 +1,5 @@ project : pin { + requires += static specific (!prop:windows) { libs += sapin libs -= pin diff --git a/config/pintool.mpb b/config/pintool.mpb index ec97d093..815e3442 100644 --- a/config/pintool.mpb +++ b/config/pintool.mpb @@ -18,8 +18,8 @@ project : pin { LDFLAGS -= -lpthread else CPPFLAGS += -DTARGET_LINUX -fno-rtti -Wl,--hash-style=sysv - LDLIBS += -nostdlib -ldl-dynamic -lpin3dwarf - LDFLAGS += -Wl,-Bsymbolic -Wl,--version-script=$(PIN_ROOT)/source/include/pin/pintool.ver + LDLIBS += -nostdlib -ldl-dynamic -lpindwarf + LDFLAGS += -Wl,-Bsymbolic -Wl,$(PIN_ROOT)/intel64/runtime/pincrt/crtbeginS.o $(PIN_ROOT)/intel64/runtime/pincrt/crtendS.o endif } diff --git a/config/pintool_static.mpb b/config/pintool_static.mpb index e9301b22..c55fe0c5 100644 --- a/config/pintool_static.mpb +++ b/config/pintool_static.mpb @@ -13,9 +13,8 @@ project : pin_static { LDFLAGS -= -lpthread else CPPFLAGS += -DTARGET_LINUX - LDFLAGS += -Wl,--hash-style=sysv -Wl,-Bsymbolic - LDFLAGS -= -ldl -lpthread - LDLIBS += -lpindwarf -ldl + LDFLAGS += -Wl,--hash-style=sysv -Wl,-Bsymbolic,$(PIN_ROOT)/intel64/runtime/pincrt/crtbegin.o $(PIN_ROOT)/intel64/runtime/pincrt/crtend.o + LDLIBS += -nostdlib -ldl-dynamic -lpindwarf endif } @@ -26,7 +25,6 @@ project : pin_static { else # TODO Add support for linking against gcc libraries included with Pin CPPFLAGS += -DTARGET_LINUX - LIBS += -lpindwarf LDFLAGS += -Wl,--hash-style=sysv -Wl,-Bsymbolic endif } |