[llvm-branch-commits] [lld] r325680 - Merging r325679:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Feb 21 05:58:32 2018
New Revision: 325680

URL: http://llvm.org/viewvc/llvm-project?rev=325680&view=rev
Log:
Merging r325679:
------------------------------------------------------------------------
r325679 | hans | 2018-02-21 14:54:26 +0100 (Wed, 21 Feb 2018) | 9 lines

[ELF] Add -nopie alias for -no-pie (PR36423)

In r324043, --nopie was renamed to --no-pie to presumably fix a typo.

As it turns out, "nopie" wasn't a typo but the spelling used by
OpenBSD's binutils ld. Gold on the other hand spells the flag "no-pie".
(Vanilla binutils doesn't have a flag like this at all.)

Since they do the same thing, let's support both spellings.
------------------------------------------------------------------------

Modified:
    lld/branches/release_60/   (props changed)
    lld/branches/release_60/ELF/Options.td
    lld/branches/release_60/test/ELF/pie.s

Propchange: lld/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 21 05:58:32 2018
@@ -1 +1 @@
-/lld/trunk:321983,321986,322041,322259,322264,322359,322421,322801,323155,323221,323243,323288,323395-323396,323399,323440,323449,323456,323625,323893,323895,324043,324467-324468,325204
+/lld/trunk:321983,321986,322041,322259,322264,322359,322421,322801,323155,323221,323243,323288,323395-323396,323399,323440,323449,323456,323625,323893,323895,324043,324467-324468,325204,325679

Modified: lld/branches/release_60/ELF/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/ELF/Options.td?rev=325680&r1=325679&r2=325680&view=diff
==============================================================================
--- lld/branches/release_60/ELF/Options.td (original)
+++ lld/branches/release_60/ELF/Options.td Wed Feb 21 05:58:32 2018
@@ -351,6 +351,7 @@ def alias_filter: Separate<["-"], "F">,
 def alias_format_b: S<"b">, Alias<format>;
 def alias_library: JoinedOrSeparate<["-"], "l">, Alias<library>;
 def alias_library_path: JoinedOrSeparate<["-"], "L">, Alias<library_path>;
+def alias_nopie: F<"nopie">, Alias<no_pie>;
 def alias_omagic: Flag<["-"], "N">, Alias<omagic>;
 def alias_o_output: Joined<["--"], "output=">, Alias<o>;
 def alias_o_output2 : Separate<["--"], "output">, Alias<o>;

Modified: lld/branches/release_60/test/ELF/pie.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/test/ELF/pie.s?rev=325680&r1=325679&r2=325680&view=diff
==============================================================================
--- lld/branches/release_60/test/ELF/pie.s (original)
+++ lld/branches/release_60/test/ELF/pie.s Wed Feb 21 05:58:32 2018
@@ -47,9 +47,11 @@
 
 # CHECK:         Type: PT_DYNAMIC
 
-## Check -nopie
+## Check -no-pie
 # RUN: ld.lld -no-pie %t1.o -o %t2
 # RUN: llvm-readobj -file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
+# RUN: ld.lld -nopie %t1.o -o %t2
+# RUN: llvm-readobj -file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
 # NOPIE-NOT: Type: SharedObject
 
 .globl _start