[PATCH] D88461: [ELF] Fix multiple -mllvm after D70378

[Fangrui Song via Phabricator via llvm-commits]

MaskRay updated this revision to Diff 295034.
MaskRay added a comment.

Move ResetAllOptionOccurrences


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D88461/new/

https://reviews.llvm.org/D88461

Files:
  lld/ELF/Driver.cpp
  lld/test/ELF/lto/mllvm.ll


Index: lld/test/ELF/lto/mllvm.ll
===================================================================
--- /dev/null
+++ lld/test/ELF/lto/mllvm.ll
@@ -0,0 +1,24 @@
+; REQUIRES: x86
+; RUN: llvm-as %s -o %t.o
+; RUN: ld.lld %t.o -o %t -mllvm -mcpu=znver1 -mllvm -debug-pass=Structure -mllvm -print-after-all 2>&1 | FileCheck %s
+; RUN: llvm-objdump -d -j .text %t | FileCheck %s --check-prefix=DISASM
+
+;; We support -plugin-opt=- for LLVMgold.so compatibility. With a few exceptions,
+;; most -plugin-opt=- prefixed options are passed through to cl::ParseCommandLineOptions.
+; RUN: ld.lld %t.o -o %t -plugin-opt=-debug-pass=Structure -plugin-opt=-print-after-all 2>&1 | FileCheck %s
+
+; CHECK: Pass Arguments:
+; CHECK: # *** IR Dump
+
+; DISASM: nopw
+
+target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+
+define void @_start() #0 {
+entry:
+  call void asm sideeffect ".p2align 4, 0x90", "~{dirflag},~{fpsr},~{flags}"()
+  ret void
+}
+
+attributes #0 = { "frame-pointer"="all" }
Index: lld/ELF/Driver.cpp
===================================================================
--- lld/ELF/Driver.cpp
+++ lld/ELF/Driver.cpp
@@ -895,7 +895,6 @@
   raw_string_ostream os(err);
 
   const char *argv[] = {config->progName.data(), opt.data()};
-  cl::ResetAllOptionOccurrences();
   if (cl::ParseCommandLineOptions(2, argv, "", &os))
     return;
   os.flush();
@@ -1105,6 +1104,8 @@
       error(errPrefix + toString(pat.takeError()));
   }
 
+  cl::ResetAllOptionOccurrences();
+
   // Parse LTO options.
   if (auto *arg = args.getLastArg(OPT_plugin_opt_mcpu_eq))
     parseClangOption(saver.save("-mcpu=" + StringRef(arg->getValue())),


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D88461.295034.patch
Type: text/x-patch
Size: 1723 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200929/a968166d/attachment.bin>