Ticket #53605: patch-use-libcxx.3.diff

incpath.c

@@ -129 +129 @@
   int relocated = cpp_relocated ();
   size_t len;
 
+  if (cxx_stdinc)
+    {
+      if (!getenv("LIBCPP_INCLUDE_PATH"))
+        {
+          add_path (xstrdup ("@LLVMHEADERPATH@"), SYSTEM, true, false);
+        }
+    }
   if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
     {
       /* Look for directories that start with the standard prefix.
@@ -474 +481 @@
   /* CPATH and language-dependent environment variables may add to the
      include chain.  */
   add_env_var_paths ("CPATH", BRACKET);
+  if (stdinc && cxx_stdinc)
+    add_env_var_paths ("LIBCPP_INCLUDE_PATH", SYSTEM);
   add_env_var_paths (lang_env_vars[idx], SYSTEM);
 
   target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc);

g++spec.c

@@ -46 +46 @@
 #endif
 
 #ifndef LIBSTDCXX
-#define LIBSTDCXX "stdc++"
+#define LIBSTDCXX "c++"
+#define LIBSTDCXXABI "c++abi"
+// using libsupc++ is a hack, probably to be dropped on systems that have a new enough libc++
+// which has `operator delete(void*, unsigned long)`
+#define LIBSUPCXX "supc++"
+#else
+#warning "LIBSTDCXX predefined"
 #endif
-#ifndef LIBSTDCXX_PROFILE
+#undef LIBSTDCXX_PROFILE
 #define LIBSTDCXX_PROFILE LIBSTDCXX
-#endif
+
 #ifndef LIBSTDCXX_STATIC
 #define LIBSTDCXX_STATIC NULL
+#else
+#warning "LIBSTDCXX_STATIC predefined"
 #endif
 
 void
@@ -342 +350 @@
           j++;
         }
 #endif
-      generate_option (OPT_l,
-                       saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX, 1,
-                       CL_DRIVER, &new_decoded_options[j]);
-      added_libraries++;
-      j++;
-      /* Add target-dependent static library, if necessary.  */
-      if ((static_link || library > 1) && LIBSTDCXX_STATIC != NULL)
+    // NOT checking for the existence of LIBSTDCXXABI and LIBSUPCXX on purpose
+         if (getenv ("GCC_FORCE_LIBSTDCPP")) {
+                 fprintf(stderr, "GCC_FORCE_LIBSTDCPP - using -lstdc++ instead of -l%s -l%s -l%s\n",
+                 LIBSTDCXX, LIBSTDCXXABI, LIBSUPCXX);
+                 generate_option (OPT_l, "stdc++", 1,
+                                  CL_DRIVER, &new_decoded_options[j]);
+                 added_libraries++;
+                 j++;
+         } else {
+                 generate_option (OPT_l,
+                                  saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX, 1,
+                                  CL_DRIVER, &new_decoded_options[j]);
+                 added_libraries++;
+                 j++;
+                 // add -lc++abi and -lsupc++
+                 generate_option (OPT_l, LIBSTDCXXABI, 1,
+                                  CL_DRIVER, &new_decoded_options[j]);
+                 added_libraries++;
+                 j++;
+                 generate_option (OPT_l, LIBSUPCXX, 1,
+                                  CL_DRIVER, &new_decoded_options[j]);
+                 added_libraries++;
+                 j++;
+         }
+         /* Add target-dependent static library, if necessary.  */
+         if ((static_link || library > 1) && (LIBSTDCXX_STATIC != NULL || getenv("GCC_IS_BUILDING_ITSELF")))
         {
-          generate_option (OPT_l, LIBSTDCXX_STATIC, 1,
+          generate_option (OPT_l, LIBSTDCXX_STATIC ? LIBSTDCXX_STATIC : "stdc++", 1,
                            CL_DRIVER, &new_decoded_options[j]);
           added_libraries++;
           j++;