Set wekamods default to false.

weka · May 17, 2024 · e1cca7a · e1cca7a
1 parent 3cf7c0b
commit e1cca7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/driver/cl_options.cpp b/driver/cl_options.cpp
@@ -649,8 +649,8 @@ static cl::opt<DummyDataType, false, CoverageParser> coverageAnalysis(
 static cl::opt<bool, true, FlagParser<bool>> wekaMods(
     "wekamods",
     cl::desc(
-        "(*) Enable specific Weka mods like the template instantiation mods"),
-    cl::location(global.params.enableWekaMods), cl::init(true));
+        "(*) Enable specific Weka mods: emit all functions in COMDAT for ELF"),
+    cl::location(global.params.enableWekaMods), cl::init(false));
 static cl::opt<uint32_t, true>
     templateCodegenDepth("template-codegen-depth",
              cl::desc("Don't codegen templates beyond this recusion depth (0 = off)."),

diff --git a/gen/tollvm.cpp b/gen/tollvm.cpp
@@ -273,7 +273,13 @@ bool needsCOMDAT() {
    * using /Gy with the MS compiler.
    * https://docs.microsoft.com/en-us/cpp/build/reference/opt-optimizations?view=vs-2019
    */
+#if IN_WEKA
+  return global.params.targetTriple->isOSBinFormatCOFF() ||
+         (global.params.enableWekaMods &&
+          global.params.targetTriple->isOSBinFormatELF());
+#else
   return global.params.targetTriple->isOSBinFormatCOFF();
+#endif
 }
 
 void setLinkage(LinkageWithCOMDAT lwc, llvm::GlobalObject *obj) {