[lld] r324043 - Fix typo: --nopie -> --no-pie.

[Hans Wennborg via llvm-commits]

Actually, this broke OpenBSD (PR36423), so I've followed up with
r325679 and r325680. Please let me know if there are any issues.

On Fri, Feb 2, 2018 at 5:02 PM, Hans Wennborg <hans at chromium.org> wrote:
> r324100.
>
> Thanks!
>
> On Fri, Feb 2, 2018 at 4:23 PM, Rafael Avila de Espindola
> <rafael.espindola at gmail.com> wrote:
>> We should probably port this to 6.0.
>>
>> Cheers,
>> Rafael
>>
>> On February 1, 2018 4:31:05 PM PST, Rui Ueyama via llvm-commits
>> <llvm-commits at lists.llvm.org> wrote:
>>>
>>> Author: ruiu
>>> Date: Thu Feb  1 16:31:05 2018
>>> New Revision: 324043
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=324043&view=rev
>>> Log:
>>> 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/trunk/ELF/Driver.cpp
>>>     lld/trunk/ELF/Options.td
>>>     lld/trunk/test/ELF/pie.s
>>>
>>> Modified: lld/trunk/ELF/Driver.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=324043&r1=324042&r2=324043&view=diff
>>> ________________________________
>>> --- lld/trunk/ELF/Driver.cpp (original)
>>> +++ lld/trunk/ELF/Driver.cpp Thu Feb  1 16:31:05 2018
>>> @@ -646,7 +646,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->PrintIcfSections =
>>>        Args.hasFlag(OPT_print_icf_sections, OPT_no_print_icf_sections,
>>> false);
>>>    Config->PrintGcSections =
>>>
>>> Modified: lld/trunk/ELF/Options.td
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Options.td?rev=324043&r1=324042&r2=324043&view=diff
>>> ________________________________
>>> --- lld/trunk/ELF/Options.td (original)
>>> +++ lld/trunk/ELF/Options.td Thu Feb  1 16:31:05 2018
>>> @@ -205,6 +205,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">;
>>>
>>> @@ -214,8 +216,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/trunk/test/ELF/pie.s
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pie.s?rev=324043&r1=324042&r2=324043&view=diff
>>> ________________________________
>>> --- lld/trunk/test/ELF/pie.s (original)
>>> +++ lld/trunk/test/ELF/pie.s Thu Feb  1 16:31:05 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
>>> ________________________________
>>> llvm-commits mailing list
>>> llvm-commits at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>
>>
>> --
>> Sent from my Android device with K-9 Mail. Please excuse my brevity.