Commit 90e00e47 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r325714: 

------------------------------------------------------------------------
r325714 | ruiu | 2018-02-21 21:08:14 +0100 (Wed, 21 Feb 2018) | 6 lines

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

This reverts commit r325679 that was committed without discussion.
Actually, in the discussion thread, most people opposed to have this
option in lld. Reverting that change doesn't mean that this is a
final decision, but that needs to be discussed first.
------------------------------------------------------------------------

llvm-svn: 325758
parent 93feb90b

lld/ELF/Options.td

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ 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

+1 −3
Original line number Diff line number Diff line
@@ -47,11 +47,9 @@ 


# CHECK:         Type: PT_DYNAMIC



## Check -no-pie

## Check -nopie

# 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