Merge pull request #2704 from kinke/fix2703

Fix compilation issues on 64-bit macOS with DMD host compiler >= 2.079
ldc-developers · May 21, 2018 · e7beba6 · e7beba6
2 parents 8b0e470 + 0348811
commit e7beba6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
       d: ldc-beta
       env: LLVM_VERSION=6.0.0 OPTS="-DBUILD_SHARED_LIBS=OFF" LLVM_SPIRV_AVAILABLE=ON
     - os: osx
-      d: ldc
+      d: dmd
       env: LLVM_VERSION=4.0.0 OPTS="-DBUILD_SHARED_LIBS=ON"
   allow_failures:
     - env: LLVM_VERSION=6.0.0 OPTS="-DBUILD_SHARED_LIBS=OFF" LLVM_SPIRV_AVAILABLE=ON

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -429,6 +429,7 @@ append("-DOPAQUE_VTBLS" LDC_CXXFLAGS)
 append("\"-DLDC_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}\"" LDC_CXXFLAGS)
 append("-DLDC_LLVM_VER=${LDC_LLVM_VER}" LDC_CXXFLAGS)
 append("\"-DLDC_LIBDIR_SUFFIX=\\\"${LIB_SUFFIX}\\\"\"" LDC_CXXFLAGS)
+append("-DLDC_HOST_${D_COMPILER_ID}=1" LDC_CXXFLAGS)
 append("-DLDC_HOST_FE_VER=${D_COMPILER_FE_VERSION}" LDC_CXXFLAGS)
 
 if(GENERATE_OFFTI)

diff --git a/cmake/Modules/FindDCompiler.cmake b/cmake/Modules/FindDCompiler.cmake
@@ -73,6 +73,7 @@ endif()
 
 if (D_COMPILER_FOUND)
     message(STATUS "Found host D compiler ${D_COMPILER}, with default flags '${D_COMPILER_FLAGS}'")
+    message(STATUS "Host D compiler ID: ${D_COMPILER_ID}")
     message(STATUS "Host D compiler version: ${D_COMPILER_VERSION_STRING}")
     message(STATUS "Host D compiler front-end version: ${D_COMPILER_FE_VERSION}")
 else()

diff --git a/dmd/globals.h b/dmd/globals.h
@@ -334,7 +334,7 @@ extern Global global;
 // Because int64_t and friends may be any integral type of the
 // correct size, we have to explicitly ask for the correct
 // integer type to get the correct mangling with dmd
-#if __LP64__
+#if __LP64__ && !(__APPLE__ && LDC_HOST_DigitalMars && LDC_HOST_FE_VER >= 2079)
 // Be careful not to care about sign when using dinteger_t
 // use this instead of integer_t to
 // avoid conflicts with system #include's

diff --git a/dmd/identifier.h b/dmd/identifier.h
@@ -38,7 +38,7 @@ class Identifier : public RootObject
     static StringTable stringtable;
     static Identifier *generateId(const char *prefix);
     static Identifier *generateId(const char *prefix, size_t i);
-    static Identifier *idPool(const char *s, size_t len);
+    static Identifier *idPool(const char *s, d_size_t len);
 
     static inline Identifier *idPool(const char *s)
     {

diff --git a/dmd/root/rmem.h b/dmd/root/rmem.h
@@ -17,6 +17,8 @@
      * than D's 'uint'
      */
     typedef unsigned d_size_t;
+#elif __APPLE__ && __LP64__ && LDC_HOST_DigitalMars && LDC_HOST_FE_VER >= 2079
+    typedef unsigned long long d_size_t;
 #else
     typedef size_t d_size_t;
 #endif

diff --git a/driver/cache_pruning.h b/driver/cache_pruning.h
@@ -10,14 +10,10 @@
 #ifndef LDC_DRIVER_IR2OBJ_CACHE_PRUNING_H
 #define LDC_DRIVER_IR2OBJ_CACHE_PRUNING_H
 
-#if __LP64__
-using d_ulong = unsigned long;
-#else
-using d_ulong = unsigned long long;
-#endif
+#include "globals.h"
 
-void pruneCache(const char *cacheDirectoryPtr, size_t cacheDirectoryLen,
+void pruneCache(const char *cacheDirectoryPtr, d_size_t cacheDirectoryLen,
                 uint32_t pruneIntervalSeconds, uint32_t expireIntervalSeconds,
-                d_ulong sizeLimitBytes, uint32_t sizeLimitPercentage);
+                uinteger_t sizeLimitBytes, uint32_t sizeLimitPercentage);
 
 #endif