Cleanup cygwin platform handling

Author: jeremy-rifkin

src/binary/elf.cpp

@@ -7,7 +7,7 @@
 #include "utils/io/file.hpp"
 #include "utils/string_view.hpp"
 
-#if IS_LINUX && !IS_CYGWIN
+#if IS_LINUX
 
 #include <array>
 #include <cstdint>

src/binary/elf.hpp

@@ -7,7 +7,7 @@
 #include "utils/span.hpp"
 #include "utils/utils.hpp"
 
-#if IS_LINUX && !IS_CYGWIN
+#if IS_LINUX
 
 #include <cstdint>
 #include <string>

src/binary/module_base.cpp

@@ -7,7 +7,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+#if IS_LINUX || IS_APPLE
  #include <unistd.h>
  #include <dlfcn.h>
  #if IS_APPLE
@@ -21,7 +21,7 @@
 
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
-    #if IS_LINUX && !IS_CYGWIN
+    #if IS_LINUX
     Result<std::uintptr_t, internal_error> get_module_image_base(const std::string& object_path) {
         static std::mutex mutex;
         std::lock_guard<std::mutex> lock(mutex);

src/binary/object.cpp

@@ -11,7 +11,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+#if IS_LINUX || IS_APPLE
  #include <unistd.h>
  #include <dlfcn.h>
  #if IS_LINUX && (defined(CPPTRACE_HAS_DL_FIND_OBJECT) || defined(CPPTRACE_HAS_DLADDR1))
@@ -26,7 +26,7 @@
 
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
-    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+    #if IS_LINUX || IS_APPLE
     #if defined(CPPTRACE_HAS_DL_FIND_OBJECT) || defined(CPPTRACE_HAS_DLADDR1)
     std::string resolve_l_name(const char* l_name) {
         if(l_name != nullptr && l_name[0] != 0) {

src/jit/jit_objects.cpp

@@ -15,7 +15,7 @@
 
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
-    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+    #if IS_LINUX || IS_APPLE
     class jit_object_manager {
         struct object_entry {
             const char* object_start;
@@ -135,7 +135,7 @@ namespace detail {
         manager.clear_all_jit_objects();
     }
 
-    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+    #if IS_LINUX || IS_APPLE
     optional<jit_object_lookup_result> lookup_jit_object(frame_ptr pc) {
         return get_jit_object_manager().lookup(pc);
     }

src/jit/jit_objects.hpp

@@ -13,7 +13,7 @@ namespace detail {
     void unregister_jit_object(const char*);
     void clear_all_jit_objects();
 
-    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+    #if IS_LINUX || IS_APPLE
     #if IS_LINUX
      using jit_object_type = elf;
     #elif IS_APPLE

src/platform/platform.hpp

@@ -4,12 +4,15 @@
 #define IS_WINDOWS 0
 #define IS_LINUX 0
 #define IS_APPLE 0
-#define IS_CYGWIN 0 // If IS_CYGWIN is set IS_LINUX will also be set, for better or worse
+#define IS_CYGWIN 0
 
 #if defined(_WIN32)
  #undef IS_WINDOWS
  #define IS_WINDOWS 1
-#elif defined(__linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__CYGWIN__)
+#elif defined(__CYGWIN__)
+ #undef IS_CYGWIN
+ #define IS_CYGWIN 1
+#elif defined(__linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
  #undef IS_LINUX
  #define IS_LINUX 1
 #elif defined(__APPLE__)
@@ -19,11 +22,6 @@
  #error "Unexpected platform"
 #endif
 
-#ifdef __CYGWIN__
- #undef IS_CYGWIN
- #define IS_CYGWIN 1
-#endif
-
 #define IS_CLANG 0
 #define IS_GCC 0
 #define IS_MSVC 0

src/platform/program_name.hpp

@@ -66,7 +66,7 @@ namespace detail {
 }
 CPPTRACE_END_NAMESPACE
 
-#elif IS_LINUX
+#elif IS_LINUX || IS_CYGWIN
 
 #include <sys/types.h>
 #include <unistd.h>

src/symbols/symbols_with_addr2line.cpp

@@ -15,7 +15,7 @@
 #include <utility>
 #include <vector>
 
-#if IS_LINUX || IS_APPLE
+#if IS_LINUX || IS_APPLE || IS_CYGWIN
  #include <unistd.h>
  #include <sys/types.h>
  #include <sys/wait.h>
@@ -27,7 +27,7 @@
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
 namespace addr2line {
-    #if IS_LINUX || IS_APPLE
+    #if IS_LINUX || IS_APPLE || IS_CYGWIN
     bool has_addr2line() {
         static std::mutex mutex;
         static bool has_addr2line = false;

src/symbols/symbols_with_libdwarf.cpp

@@ -85,7 +85,7 @@ namespace libdwarf {
         return final_trace;
     }
 
-    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+    #if IS_LINUX || IS_APPLE
     CPPTRACE_FORCE_NO_INLINE_FOR_PROFILING
     void try_resolve_jit_frame(const cpptrace::object_frame& dlframe, frame_with_inlines& frame) {
         auto object_res = lookup_jit_object(dlframe.raw_address);
@@ -124,15 +124,15 @@ namespace libdwarf {
             try {
                 const auto& object_name = group.first;
                 if(object_name.empty()) {
-                    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+                    #if IS_LINUX || IS_APPLE
                     for(const auto& entry : group.second) {
                         try_resolve_jit_frame(entry.first.get(), entry.second.get());
                     }
                     #endif
                     continue;
                 }
                 // TODO PERF: Potentially a duplicate open and parse with module base stuff (and debug map resolver)
-                #if IS_LINUX && !IS_CYGWIN
+                #if IS_LINUX
                 auto object = open_elf_cached(object_name);
                 #elif IS_APPLE
                 auto object = open_mach_o_cached(object_name);
@@ -142,7 +142,7 @@ namespace libdwarf {
                     const auto& dlframe = entry.first.get();
                     auto& frame = entry.second.get();
                     try_resolve_frame(resolver.get(), dlframe, frame);
-                    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
+                    #if IS_LINUX || IS_APPLE
                     // fallback to symbol tables
                     if(frame.frame.symbol.empty() && object.has_value()) {
                         frame.frame.symbol = object