chore: merge master

8 files changed, 75 insertions, 38 deletions

diff --git a/config/glib.mpb b/config/glib.mpb
index c7192cc7..972f6083 100644
--- a/config/glib.mpb
+++ b/config/glib.mpb
@@ -10,9 +10,21 @@ project {
     lib
   }
 
-  includes      += $(GLIB_ROOT)/include/glib-$(GLIB_VERSION) \
-                   $(GLIB_ROOT)/$(GLIB_LIB_DIR)/glib-$(GLIB_VERSION)/include
   libpaths      += $(GLIB_ROOT)/lib
 
   lit_libs      += glib-$(GLIB_VERSION)
 }
+
+feature(glib_versioned_includes) {
+  includes += $(GLIB_ROOT)/include/glib-$(GLIB_VERSION) \
+              $(GLIB_ROOT)/$(GLIB_LIB_DIR)/glib-$(GLIB_VERSION)/include
+}
+
+feature(!glib_versioned_includes) {
+  includes += $(GLIB_ROOT)/include
+  libpaths -= $(GLIB_ROOT)/lib
+  specific {
+    Debug::libpaths += $(GLIB_ROOT)/debug/lib
+    Release::libpaths += $(GLIB_ROOT)/lib
+  }
+}
diff --git a/config/nddslib.mpb b/config/nddslib.mpb
index fb4dcc9a..475b13a7 100644
--- a/config/nddslib.mpb
+++ b/config/nddslib.mpb
@@ -6,7 +6,7 @@ project {
   includes += $(NDDSHOME)/include $(NDDSHOME)/include/ndds
 
   specific(prop:windows) {
-    macros += RTI_WIN32 NDDS_DLL_VARIABLE
+    macros += RTI_WIN32 NDDS_DLL_VARIABLE WIN32_LEAN_AND_MEAN
   }
 
   verbatim(gnuace, circuit) {
@@ -23,7 +23,7 @@ project {
     FLAGS_C_CC += -DRTI_LINUX
     endif
     ifeq ($(ACE_PLATFORM_CONFIG),config-win32.h)
-    FLAGS_C_CC += -DRTI_WIN32
+    FLAGS_C_CC += -DRTI_WIN32 -DWIN32_LEAN_AND_MEAN
     else
     FLAGS_C_CC += -DRTI_UNIX
     endif
diff --git a/config/pin_base.mpb b/config/pin_base.mpb
index 6d3f6c01..75e4e927 100644
--- a/config/pin_base.mpb
+++ b/config/pin_base.mpb
@@ -7,14 +7,15 @@ project {
               $(PIN_ROOT)/extras/components/include \
 	      $(PIN_ROOT)/extras/crt/include
 
-  macros += BIGARRAY_MULTIPLIER=1 USING_XED
+  macros += BIGARRAY_MULTIPLIER=1 USING_XED PIN_CRT=1 __PIN__=1
+  lit_libs += c-dynamic m-dynamic stlport-dynamic dl-dynamic unwind-dynamic
 
   specific (vc9) {
     runtime_library = 0
     compile_flags += /Oy
   }
 
-  specific (vc10, vc11, vc12, vc14, vs2017, vs2019) {
+  specific (prop:microsoft) {
     runtime_library = MultiThreaded
     ImageHasSafeExceptionHandlers = false
 
@@ -35,7 +36,8 @@ project {
   }
 
   specific (gnuace, make) {
-    compile_flags += -O3 -fomit-frame-pointer -fno-strict-aliasing -Wno-unknown-pragmas -fno-stack-protector -fPIC
+    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
@@ -102,4 +104,9 @@ feature(intel64) {
     // DO NOT CHANGE ORDER
     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 e6b4bc10..23229bc0 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  += -lpindwarf -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 -Wl,--hash-style=sysv
-      LDLIBS   += -lpindwarf
+      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
   }
@@ -41,7 +41,7 @@ feature (ia32) {
     link_options += /ENTRY:Ptrace_DllMainCRTStartup@12
   }
 
-  specific (vc10, vc11, vc12, vc14, vs2017, vs2019) {
+  specific (prop:microsoft) {
     EntryPointSymbol = Ptrace_DllMainCRTStartup@12
   }
 }
@@ -51,7 +51,12 @@ feature (intel64) {
     link_options += /ENTRY:Ptrace_DllMainCRTStartup
   }
 
-  specific (vc10, vc11, vc12, vc14, vs2017, vs2019) {
+  specific (prop:microsoft) {
     EntryPointSymbol = Ptrace_DllMainCRTStartup
   }
+
+  specific (make, gnuace) {
+    compile_flags += $(PIN_ROOT)/intel64/runtime/pincrt/crtendS.o
+    libpaths += $(PIN_ROOT)/intel64/runtime/pincrt
+  }
 }
diff --git a/config/winapp.mpb b/config/winapp.mpb
index b87b3d42..cacbfb2f 100644
--- a/config/winapp.mpb
+++ b/config/winapp.mpb
@@ -1,11 +1,8 @@
 // -*- MPC -*-
 project {
-  specific(em3, nmake, vc6) {
+  specific(nmake) {
     subsystem = windows
   } else {
-    subsystem = 2
-  }
-  specific(vc10, vc11, vc12, vc14, vs2017, vs2019) {
     subsystem = Windows
   }
 }
diff --git a/config/wireshark.mpb b/config/wireshark.mpb
index 0a8c24ef..85d2d2b3 100644
--- a/config/wireshark.mpb
+++ b/config/wireshark.mpb
@@ -32,13 +32,16 @@ project : glib {
   specific(vs2019) {
     macros      += MSC_VER_REQUIRED=1920
   }
+  specific(vs2022) {
+    macros      += MSC_VER_REQUIRED=1930
+  }
   verbatim(nmake, top, 1) {
     include $(WIRESHARK_SRC)/config.nmake
   }
 }
 
 // Autoconf / In Source Wireshark Build Method
-// This feasture works with how Wireshark Developers Guide says to build
+// This feature works with how Wireshark Developers Guide says to build
 // Wireshark on Linux (autogen.sh). This is also used for older 1.x Wireshark
 // Windows builds and if Wireshark headers are installed on the system.
 // On Windows $(WIRETAP_VERSION) also has to be specified as well.
diff --git a/config/xscdefaults.mpb b/config/xscdefaults.mpb
index 70ce39d5..f55dedc8 100644
--- a/config/xscdefaults.mpb
+++ b/config/xscdefaults.mpb
@@ -1,19 +1,25 @@
 // -*- MPC -*-
 project {
-        specific {
-          xsc_bin = $(XSC_ROOT)/bin/xsc
-          xsc_dep = $(XSC_ROOT)/bin/xsc
-          xsc_flags = --backend cxx
-        }
+  specific {
+    xsc_bin = $(XSC_ROOT)/bin/xsc
+    xsc_dep = $(XSC_ROOT)/bin/xsc
+    xsc_flags = --backend cxx
+  }
 
-        Define_Custom(XSC) {
-          automatic         = 0
-          dependent         = $(XSC_DEP)
-          command           = $(XSC_BIN)
-          commandflags      = $(XSC_FLAGS)
-          inputext          = .xsd
-          source_outputext  = .cpp
-          header_outputext  = .hpp
-          keyword xscflags  = commandflags
-        }
+  verbatim(gnuace,macros,1) {
+    XSC_BIN = $(XSC_ROOT)/bin/xsc
+    XSC_DEP = $(XSC_ROOT)/bin/xsc$(EXEEXT)
+    XSC_FLAGS = --backend cxx
+  }
+
+  Define_Custom(XSC) {
+    automatic         = 0
+    dependent         = $(XSC_DEP)
+    command           = $(XSC_BIN)
+    commandflags      = $(XSC_FLAGS)
+    inputext          = .xsd
+    source_outputext  = .cpp
+    header_outputext  = .hpp
+    keyword xscflags  = commandflags
+  }
 }
diff --git a/config/zlib.mpb b/config/zlib.mpb
index af7711ac..731935a3 100644
--- a/config/zlib.mpb
+++ b/config/zlib.mpb
@@ -1,14 +1,21 @@
 // -*- MPC -*-
 feature(zlib) {
-  includes += "$(ZLIB_ROOT)/include"
-  libpaths += "$(ZLIB_ROOT)/lib"
+  expand(ZLIB_INCDIR) {
+    $ZLIB_INCDIR
+    $(ZLIB_ROOT)/include
+  }
+  expand(ZLIB_LIBDIR) {
+    $ZLIB_LIBDIR
+    $(ZLIB_ROOT)/lib
+  }
+
+  includes += "$(ZLIB_INCDIR)"
+  libpaths += "$(ZLIB_LIBDIR)"
   macros   += ZLIB
 
-  // @@ Notice: If you are building with Cygwin, you may need to manually
-  //            change the following library to zlib.
   specific(prop:windows) {
-    zlibname = zlib
-    lit_libs += $(ZLIBNAME)
+    Debug::lit_libs += zlibd
+    Release::lit_libs += zlib
   } else {
     lit_libs += z
   }