[llvm-branch-commits] [lld] r324100 - Merging r324043:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Feb  2 08:01:07 2018
New Revision: 324100

URL: http://llvm.org/viewvc/llvm-project?rev=324100&view=rev
Log:
Merging r324043:
------------------------------------------------------------------------
r324043 | ruiu | 2018-02-02 01:31:05 +0100 (Fri, 02 Feb 2018) | 6 lines

Fix typo: --nopie -> --no-pie.

--nopie was a typo. GNU gold doesn't recognize it. It is also
inconsistent with other options that have --foo and --no-foo.

Differential Revision: https://reviews.llvm.org/D42825
------------------------------------------------------------------------

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 Fri Feb  2 08:01:07 2018
@@ -1 +1 @@
-/lld/trunk:321983,321986,322041,322259,322264,322359,322421,322801,323155,323221,323243,323288,323395-323396,323399,323440,323449,323456,323625
+/lld/trunk:321983,321986,322041,322259,322264,322359,322421,322801,323155,323221,323243,323288,323395-323396,323399,323440,323449,323456,323625,324043

Modified: lld/branches/release_60/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/ELF/Driver.cpp?rev=324100&r1=324099&r2=324100&view=diff
==============================================================================
--- lld/branches/release_60/ELF/Driver.cpp (original)
+++ lld/branches/release_60/ELF/Driver.cpp Fri Feb  2 08:01:07 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_nopie, false);
+  Config->Pie = Args.hasFlag(OPT_pie, OPT_no_pie, 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=324100&r1=324099&r2=324100&view=diff
==============================================================================
--- lld/branches/release_60/ELF/Options.td (original)
+++ lld/branches/release_60/ELF/Options.td Fri Feb  2 08:01:07 2018
@@ -202,6 +202,8 @@ 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">;
 
@@ -211,8 +213,6 @@ 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=324100&r1=324099&r2=324100&view=diff
==============================================================================
--- lld/branches/release_60/test/ELF/pie.s (original)
+++ lld/branches/release_60/test/ELF/pie.s Fri Feb  2 08:01:07 2018
@@ -48,7 +48,7 @@
 # CHECK:         Type: PT_DYNAMIC
 
 ## Check -nopie
-# RUN: ld.lld -nopie %t1.o -o %t2
+# RUN: ld.lld -no-pie %t1.o -o %t2
 # RUN: llvm-readobj -file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
 # NOPIE-NOT: Type: SharedObject