Delete ForceEnableGlobalMergeExternalGlobals as it's redundant with global-merge-on-external (thanks Craig!)

Author: asb

llvm/lib/Target/RISCV/RISCVTargetMachine.cpp

@@ -51,10 +51,6 @@ static cl::opt<cl::boolOrDefault>
     EnableGlobalMerge("riscv-enable-global-merge", cl::Hidden,
                       cl::desc("Enable the global merge pass"));
 
-static cl::opt<bool> DisableGlobalMergeExternalGlobals(
-    "riscv-disable-global-merge-external-globals", cl::Hidden, cl::init(false),
-    cl::desc("Disable global merging of external globals"));
-
 static cl::opt<bool>
     EnableMachineCombiner("riscv-enable-machine-combiner",
                           cl::desc("Enable the machine combiner pass"),
@@ -480,8 +476,7 @@ bool RISCVPassConfig::addPreISel() {
     // Investigating and addressing both items are TODO.
     addPass(createGlobalMergePass(TM, /* MaxOffset */ 2047,
                                   /* OnlyOptimizeForSize */ false,
-                                  /* MergeExternalByDefault */
-                                  !DisableGlobalMergeExternalGlobals));
+                                  /* MergeExternalByDefault */ true));
   }
 
   return false;

llvm/test/CodeGen/RISCV/global-merge.ll

@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc -mtriple=riscv32 -riscv-disable-global-merge-external-globals \
+; RUN: llc -mtriple=riscv32 -global-merge-on-external=false \
 ; RUN:     -verify-machineinstrs < %s | FileCheck %s
-; RUN: llc -mtriple=riscv64 -riscv-disable-global-merge-external-globals \
+; RUN: llc -mtriple=riscv64 -global-merge-on-external=false \
 ; RUN:     -verify-machineinstrs < %s | FileCheck %s
 ; RUN: llc -mtriple=riscv32 -verify-machineinstrs < %s \
 ; RUN:   | FileCheck -check-prefix=CHECK-WEXTERN %s