From ee39d331750d307a699b870202572dd3e24d0a1e Mon Sep 17 00:00:00 2001
From: Shankar Easwaran <shankare@codeaurora.org>
Date: Wed, 1 Apr 2015 03:06:59 +0000
Subject: [PATCH] [Gnu] Support an other form of defsym option

llvm-svn: 233782
---
 lld/lib/Driver/GnuLdOptions.td | 17 ++++++++++++++---
 lld/test/elf/defsym.objtxt     |  3 +++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lld/lib/Driver/GnuLdOptions.td b/lld/lib/Driver/GnuLdOptions.td
index 9d06f2935439..83555d33d1e3 100644
--- a/lld/lib/Driver/GnuLdOptions.td
+++ b/lld/lib/Driver/GnuLdOptions.td
@@ -25,6 +25,15 @@ multiclass dashEq<string opt1, string opt2, string help> {
       Alias<!cast<Option>(opt1)>;
 }
 
+// Support --<option>,--<option>=
+multiclass mDashEq<string opt1, string help> {
+  // Option
+  def "" : Separate<["--"], opt1>, HelpText<help>;
+  // Compatibility aliases
+  def opt2_eq : Joined<["--"], opt1#"=">,
+      Alias<!cast<Option>(opt1)>;
+}
+
 //===----------------------------------------------------------------------===//
 /// LLVM and Target options
 //===----------------------------------------------------------------------===//
@@ -211,9 +220,11 @@ def use_shlib_undefs: Flag<["--"], "use-shlib-undefines">,
 def allow_multiple_definition: Flag<["--"], "allow-multiple-definition">,
     HelpText<"Allow multiple definitions">,
     Group<grp_resolveropt>;
-def defsym : Joined<["--"], "defsym=">,
-     HelpText<"Create a defined symbol">,
-     Group<grp_resolveropt>;
+defm defsym : mDashEq<"defsym",
+           "Create a global symbol in the output file "
+           "containing the absolute address given by expression">,
+           MetaVarName<"symbol=<expression>">,
+           Group<grp_resolveropt>;
 
 //===----------------------------------------------------------------------===//
 /// Custom Options
diff --git a/lld/test/elf/defsym.objtxt b/lld/test/elf/defsym.objtxt
index 96a392ed3160..f2b3fcf5c008 100644
--- a/lld/test/elf/defsym.objtxt
+++ b/lld/test/elf/defsym.objtxt
@@ -4,6 +4,9 @@
 # RUN: lld -flavor gnu -target x86_64 --defsym=foo=main -r %s \
 # RUN:     --output-filetype=yaml | FileCheck -check-prefix=ALIAS %s
 
+# RUN: lld -flavor gnu -target x86_64 --defsym foo=main -r %s \
+# RUN:     --output-filetype=yaml | FileCheck -check-prefix=ALIAS %s
+
 defined-atoms:
   - name:            main
     scope:           global