Author: hans
Date: Thu Feb 22 01:23:24 2018
New Revision: 325758
URL: http://llvm.org/viewvc/llvm-project?rev=325758&view=rev
Log:
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.
------------------------------------------------------------------------
Modified:
lld/branches/release_60/ (props changed)
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:23:24 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
+/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
Modified: lld/branches/release_60/ELF/Options.td
URL:
http://llvm.org/viewvc/llvm-project/lld/branches/release_60/ELF/Options.td?rev=325758&r1=325757&r2=325758&view=diff
==============================================================================
--- lld/branches/release_60/ELF/Options.td (original)
+++ lld/branches/release_60/ELF/Options.td Thu Feb 22 01:23:24 2018
@@ -351,7 +351,6 @@ def alias_filter: Separate<["-"], "F">,
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>;
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=325758&r1=325757&r2=325758&view=diff
==============================================================================
--- lld/branches/release_60/test/ELF/pie.s (original)
+++ lld/branches/release_60/test/ELF/pie.s Thu Feb 22 01:23:24 2018
@@ -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
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
