Index: ELF/Driver.cpp =================================================================== --- ELF/Driver.cpp +++ ELF/Driver.cpp @@ -344,6 +344,18 @@ return false; } +static bool shouldDemangle(opt::InputArgList &Args) { + if (auto *Arg = Args.getLastArg(OPT_demangle, OPT_no_demangle)) + return Arg->getOption().getID() == OPT_demangle; + return true; +} + +static bool shouldUseTarget1Rel(opt::InputArgList &Args) { + if (auto *Arg = Args.getLastArg(OPT_target1_abs, OPT_target1_rel)) + return Arg->getOption().getID() == OPT_target1_rel; + return false; +} + // Initializes Config members by the command line options. void LinkerDriver::readConfigs(opt::InputArgList &Args) { for (auto *Arg : Args.filtered(OPT_L)) @@ -365,7 +377,7 @@ Config->AllowMultipleDefinition = Args.hasArg(OPT_allow_multiple_definition); Config->Bsymbolic = Args.hasArg(OPT_Bsymbolic); Config->BsymbolicFunctions = Args.hasArg(OPT_Bsymbolic_functions); - Config->Demangle = !Args.hasArg(OPT_no_demangle); + Config->Demangle = shouldDemangle(Args); Config->DisableVerify = Args.hasArg(OPT_disable_verify); Config->DiscardAll = Args.hasArg(OPT_discard_all); Config->DiscardLocals = Args.hasArg(OPT_discard_locals); @@ -385,7 +397,7 @@ Config->Shared = Args.hasArg(OPT_shared); Config->StripAll = Args.hasArg(OPT_strip_all); Config->StripDebug = Args.hasArg(OPT_strip_debug); - Config->Target1Rel = Args.hasArg(OPT_target1_rel); + Config->Target1Rel = shouldUseTarget1Rel(Args); Config->Threads = Args.hasArg(OPT_threads); Config->Trace = Args.hasArg(OPT_trace); Config->Verbose = Args.hasArg(OPT_verbose); Index: test/ELF/arm-target1.s =================================================================== --- test/ELF/arm-target1.s +++ test/ELF/arm-target1.s @@ -7,6 +7,12 @@ // RUN: not ld.lld -shared %t.o -o %t3.so 2>&1 | FileCheck %s \ // RUN: --check-prefix=ABS +// RUN: ld.lld -shared %t.o -o %t2.so --target1-abs --target1-rel +// RUN: llvm-objdump -t -d %t2.so | FileCheck %s \ +// RUN: --check-prefix=RELATIVE +// RUN: not ld.lld -shared %t.o -o %t3.so --target1-rel --target1-abs 2>&1 \ +// RUN: | FileCheck %s --check-prefix=ABS + // RELOC: Relocations [ // RELOC: .rel.text { // RELOC: 0x0 R_ARM_TARGET1 patatino 0x0 Index: test/ELF/conflict.s =================================================================== --- test/ELF/conflict.s +++ test/ELF/conflict.s @@ -12,6 +12,11 @@ # NO_DEMANGLE: duplicate symbol: _Z3muldd in # NO_DEMANGLE: duplicate symbol: foo in +# RUN: not ld.lld %t1.o %t1.o -o %t2 --demangle --no-demangle 2>&1 | \ +# RUN: FileCheck -check-prefix=NO_DEMANGLE %s +# RUN: not ld.lld %t1.o %t1.o -o %t2 --no-demangle --demangle 2>&1 | \ +# RUN: FileCheck -check-prefix=DEMANGLE %s + # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/conflict.s -o %t2.o # RUN: llvm-ar rcs %t3.a %t2.o # RUN: not ld.lld %t1.o %t3.a -u baz -o %t2 2>&1 | FileCheck -check-prefix=ARCHIVE %s