[lld] r326498 - Don't ingoned --enable-new-dtags.

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Thu Mar 1 14:23:51 PST 2018


Author: rafael
Date: Thu Mar  1 14:23:51 2018
New Revision: 326498

URL: http://llvm.org/viewvc/llvm-project?rev=326498&view=rev
Log:
Don't ingoned --enable-new-dtags.

Modified:
    lld/trunk/ELF/Driver.cpp
    lld/trunk/test/ELF/new-dtags.test

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=326498&r1=326497&r2=326498&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Thu Mar  1 14:23:51 2018
@@ -626,7 +626,8 @@ void LinkerDriver::readConfigs(opt::Inpu
   Config->EhFrameHdr =
       Args.hasFlag(OPT_eh_frame_hdr, OPT_no_eh_frame_hdr, false);
   Config->EmitRelocs = Args.hasArg(OPT_emit_relocs);
-  Config->EnableNewDtags = !Args.hasArg(OPT_disable_new_dtags);
+  Config->EnableNewDtags =
+      Args.hasFlag(OPT_enable_new_dtags, OPT_disable_new_dtags, true);
   Config->Entry = Args.getLastArgValue(OPT_entry);
   Config->ExportDynamic =
       Args.hasFlag(OPT_export_dynamic, OPT_no_export_dynamic, false);

Modified: lld/trunk/test/ELF/new-dtags.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/new-dtags.test?rev=326498&r1=326497&r2=326498&view=diff
==============================================================================
--- lld/trunk/test/ELF/new-dtags.test (original)
+++ lld/trunk/test/ELF/new-dtags.test Thu Mar  1 14:23:51 2018
@@ -1,8 +1,12 @@
 # REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -rpath=/somepath -shared --disable-new-dtags -o %t
-// RUN: ld.lld %t.o -rpath=/somepath -shared --enable-new-dtags -o %t2
 // RUN: llvm-readobj --dynamic-table %t | FileCheck --check-prefix=DISABLE %s
+
+// RUN: ld.lld %t.o -rpath=/somepath -shared --enable-new-dtags -o %t2
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=ENABLE %s
+
+// RUN: ld.lld %t.o -rpath=/somepath -shared --disable-new-dtags --enable-new-dtags -o %t2
 // RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=ENABLE %s
 
 // DISABLE: DynamicSection [




More information about the llvm-commits mailing list