r250173 - Always pass a -dwarf-version argument to integrated as.
Douglas Katzman via cfe-commits
cfe-commits at lists.llvm.org
Tue Oct 13 09:22:52 PDT 2015
Author: dougk
Date: Tue Oct 13 11:22:51 2015
New Revision: 250173
URL: http://llvm.org/viewvc/llvm-project?rev=250173&view=rev
Log:
Always pass a -dwarf-version argument to integrated as.
This removes the default of 3 hidden in the assembler previously.
Fixes breakage caused by r249655, reported by vsukharev.
Added:
cfe/trunk/test/Driver/as-default-dwarf.s
Modified:
cfe/trunk/lib/Driver/Tools.cpp
cfe/trunk/tools/driver/cc1as_main.cpp
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=250173&r1=250172&r2=250173&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Tue Oct 13 11:22:51 2015
@@ -5632,10 +5632,11 @@ void ClangAs::ConstructJob(Compilation &
if (Arg *A = Args.getLastArg(options::OPT_g_Group)) {
WantDebug = !A->getOption().matches(options::OPT_g0);
if (WantDebug) {
- if ((DwarfVersion = DwarfVersionNum(A->getSpelling())) == 0)
- DwarfVersion = getToolChain().GetDefaultDwarfVersion();
+ DwarfVersion = DwarfVersionNum(A->getSpelling());
}
}
+ if (DwarfVersion == 0)
+ DwarfVersion = getToolChain().GetDefaultDwarfVersion();
RenderDebugEnablingArgs(Args, CmdArgs,
(WantDebug ? CodeGenOptions::LimitedDebugInfo
: CodeGenOptions::NoDebugInfo),
Added: cfe/trunk/test/Driver/as-default-dwarf.s
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/as-default-dwarf.s?rev=250173&view=auto
==============================================================================
--- cfe/trunk/test/Driver/as-default-dwarf.s (added)
+++ cfe/trunk/test/Driver/as-default-dwarf.s Tue Oct 13 11:22:51 2015
@@ -0,0 +1,15 @@
+@ REQUIRES: arm-registered-target
+@ RUN: %clang --target=armv8a--linux-gnueabi -c %s -o %t
+@ RUN: llvm-objdump -t %t | FileCheck %s
+ .text
+ .type foo,%function
+foo:
+ .fnstart
+ .cfi_startproc
+
+.Ltmp2:
+ .size foo, .Ltmp2-foo
+ .cfi_endproc
+ .fnend
+ .cfi_sections .debug_frame
+@ CHECK: foo
Modified: cfe/trunk/tools/driver/cc1as_main.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=250173&r1=250172&r2=250173&view=diff
==============================================================================
--- cfe/trunk/tools/driver/cc1as_main.cpp (original)
+++ cfe/trunk/tools/driver/cc1as_main.cpp Tue Oct 13 11:22:51 2015
@@ -144,7 +144,7 @@ public:
RelaxAll = 0;
NoExecStack = 0;
FatalWarnings = 0;
- DwarfVersion = 3;
+ DwarfVersion = 0;
}
static bool CreateFromArgs(AssemblerInvocation &Res,
More information about the cfe-commits
mailing list