[lld] r325759 - Revert r324100 "Merging r324043: Fix typo: --nopie -> --no-pie."

[Hans Wennborg via llvm-commits]

Author: hans
Date: Thu Feb 22 01:26:44 2018
New Revision: 325759

URL: http://llvm.org/viewvc/llvm-project?rev=325759&view=rev
Log:
Revert r324100 "Merging r324043: Fix typo: --nopie -> --no-pie."

This broke OpenBSD (PR36423). Revert back to the behaviour at the branch point
(which matches lld 5.0.1) and let the correct spelling be figured out on trunk.

Modified:
    lld/branches/release_60/   (props changed)
    lld/branches/release_60/ELF/Driver.cpp
    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 Thu Feb 22 01:26:44 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,325679,325714
+/lld/trunk:321983,321986,322041,322259,322264,322359,322421,322801,323155,323221,323243,323288,323395-323396,323399,323440,323449,323456,323625,323893,323895,324467-324468,325204,325679,325714

Modified: lld/branches/release_60/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/ELF/Driver.cpp?rev=325759&r1=325758&r2=325759&view=diff
==============================================================================
--- lld/branches/release_60/ELF/Driver.cpp (original)
+++ lld/branches/release_60/ELF/Driver.cpp Thu Feb 22 01:26:44 2018
@@ -638,7 +638,7 @@ void LinkerDriver::readConfigs(opt::Inpu
   Config->Optimize = args::getInteger(Args, OPT_O, 1);
   Config->OrphanHandling = getOrphanHandling(Args);
   Config->OutputFile = Args.getLastArgValue(OPT_o);
-  Config->Pie = Args.hasFlag(OPT_pie, OPT_no_pie, false);
+  Config->Pie = Args.hasFlag(OPT_pie, OPT_nopie, false);
   Config->PrintGcSections =
       Args.hasFlag(OPT_print_gc_sections, OPT_no_print_gc_sections, false);
   Config->Rpath = getRpath(Args);

Modified: lld/branches/release_60/ELF/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/ELF/Options.td?rev=325759&r1=325758&r2=325759&view=diff
==============================================================================
--- lld/branches/release_60/ELF/Options.td (original)
+++ lld/branches/release_60/ELF/Options.td Thu Feb 22 01:26:44 2018
@@ -202,8 +202,6 @@ def no_gnu_unique: F<"no-gnu-unique">,
 def no_merge_exidx_entries: F<"no-merge-exidx-entries">,
   HelpText<"Disable merging .ARM.exidx entries">;
 
-def no_pie: F<"no-pie">, HelpText<"Do not create a position independent executable">;
-
 def no_threads: F<"no-threads">,
   HelpText<"Do not run the linker multi-threaded">;
 
@@ -213,6 +211,8 @@ def no_whole_archive: F<"no-whole-archiv
 def noinhibit_exec: F<"noinhibit-exec">,
   HelpText<"Retain the executable output file whenever it is still usable">;
 
+def nopie: F<"nopie">, HelpText<"Do not create a position independent executable">;
+
 def no_omagic: Flag<["--"], "no-omagic">, MetaVarName<"<magic>">,
   HelpText<"Do not set the text data sections to be writable">;
 

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=325759&r1=325758&r2=325759&view=diff
==============================================================================
--- lld/branches/release_60/test/ELF/pie.s (original)
+++ lld/branches/release_60/test/ELF/pie.s Thu Feb 22 01:26:44 2018
@@ -48,7 +48,7 @@
 # CHECK:         Type: PT_DYNAMIC
 
 ## Check -nopie
-# RUN: ld.lld -no-pie %t1.o -o %t2
+# RUN: ld.lld -nopie %t1.o -o %t2
 # RUN: llvm-readobj -file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
 # NOPIE-NOT: Type: SharedObject