From 248e3450fb8a1ab7146c0cbe8f0ea7204782f542 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Wed, 30 Dec 2020 23:02:01 +0200 Subject: [PATCH] [LLD] [MinGW] Pass the --demangle and --no-demangle options to the COFF linker Differential Revision: https://reviews.llvm.org/D93950 --- lld/MinGW/Driver.cpp | 5 +++++ lld/MinGW/Options.td | 3 +++ lld/test/MinGW/driver.test | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp index fae5cb7..f8eb4e7 100644 --- a/lld/MinGW/Driver.cpp +++ b/lld/MinGW/Driver.cpp @@ -320,6 +320,11 @@ bool mingw::link(ArrayRef argsArr, bool canExitEarly, else add("-opt:noref"); + if (args.hasFlag(OPT_demangle, OPT_no_demangle, true)) + add("-demangle"); + else + add("-demangle:no"); + if (args.hasFlag(OPT_enable_auto_import, OPT_disable_auto_import, true)) add("-auto-import"); else diff --git a/lld/MinGW/Options.td b/lld/MinGW/Options.td index 7bc5936..95b6195 100644 --- a/lld/MinGW/Options.td +++ b/lld/MinGW/Options.td @@ -28,6 +28,9 @@ defm allow_multiple_definition: B<"allow-multiple-definition", "Do not allow multiple definitions (default)">; def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries">; def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">; +defm demangle: B<"demangle", + "Demangle symbol names (default)", + "Do not demangle symbol names">; def disable_auto_import: F<"disable-auto-import">, HelpText<"Don't automatically import data symbols from other DLLs without dllimport">; def disable_runtime_pseudo_reloc: F<"disable-runtime-pseudo-reloc">, diff --git a/lld/test/MinGW/driver.test b/lld/test/MinGW/driver.test index 015c269..33503d4 100644 --- a/lld/test/MinGW/driver.test +++ b/lld/test/MinGW/driver.test @@ -285,3 +285,12 @@ NO_ALLOW_MULTIPLE_DEFINITION-NOT: -force:multiple RUN: ld.lld -### -m i386pep foo.o -wrap foo1 --wrap foo2 | FileCheck -check-prefix WRAP %s RUN: ld.lld -### -m i386pep foo.o -wrap=foo1 --wrap=foo2 | FileCheck -check-prefix WRAP %s WRAP: -wrap:foo1 -wrap:foo2 + +RUN: ld.lld -### -m i386pep foo.o | FileCheck -check-prefix DEMANGLE %s +RUN: ld.lld -### -m i386pep foo.o -demangle | FileCheck -check-prefix DEMANGLE %s +RUN: ld.lld -### -m i386pep foo.o --demangle | FileCheck -check-prefix DEMANGLE %s +DEMANGLE: -demangle{{ }} + +RUN: ld.lld -### -m i386pep foo.o -no-demangle | FileCheck -check-prefix NO-DEMANGLE %s +RUN: ld.lld -### -m i386pep foo.o --no-demangle | FileCheck -check-prefix NO-DEMANGLE %s +NO-DEMANGLE: -demangle:no -- 2.7.4