Adapt to renamed predefined CppRuntime_* versions

ldc-developers · Jul 16, 2024 · 4a770ba · 4a770ba
1 parent 3b16b38
commit 4a770ba
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 34 deletions.
diff --git a/driver/main.cpp b/driver/main.cpp
@@ -830,17 +830,20 @@ void registerPredefinedTargetVersions() {
     if (triple.getEnvironment() == llvm::Triple::Android) {
       VersionCondition::addPredefinedGlobalIdent("Android");
       VersionCondition::addPredefinedGlobalIdent("CRuntime_Bionic");
-      VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang");
+      VersionCondition::addPredefinedGlobalIdent("CppRuntime_LLVM");
+      VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang"); // legacy
     } else if (triple.isMusl()) {
       VersionCondition::addPredefinedGlobalIdent("CRuntime_Musl");
-      VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc");
+      VersionCondition::addPredefinedGlobalIdent("CppRuntime_GNU");
+      VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc"); // legacy
       // use libunwind for backtraces
       VersionCondition::addPredefinedGlobalIdent("DRuntime_Use_Libunwind");
     } else if (global.params.isUClibcEnvironment) {
       VersionCondition::addPredefinedGlobalIdent("CRuntime_UClibc");
     } else {
       VersionCondition::addPredefinedGlobalIdent("CRuntime_Glibc");
-      VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc");
+      VersionCondition::addPredefinedGlobalIdent("CppRuntime_GNU");
+      VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc"); // legacy
     }
     break;
   case llvm::Triple::Haiku:
@@ -853,7 +856,8 @@ void registerPredefinedTargetVersions() {
     VersionCondition::addPredefinedGlobalIdent(
         "darwin"); // For backwards compatibility.
     VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_LLVM");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang"); // legacy
     break;
   case llvm::Triple::FreeBSD:
     VersionCondition::addPredefinedGlobalIdent("FreeBSD");
@@ -864,7 +868,8 @@ void registerPredefinedTargetVersions() {
       warning(Loc(), "FreeBSD major version not specified in target triple");
     }
     VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_LLVM");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang"); // legacy
     break;
   case llvm::Triple::Solaris:
     VersionCondition::addPredefinedGlobalIdent("Solaris");
@@ -874,7 +879,8 @@ void registerPredefinedTargetVersions() {
   case llvm::Triple::DragonFly:
     VersionCondition::addPredefinedGlobalIdent("DragonFlyBSD");
     VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_GNU");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc"); // legacy
     break;
   case llvm::Triple::NetBSD:
     VersionCondition::addPredefinedGlobalIdent("NetBSD");
@@ -883,7 +889,8 @@ void registerPredefinedTargetVersions() {
   case llvm::Triple::OpenBSD:
     VersionCondition::addPredefinedGlobalIdent("OpenBSD");
     VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_GNU");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc"); // legacy
     break;
   case llvm::Triple::AIX:
     VersionCondition::addPredefinedGlobalIdent("AIX");
@@ -892,17 +899,20 @@ void registerPredefinedTargetVersions() {
   case llvm::Triple::IOS:
     VersionCondition::addPredefinedGlobalIdent("iOS");
     VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_LLVM");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang"); // legacy
     break;
   case llvm::Triple::TvOS:
     VersionCondition::addPredefinedGlobalIdent("TVOS");
     VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_LLVM");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang"); // legacy
     break;
   case llvm::Triple::WatchOS:
     VersionCondition::addPredefinedGlobalIdent("WatchOS");
     VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_LLVM");
+    VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang"); // legacy
     break;
   case llvm::Triple::WASI:
     VersionCondition::addPredefinedGlobalIdent("WASI");

diff --git a/runtime/druntime/src/core/stdcpp/allocator.d b/runtime/druntime/src/core/stdcpp/allocator.d
@@ -12,9 +12,9 @@
 module core.stdcpp.allocator;
 
 // LDC: empty module for unsupported C++ runtimes
-version (CppRuntime_Microsoft)  version = Supported;
-else version (CppRuntime_Gcc)   version = Supported;
-else version (CppRuntime_Clang) version = Supported;
+version (CppRuntime_Microsoft) version = Supported;
+else version (CppRuntime_GNU)  version = Supported;
+else version (CppRuntime_LLVM) version = Supported;
 version (Supported):
 
 import core.stdcpp.new_;

diff --git a/runtime/druntime/src/core/stdcpp/array.d b/runtime/druntime/src/core/stdcpp/array.d
@@ -12,9 +12,9 @@
 module core.stdcpp.array;
 
 // LDC: empty module for unsupported C++ runtimes
-version (CppRuntime_Microsoft)  version = Supported;
-else version (CppRuntime_Gcc)   version = Supported;
-else version (CppRuntime_Clang) version = Supported;
+version (CppRuntime_Microsoft) version = Supported;
+else version (CppRuntime_GNU)  version = Supported;
+else version (CppRuntime_LLVM) version = Supported;
 version (Supported):
 
 import core.stdcpp.xutility : StdNamespace;

diff --git a/runtime/druntime/src/core/stdcpp/exception.d b/runtime/druntime/src/core/stdcpp/exception.d
@@ -13,9 +13,9 @@
 module core.stdcpp.exception;
 
 // LDC: empty module for unsupported C++ runtimes
-version (CppRuntime_Microsoft)  version = Supported;
-else version (CppRuntime_Gcc)   version = Supported;
-else version (CppRuntime_Clang) version = Supported;
+version (CppRuntime_Microsoft) version = Supported;
+else version (CppRuntime_GNU)  version = Supported;
+else version (CppRuntime_LLVM) version = Supported;
 version (Supported):
 
 import core.stdcpp.xutility : __cplusplus, CppStdRevision;

diff --git a/runtime/druntime/src/core/stdcpp/memory.d b/runtime/druntime/src/core/stdcpp/memory.d
@@ -12,9 +12,9 @@
 module core.stdcpp.memory;
 
 // LDC: empty module for unsupported C++ runtimes
-version (CppRuntime_Microsoft)  version = Supported;
-else version (CppRuntime_Gcc)   version = Supported;
-else version (CppRuntime_Clang) version = Supported;
+version (CppRuntime_Microsoft) version = Supported;
+else version (CppRuntime_GNU)  version = Supported;
+else version (CppRuntime_LLVM) version = Supported;
 version (Supported):
 
 public import core.stdcpp.allocator;

diff --git a/runtime/druntime/src/core/stdcpp/new_.d b/runtime/druntime/src/core/stdcpp/new_.d
@@ -12,9 +12,9 @@
 module core.stdcpp.new_;
 
 // LDC: empty module for unsupported C++ runtimes
-version (CppRuntime_Microsoft)  version = Supported;
-else version (CppRuntime_Gcc)   version = Supported;
-else version (CppRuntime_Clang) version = Supported;
+version (CppRuntime_Microsoft) version = Supported;
+else version (CppRuntime_GNU)  version = Supported;
+else version (CppRuntime_LLVM) version = Supported;
 version (Supported):
 
 import core.stdcpp.xutility : __cpp_sized_deallocation, __cpp_aligned_new;

diff --git a/runtime/druntime/src/core/stdcpp/string.d b/runtime/druntime/src/core/stdcpp/string.d
@@ -13,9 +13,9 @@
 module core.stdcpp.string;
 
 // LDC: empty module for unsupported C++ runtimes
-version (CppRuntime_Microsoft)  version = Supported;
-else version (CppRuntime_Gcc)   version = Supported;
-else version (CppRuntime_Clang) version = Supported;
+version (CppRuntime_Microsoft) version = Supported;
+else version (CppRuntime_GNU)  version = Supported;
+else version (CppRuntime_LLVM) version = Supported;
 version (Supported):
 
 import core.stdcpp.allocator;

diff --git a/runtime/druntime/src/core/stdcpp/string_view.d b/runtime/druntime/src/core/stdcpp/string_view.d
@@ -12,9 +12,9 @@
 module core.stdcpp.string_view;
 
 // LDC: empty module for unsupported C++ runtimes
-version (CppRuntime_Microsoft)  version = Supported;
-else version (CppRuntime_Gcc)   version = Supported;
-else version (CppRuntime_Clang) version = Supported;
+version (CppRuntime_Microsoft) version = Supported;
+else version (CppRuntime_GNU)  version = Supported;
+else version (CppRuntime_LLVM) version = Supported;
 version (Supported):
 
 import core.stdc.stddef : wchar_t;

diff --git a/runtime/druntime/src/rt/dwarfeh.d b/runtime/druntime/src/rt/dwarfeh.d
@@ -1210,7 +1210,7 @@ int actionTableLookup(_Unwind_Exception* exceptionObject, uint actionRecordPtr,
         ClassInfo ci = cast(ClassInfo)cast(void*)(entry);
         if (typeid(ci) is typeid(__cpp_type_info_ptr))
         {
-            version (CppRuntime_Gcc)
+            version (CppRuntime_GNU)
             {
                 if (exceptionClass == cppExceptionClass || exceptionClass == cppExceptionClass1)
                 {
@@ -1256,7 +1256,7 @@ void terminate(uint line) @nogc
 
 /****************************** C++ Support *****************************/
 
-version (CppRuntime_Gcc)
+version (CppRuntime_GNU)
 {
     enum _Unwind_Exception_Class cppExceptionClass =
             (cast(_Unwind_Exception_Class)'G' << 56) |

diff --git a/tests/dmd/runnable_cxx/cppa.d b/tests/dmd/runnable_cxx/cppa.d
@@ -949,7 +949,7 @@ version (LDC)
 {
     version (CRuntime_Microsoft)
         version = LDC_CppEH;
-    else version (CppRuntime_Gcc)
+    else version (CppRuntime_GNU)
         version = LDC_CppEH;
     // FIXME: support libc++ too
 }