Commit f5b07235 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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.
------------------------------------------------------------------------

llvm-svn: 325680
parent 379a6f88

lld/ELF/Options.td

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ def alias_filter: Separate<["-"], "F">, Alias<filter>; 
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>;

lld/test/ELF/pie.s

+3 −1
Original line number Diff line number Diff line
@@ -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