diff options
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp | 15 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/Generic/dwarf-public-names.ll | 2 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/2010-04-13-PubType.ll | 2 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/c-type-units.ll | 2 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll | 17 |
5 files changed, 11 insertions, 27 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp index 3892d06e9b0..8b732765bf3 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp @@ -52,16 +52,6 @@ using namespace llvm; -enum DefaultOnOff { Default, Enable, Disable }; - -static cl::opt<DefaultOnOff> -DwarfPubSections("generate-dwarf-pub-sections", cl::Hidden, - cl::desc("Generate DWARF pubnames and pubtypes sections"), - cl::values(clEnumVal(Default, "Default for platform"), - clEnumVal(Enable, "Enabled"), - clEnumVal(Disable, "Disabled")), - cl::init(Default)); - DwarfCompileUnit::DwarfCompileUnit(unsigned UID, const DICompileUnit *Node, AsmPrinter *A, DwarfDebug *DW, DwarfFile *DWU) @@ -771,10 +761,7 @@ bool DwarfCompileUnit::hasDwarfPubSections() const { if (CUNode->getGnuPubnames()) return true; - if (DwarfPubSections == Default) - return DD->tuneForGDB() && !includeMinimalInlineScopes(); - - return DwarfPubSections == Enable; + return DD->tuneForGDB() && !includeMinimalInlineScopes(); } /// addGlobalName - Add a new global name to the compile unit. diff --git a/llvm/test/DebugInfo/Generic/dwarf-public-names.ll b/llvm/test/DebugInfo/Generic/dwarf-public-names.ll index f2472a928e1..005c731130e 100644 --- a/llvm/test/DebugInfo/Generic/dwarf-public-names.ll +++ b/llvm/test/DebugInfo/Generic/dwarf-public-names.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: %llc_dwarf -generate-dwarf-pub-sections=Enable -filetype=obj -o %t.o < %s +; RUN: %llc_dwarf -debugger-tune=gdb -filetype=obj -o %t.o < %s ; RUN: llvm-dwarfdump -debug-pubnames %t.o | FileCheck %s ; ModuleID = 'dwarf-public-names.cpp' ; diff --git a/llvm/test/DebugInfo/X86/2010-04-13-PubType.ll b/llvm/test/DebugInfo/X86/2010-04-13-PubType.ll index 820086af9f1..1d2c1af2773 100644 --- a/llvm/test/DebugInfo/X86/2010-04-13-PubType.ll +++ b/llvm/test/DebugInfo/X86/2010-04-13-PubType.ll @@ -1,4 +1,4 @@ -; RUN: llc -O0 -asm-verbose -mtriple=x86_64-macosx -generate-dwarf-pub-sections=Enable < %s | FileCheck %s +; RUN: llc -O0 -asm-verbose -mtriple=x86_64-macosx -debugger-tune=gdb < %s | FileCheck %s ; CHECK-NOT: .asciz "X" ## External Name ; CHECK: .asciz "Y" ## External Name ; Test to check type with no definition is listed in pubtypes section. diff --git a/llvm/test/DebugInfo/X86/c-type-units.ll b/llvm/test/DebugInfo/X86/c-type-units.ll index 66e28c299f8..f3308b05778 100644 --- a/llvm/test/DebugInfo/X86/c-type-units.ll +++ b/llvm/test/DebugInfo/X86/c-type-units.ll @@ -1,6 +1,6 @@ ; REQUIRES: object-emission -; RUN: llc -o - %s -filetype=obj -O0 -generate-dwarf-pub-sections=Disable -generate-type-units -mtriple=x86_64-unknown-linux-gnu | llvm-dwarfdump -debug-types - | FileCheck %s +; RUN: llc -o - %s -filetype=obj -O0 -debugger-tune=lldb -generate-type-units -mtriple=x86_64-unknown-linux-gnu | llvm-dwarfdump -debug-types - | FileCheck %s ; struct foo { ; } f; diff --git a/llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll b/llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll index 2cd37a54f84..c4207afec81 100644 --- a/llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll +++ b/llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll @@ -1,5 +1,4 @@ -; RUN: sed -e 's/gnuPubnames: false/gnuPubnames: true/' %s | llc -mtriple=x86_64-pc-linux-gnu -filetype=obj | llvm-dwarfdump -v - | FileCheck --check-prefix=GPUB --check-prefix=CHECK %s -; RUN: llc -mtriple=x86_64-pc-linux-gnu -filetype=obj < %s -generate-dwarf-pub-sections=Enable | llvm-dwarfdump -v - | FileCheck --check-prefix=PUB --check-prefix=CHECK %s +; RUN: sed -e 's/gnuPubnames: false/gnuPubnames: true/' %s | llc -mtriple=x86_64-pc-linux-gnu -filetype=obj | llvm-dwarfdump -v - | FileCheck --check-prefix=GPUB %s ; RUN: llc -mtriple=x86_64-pc-linux-gnu -filetype=obj < %s | llvm-dwarfdump -v - | FileCheck --check-prefix=NONE %s ; Generated from: @@ -16,16 +15,14 @@ ; GPUB: DW_AT_GNU_pubnames ; GPUB: .debug_gnu_pubnames contents: -; PUB: .debug_pubnames contents: -; CHECK-NEXT: unit_offset = 0x00000000 -; CHECK-NEXT: Name -; CHECK-NEXT: "f2" -; CHECK-NEXT: "f3" +; GPUB-NEXT: unit_offset = 0x00000000 +; GPUB-NEXT: Name +; GPUB-NEXT: "f2" +; GPUB-NEXT: "f3" ; GPUB: .debug_gnu_pubtypes contents: -; PUB: .debug_pubtypes contents: -; CHECK-NEXT: length = 0x0000000e version = 0x0002 unit_offset = 0x00000000 -; CHECK-NEXT: Name +; GPUB-NEXT: length = 0x0000000e version = 0x0002 unit_offset = 0x00000000 +; GPUB-NEXT: Name ; NONE: .debug_pubnames contents: ; NONE: {{^$}} |
