[lld] r250807 - Reverts r250775 as it breaks self-hosting.

[George Rimar via llvm-commits]

Author: grimar
Date: Tue Oct 20 03:49:43 2015
New Revision: 250807

URL: http://llvm.org/viewvc/llvm-project?rev=250807&view=rev
Log:
Reverts r250775 as it breaks self-hosting.

Modified:
    lld/trunk/ELF/Driver.cpp
    lld/trunk/test/elf2/basic.s

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=250807&r1=250806&r2=250807&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Tue Oct 20 03:49:43 2015
@@ -163,8 +163,6 @@ void LinkerDriver::createFiles(opt::Inpu
       Config->ZNodelete = true;
     else if (Arg->getValue() == StringRef("now"))
       Config->ZNow = true;
-    else
-      error(Twine(Arg->getValue()) + ": unknown -z option");
   }
 
   for (auto *Arg : Args) {

Modified: lld/trunk/test/elf2/basic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic.s?rev=250807&r1=250806&r2=250807&view=diff
==============================================================================
--- lld/trunk/test/elf2/basic.s (original)
+++ lld/trunk/test/elf2/basic.s Tue Oct 20 03:49:43 2015
@@ -220,6 +220,3 @@ _start:
 
 # RUN: not ld.lld2 %t -o %t -m wrong_emul 2>&1 | FileCheck --check-prefix=UNKNOWN_EMUL %s
 # UNKNOWN_EMUL: Unknown emulation: wrong_emul
-
-# RUN: not ld.lld2 %t -o %t -z notanoption 2>&1 | FileCheck --check-prefix=UNKNOWN_ZOPT %s
-# UNKNOWN_ZOPT: notanoption: unknown -z option