diff --git a/build/build-clang/clang-18.json b/build/build-clang/clang-18.json index 29aeb128cb72..69ea6df16826 100644 --- a/build/build-clang/clang-18.json +++ b/build/build-clang/clang-18.json @@ -6,9 +6,6 @@ "unpoison-thread-stacks_clang_10.patch", "downgrade-mangling-error_clang_12.patch", "fuzzing_ccov_build_clang_12.patch", - "revert-llvmorg-18-init-6208-g2baf4a06ef06.patch", - "revert-llvmorg-18-init-6193-gb88cffeafd39.patch", - "revert-llvmorg-18-init-6188-gc649f29c24c9.patch", "revert-llvmorg-16-init-11301-g163bb6d64e5f_clang_18.patch", "revert-llvmorg-15-init-13446-g7524fe962e47.patch", "llvmorg-19-init-7654-gc23135c5488f.patch", diff --git a/build/build-clang/clang-trunk.json b/build/build-clang/clang-trunk.json index c5987eb52ff5..dbebae02f571 100644 --- a/build/build-clang/clang-trunk.json +++ b/build/build-clang/clang-trunk.json @@ -6,9 +6,6 @@ "unpoison-thread-stacks_clang_10.patch", "downgrade-mangling-error_clang_12.patch", "fuzzing_ccov_build_clang_12.patch", - "revert-llvmorg-18-init-6208-g2baf4a06ef06.patch", - "revert-llvmorg-18-init-6193-gb88cffeafd39.patch", - "revert-llvmorg-18-init-6188-gc649f29c24c9.patch", "revert-llvmorg-16-init-11301-g163bb6d64e5f_clang_19.patch", "revert-llvmorg-15-init-13446-g7524fe962e47.patch", "win64-ret-null-on-commitment-limit_clang_14.patch", diff --git a/build/build-clang/revert-llvmorg-18-init-6188-gc649f29c24c9.patch b/build/build-clang/revert-llvmorg-18-init-6188-gc649f29c24c9.patch deleted file mode 100644 index 290c65f4b556..000000000000 --- a/build/build-clang/revert-llvmorg-18-init-6188-gc649f29c24c9.patch +++ /dev/null @@ -1,466 +0,0 @@ -From c3994286d37f4273d6d7a4cb578828d64a25a341 Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Wed, 20 Sep 2023 10:08:22 +0900 -Subject: [PATCH 3/3] Revert "[llvm-nm] Add --line-numbers flag" - -This reverts commit c649f29c24c9fc1502d8d53e0c96c3d24b31de1a because it -depends on cead4eceb01b935fae07bf4a7e91911b344d2fec, which we revert. ---- - llvm/docs/CommandGuide/llvm-nm.rst | 6 - - llvm/test/tools/llvm-nm/X86/line-numbers.test | 240 ------------------ - llvm/tools/llvm-nm/CMakeLists.txt | 1 - - llvm/tools/llvm-nm/Opts.td | 2 - - llvm/tools/llvm-nm/llvm-nm.cpp | 92 +------ - 6 files changed, 5 insertions(+), 339 deletions(-) - delete mode 100644 llvm/test/tools/llvm-nm/X86/line-numbers.test - -diff --git a/llvm/docs/CommandGuide/llvm-nm.rst b/llvm/docs/CommandGuide/llvm-nm.rst -index 7067bb0a29a1..4b1290a15665 100644 ---- a/llvm/docs/CommandGuide/llvm-nm.rst -+++ b/llvm/docs/CommandGuide/llvm-nm.rst -@@ -190,12 +190,6 @@ OPTIONS - - Print just the symbol names. Alias for `--format=just-symbols``. - --.. option:: --line-numbers, -l -- -- Use debugging information to print the filenames and line numbers where -- symbols are defined. Undefined symbols have the location of their first -- relocation printed instead. -- - .. option:: -m - - Use Darwin format. Alias for ``--format=darwin``. -diff --git a/llvm/test/tools/llvm-nm/X86/line-numbers.test b/llvm/test/tools/llvm-nm/X86/line-numbers.test -deleted file mode 100644 -index 4b9817ab5c62..000000000000 ---- a/llvm/test/tools/llvm-nm/X86/line-numbers.test -+++ /dev/null -@@ -1,240 +0,0 @@ --## Check that printing line numbers isn't attempted for files like bitcode, --## which have symbols but limited/no section or debug info. --# RUN: llvm-nm --line-numbers %p/Inputs/test.IRobj-x86_64 | FileCheck %s --check-prefix=BITCODE --match-full-lines --implicit-check-not={{.}} --# BITCODE: ---------------- S _global_const --# BITCODE-NEXT: ---------------- D _global_data --# BITCODE-NEXT: ---------------- T _global_func --# BITCODE-NEXT: ---------------- S _hidden_const --# BITCODE-NEXT: ---------------- D _hidden_data --# BITCODE-NEXT: ---------------- T _hidden_func --# BITCODE-NEXT: ---------------- s _static_const --# BITCODE-NEXT: ---------------- d _static_data --# BITCODE-NEXT: ---------------- t _static_func -- --## Check that various symbol types can use debug information if available to --## print line numbers, and if unavailable, don't print anything erroneous. The --## specific cases checked are given by the symbol names below. Other test cases --## place requirements on the contents of the whole file, so they are kept out --## of main.o. --# RUN: rm -rf %t --# RUN: split-file %s %t --# RUN: llvm-mc -g --filetype=obj %t/main.s -o %t/main.o --# RUN: llvm-nm -l %t/main.o | FileCheck %s --match-full-lines --implicit-check-not={{.}} --# RUN: llvm-nm --line-numbers %t/main.o | FileCheck %s --match-full-lines --implicit-check-not={{.}} -- --# CHECK: 0000000000001234 a absolute_symbol --# CHECK-NEXT: 0000000000000000 d data_no_dwarf --# CHECK-NEXT: 0000000000000000 T defined_global_function [[FILENAME:.*main.s]]:4 --# CHECK-NEXT: 0000000000000001 t defined_local_function [[FILENAME]]:7 --# CHECK-NEXT: 0000000000000000 t function_no_dwarf --# CHECK-NEXT: U undef1 [[FILENAME]]:12 --# CHECK-NEXT: U undef2 [[FILENAME]]:14 --# CHECK-NEXT: U undef_no_reloc --# CHECK-NEXT: 0000000000000002 t undefined_references [[FILENAME]]:12 -- --## Check that in the absence of DWARF in the whole object, no line number --## information is printed. --# RUN: llvm-mc --filetype=obj %t/main.s -o %t/no-dwarf.o --# RUN: llvm-nm -l %t/no-dwarf.o | FileCheck %s --check-prefix=NO-DWARF --match-full-lines --implicit-check-not={{.}} -- --# NO-DWARF: 0000000000001234 a absolute_symbol --# NO-DWARF-NEXT: 0000000000000000 d data_no_dwarf --# NO-DWARF-NEXT: 0000000000000000 T defined_global_function --# NO-DWARF-NEXT: 0000000000000001 t defined_local_function --# NO-DWARF-NEXT: 0000000000000000 t function_no_dwarf --# NO-DWARF-NEXT: U undef1 --# NO-DWARF-NEXT: U undef2 --# NO-DWARF-NEXT: U undef_no_reloc --# NO-DWARF-NEXT: 0000000000000002 t undefined_references -- --## Check that printing line numbers for undefined values is not attempted in --## the absence of any relocation section. --# RUN: llvm-mc --filetype=obj %t/undef-no-reloc-sections.s -o %t/undef-no-reloc-sections.o --# RUN: llvm-nm --line-numbers %t/undef-no-reloc-sections.o | FileCheck %s --check-prefix=UNDEF-NO-RELOC-SECTIONS --match-full-lines --implicit-check-not={{.}} -- --# UNDEF-NO-RELOC-SECTIONS: U undef -- --## Check that printing line numbers for undefined values does not include --## relocations for non-text sections. This is broken out of main.s to ensure --## that the data relocation for undef comes first. --# RUN: llvm-mc -g --filetype=obj %t/undef-data-reloc.s -o %t/undef-data-reloc.o --# RUN: llvm-nm --line-numbers %t/undef-data-reloc.o | FileCheck %s --check-prefix=UNDEF-DATA-RELOC --match-full-lines --implicit-check-not={{.}} -- --# UNDEF-DATA-RELOC: 0000000000000000 r data_reloc --# UNDEF-DATA-RELOC-NEXT: U undef -- --## Check that line numbers can be printed for data definitions. These are broken --## out of main.s since their DWARF cannot be generated with llvm-mc -g. --# RUN: llvm-mc -g --filetype=obj %t/data-dwarf.s -o %t/data-dwarf.o --# RUN: llvm-nm --line-numbers %t/data-dwarf.o | FileCheck %s --check-prefix=DATA-DWARF --match-full-lines --implicit-check-not={{.}} -- --# DATA-DWARF: 0000000000000000 D defined_data /tmp/tmp.c:1 -- --#--- main.s --.text --.globl defined_global_function --defined_global_function: -- ret -- --defined_local_function: -- ret -- --absolute_symbol = 0x1234 -- --undefined_references: -- nop -- .long undef1 -- nop -- .long undef2 -- ret -- --# Note: llvm-mc -g produces no DWARF for data. --.data --data_no_dwarf: -- .byte 0 -- --.globl undef_no_reloc -- --# Note: llvm-mc -g does not produce DWARF for non-SHF_ALLOC sections. --.section no_alloc_text,"x",@progbits --function_no_dwarf: -- ret -- --#--- undef-no-reloc-sections.s --.globl undef -- --#--- undef-data-reloc.s --.globl undef --.rodata --data_reloc: -- .long undef -- --#--- data-dwarf.s --# char defined_data = 42 -- .text -- .file "tmp.c" -- .file 0 "/tmp" "/tmp/tmp.c" md5 0x39602a53b15a32d6a622ca86936e88d7 -- .file 1 "tmp.c" md5 0x39602a53b15a32d6a622ca86936e88d7 -- .type defined_data,@object # @defined_data -- .data -- .globl defined_data --defined_data: -- .byte 42 # 0x2a -- .size defined_data, 1 -- -- .section .debug_abbrev,"",@progbits -- .byte 1 # Abbreviation Code -- .byte 17 # DW_TAG_compile_unit -- .byte 1 # DW_CHILDREN_yes -- .byte 37 # DW_AT_producer -- .byte 37 # DW_FORM_strx1 -- .byte 19 # DW_AT_language -- .byte 5 # DW_FORM_data2 -- .byte 3 # DW_AT_name -- .byte 37 # DW_FORM_strx1 -- .byte 114 # DW_AT_str_offsets_base -- .byte 23 # DW_FORM_sec_offset -- .byte 16 # DW_AT_stmt_list -- .byte 23 # DW_FORM_sec_offset -- .byte 27 # DW_AT_comp_dir -- .byte 37 # DW_FORM_strx1 -- .byte 115 # DW_AT_addr_base -- .byte 23 # DW_FORM_sec_offset -- .byte 0 # EOM(1) -- .byte 0 # EOM(2) -- .byte 2 # Abbreviation Code -- .byte 52 # DW_TAG_variable -- .byte 0 # DW_CHILDREN_no -- .byte 3 # DW_AT_name -- .byte 37 # DW_FORM_strx1 -- .byte 73 # DW_AT_type -- .byte 19 # DW_FORM_ref4 -- .byte 63 # DW_AT_external -- .byte 25 # DW_FORM_flag_present -- .byte 58 # DW_AT_decl_file -- .byte 11 # DW_FORM_data1 -- .byte 59 # DW_AT_decl_line -- .byte 11 # DW_FORM_data1 -- .byte 2 # DW_AT_location -- .byte 24 # DW_FORM_exprloc -- .byte 0 # EOM(1) -- .byte 0 # EOM(2) -- .byte 3 # Abbreviation Code -- .byte 36 # DW_TAG_base_type -- .byte 0 # DW_CHILDREN_no -- .byte 3 # DW_AT_name -- .byte 37 # DW_FORM_strx1 -- .byte 62 # DW_AT_encoding -- .byte 11 # DW_FORM_data1 -- .byte 11 # DW_AT_byte_size -- .byte 11 # DW_FORM_data1 -- .byte 0 # EOM(1) -- .byte 0 # EOM(2) -- .byte 0 # EOM(3) -- .section .debug_info,"",@progbits --.Lcu_begin0: -- .long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit --.Ldebug_info_start0: -- .short 5 # DWARF version number -- .byte 1 # DWARF Unit Type -- .byte 8 # Address Size (in bytes) -- .long .debug_abbrev # Offset Into Abbrev. Section -- .byte 1 # Abbrev [1] 0xc:0x22 DW_TAG_compile_unit -- .byte 0 # DW_AT_producer -- .short 12 # DW_AT_language -- .byte 1 # DW_AT_name -- .long .Lstr_offsets_base0 # DW_AT_str_offsets_base -- .long .Lline_table_start0 # DW_AT_stmt_list -- .byte 2 # DW_AT_comp_dir -- .long .Laddr_table_base0 # DW_AT_addr_base -- .byte 2 # Abbrev [2] 0x1e:0xb DW_TAG_variable -- .byte 3 # DW_AT_name -- .long 41 # DW_AT_type -- # DW_AT_external -- .byte 1 # DW_AT_decl_file -- .byte 1 # DW_AT_decl_line -- .byte 2 # DW_AT_location -- .byte 161 -- .byte 0 -- .byte 3 # Abbrev [3] 0x29:0x4 DW_TAG_base_type -- .byte 4 # DW_AT_name -- .byte 6 # DW_AT_encoding -- .byte 1 # DW_AT_byte_size -- .byte 0 # End Of Children Mark --.Ldebug_info_end0: -- .section .debug_str_offsets,"",@progbits -- .long 24 # Length of String Offsets Set -- .short 5 -- .short 0 --.Lstr_offsets_base0: -- .section .debug_str,"MS",@progbits,1 --.Linfo_string0: -- .asciz "Debian clang version 14.0.6" # string offset=0 --.Linfo_string1: -- .asciz "/tmp/tmp.c" # string offset=28 --.Linfo_string2: -- .asciz "/tmp" # string offset=39 --.Linfo_string3: -- .asciz "defined_data" # string offset=44 --.Linfo_string4: -- .asciz "char" # string offset=57 -- .section .debug_str_offsets,"",@progbits -- .long .Linfo_string0 -- .long .Linfo_string1 -- .long .Linfo_string2 -- .long .Linfo_string3 -- .long .Linfo_string4 -- .section .debug_addr,"",@progbits -- .long .Ldebug_addr_end0-.Ldebug_addr_start0 # Length of contribution --.Ldebug_addr_start0: -- .short 5 # DWARF version number -- .byte 8 # Address size -- .byte 0 # Segment selector size --.Laddr_table_base0: -- .quad defined_data --.Ldebug_addr_end0: -- .ident "Debian clang version 14.0.6" -- .section ".note.GNU-stack","",@progbits -- .addrsig -- .section .debug_line,"",@progbits --.Lline_table_start0: -diff --git a/llvm/tools/llvm-nm/CMakeLists.txt b/llvm/tools/llvm-nm/CMakeLists.txt -index 5191e138d1c0..ec04f1e9d234 100644 ---- a/llvm/tools/llvm-nm/CMakeLists.txt -+++ b/llvm/tools/llvm-nm/CMakeLists.txt -@@ -8,7 +8,6 @@ set(LLVM_LINK_COMPONENTS - Object - Option - Support -- Symbolize - TargetParser - TextAPI - ) -diff --git a/llvm/tools/llvm-nm/Opts.td b/llvm/tools/llvm-nm/Opts.td -index 04d9f5db5cf8..60ac134269b3 100644 ---- a/llvm/tools/llvm-nm/Opts.td -+++ b/llvm/tools/llvm-nm/Opts.td -@@ -22,7 +22,6 @@ def export_symbols : FF<"export-symbols", "Export symbol list for all inputs">; - def extern_only : FF<"extern-only", "Show only external symbols">; - defm format : Eq<"format", "Specify output format: bsd (default), posix, sysv, darwin, just-symbols">, MetaVarName<"">; - def help : FF<"help", "Display this help">; --def line_numbers : FF<"line-numbers", "Use debugging information to print symbols' filenames and line numbers">; - def no_llvm_bc : FF<"no-llvm-bc", "Disable LLVM bitcode reader">; - def no_sort : FF<"no-sort", "Show symbols in order encountered">; - def no_weak : FF<"no-weak", "Show only non-weak symbols">; -@@ -68,7 +67,6 @@ def : JoinedOrSeparate<["-"], "f">, HelpText<"Alias for --format">, Alias, Alias; - def : F<"g", "Alias for --extern-only">, Alias; - def : F<"j", "Alias for --format=just-symbols">, Alias, AliasArgs<["just-symbols"]>; --def : F<"l", "Alias for --line-numbers">, Alias; - def : F<"m", "Alias for --format=darwin">, Alias, AliasArgs<["darwin"]>; - def : F<"M", "Deprecated alias for --print-armap">, Alias, Flags<[HelpHidden]>; - def : F<"n", "Alias for --numeric-sort">, Alias; -diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp -index 051fa3e5bfa5..9a9e8bd146bb 100644 ---- a/llvm/tools/llvm-nm/llvm-nm.cpp -+++ b/llvm/tools/llvm-nm/llvm-nm.cpp -@@ -19,7 +19,6 @@ - #include "llvm/BinaryFormat/COFF.h" - #include "llvm/BinaryFormat/MachO.h" - #include "llvm/BinaryFormat/XCOFF.h" --#include "llvm/DebugInfo/Symbolize/Symbolize.h" - #include "llvm/Demangle/Demangle.h" - #include "llvm/IR/Function.h" - #include "llvm/IR/LLVMContext.h" -@@ -98,7 +97,6 @@ static bool Demangle; - static bool DynamicSyms; - static bool ExportSymbols; - static bool ExternalOnly; --static bool LineNumbers; - static OutputFormatTy OutputFormat; - static bool NoLLVMBitcode; - static bool NoSort; -@@ -553,6 +551,8 @@ static void darwinPrintSymbol(SymbolicFile &Obj, const NMSymbol &S, - } - } - } -+ -+ outs() << "\n"; - } - - // Table that maps Darwin's Mach-O stab constants to strings to allow printing. -@@ -689,88 +689,9 @@ static void printExportSymbolList(const std::vector &SymbolList) { - } - } - --static void printLineNumbers(symbolize::LLVMSymbolizer &Symbolizer, -- const NMSymbol &S) { -- const auto *Obj = dyn_cast(S.Sym.getObject()); -- if (!Obj) -- return; -- const SymbolRef Sym(S.Sym); -- uint64_t SectionIndex = object::SectionedAddress::UndefSection; -- section_iterator Sec = cantFail(Sym.getSection()); -- if (Sec != Obj->section_end()) -- SectionIndex = Sec->getIndex(); -- object::SectionedAddress Address = {cantFail(Sym.getAddress()), SectionIndex}; -- -- std::string FileName; -- uint32_t Line; -- switch (S.TypeChar) { -- // For undefined symbols, find the first relocation for that symbol with a -- // line number. -- case 'U': { -- for (const SectionRef RelocsSec : Obj->sections()) { -- if (RelocsSec.relocations().empty()) -- continue; -- SectionRef TextSec = *cantFail(RelocsSec.getRelocatedSection()); -- if (!TextSec.isText()) -- continue; -- for (const RelocationRef R : RelocsSec.relocations()) { -- if (R.getSymbol() != Sym) -- continue; -- Expected ResOrErr = Symbolizer.symbolizeCode( -- *Obj, {TextSec.getAddress() + R.getOffset(), SectionIndex}); -- if (!ResOrErr) { -- error(ResOrErr.takeError(), Obj->getFileName()); -- return; -- } -- if (ResOrErr->FileName == DILineInfo::BadString) -- return; -- FileName = std::move(ResOrErr->FileName); -- Line = ResOrErr->Line; -- break; -- } -- if (!FileName.empty()) -- break; -- } -- if (FileName.empty()) -- return; -- break; -- } -- case 't': -- case 'T': { -- Expected ResOrErr = Symbolizer.symbolizeCode(*Obj, Address); -- if (!ResOrErr) { -- error(ResOrErr.takeError(), Obj->getFileName()); -- return; -- } -- if (ResOrErr->FileName == DILineInfo::BadString) -- return; -- FileName = std::move(ResOrErr->FileName); -- Line = ResOrErr->Line; -- break; -- } -- default: { -- Expected ResOrErr = Symbolizer.symbolizeData(*Obj, Address); -- if (!ResOrErr) { -- error(ResOrErr.takeError(), Obj->getFileName()); -- return; -- } -- if (ResOrErr->DeclFile.empty()) -- return; -- FileName = std::move(ResOrErr->DeclFile); -- Line = ResOrErr->DeclLine; -- break; -- } -- } -- outs() << '\t' << FileName << ':' << Line; --} -- - static void printSymbolList(SymbolicFile &Obj, - std::vector &SymbolList, bool printName, - StringRef ArchiveName, StringRef ArchitectureName) { -- std::optional Symbolizer; -- if (LineNumbers) -- Symbolizer.emplace(); -- - if (!PrintFileName) { - if ((OutputFormat == bsd || OutputFormat == posix || - OutputFormat == just_symbols) && -@@ -877,7 +798,7 @@ static void printSymbolList(SymbolicFile &Obj, - printFormat); - } else if (OutputFormat == posix) { - outs() << Name << " " << S.TypeChar << " " << SymbolAddrStr << " " -- << (MachO ? "0" : SymbolSizeStr); -+ << (MachO ? "0" : SymbolSizeStr) << "\n"; - } else if (OutputFormat == bsd || (OutputFormat == darwin && !MachO)) { - if (PrintAddress) - outs() << SymbolAddrStr << ' '; -@@ -898,14 +819,12 @@ static void printSymbolList(SymbolicFile &Obj, - } else - outs() << S.IndirectName << ")"; - } -+ outs() << "\n"; - } else if (OutputFormat == sysv) { - outs() << left_justify(Name, 20) << "|" << SymbolAddrStr << "| " - << S.TypeChar << " |" << right_justify(S.TypeName, 18) << "|" -- << SymbolSizeStr << "| |" << S.SectionName; -+ << SymbolSizeStr << "| |" << S.SectionName << "\n"; - } -- if (LineNumbers) -- printLineNumbers(*Symbolizer, S); -- outs() << '\n'; - } - - SymbolList.clear(); -@@ -2496,7 +2415,6 @@ int llvm_nm_main(int argc, char **argv, const llvm::ToolContext &) { - else - error("--format value should be one of: bsd, posix, sysv, darwin, " - "just-symbols"); -- LineNumbers = Args.hasArg(OPT_line_numbers); - NoLLVMBitcode = Args.hasArg(OPT_no_llvm_bc); - NoSort = Args.hasArg(OPT_no_sort); - NoWeakSymbols = Args.hasArg(OPT_no_weak); --- -2.41.0.3.g1cb8d410ac - diff --git a/build/build-clang/revert-llvmorg-18-init-6193-gb88cffeafd39.patch b/build/build-clang/revert-llvmorg-18-init-6193-gb88cffeafd39.patch deleted file mode 100644 index a3ad8e0ed35e..000000000000 --- a/build/build-clang/revert-llvmorg-18-init-6193-gb88cffeafd39.patch +++ /dev/null @@ -1,63 +0,0 @@ -From be338a0b7be5040a7814d10d424f1555604cce7c Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Wed, 20 Sep 2023 10:08:21 +0900 -Subject: [PATCH 2/3] Revert "Explicitly set triple on line-numbers.test" - -This reverts commit b88cffeafd393d54f85feb641c4f8fd4fdb73fe4 because it -depends on c649f29c24c9fc1502d8d53e0c96c3d24b31de1a which we revert. ---- - llvm/test/tools/llvm-nm/X86/line-numbers.test | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/llvm/test/tools/llvm-nm/X86/line-numbers.test b/llvm/test/tools/llvm-nm/X86/line-numbers.test -index 4acda8afb2a4..4b9817ab5c62 100644 ---- a/llvm/test/tools/llvm-nm/X86/line-numbers.test -+++ b/llvm/test/tools/llvm-nm/X86/line-numbers.test -@@ -18,7 +18,7 @@ - ## of main.o. - # RUN: rm -rf %t - # RUN: split-file %s %t --# RUN: llvm-mc -g --filetype=obj -triple=x86_64-pc-linux %t/main.s -o %t/main.o -+# RUN: llvm-mc -g --filetype=obj %t/main.s -o %t/main.o - # RUN: llvm-nm -l %t/main.o | FileCheck %s --match-full-lines --implicit-check-not={{.}} - # RUN: llvm-nm --line-numbers %t/main.o | FileCheck %s --match-full-lines --implicit-check-not={{.}} - -@@ -34,7 +34,7 @@ - - ## Check that in the absence of DWARF in the whole object, no line number - ## information is printed. --# RUN: llvm-mc --filetype=obj %t/main.s -triple=x86_64-pc-linux -o %t/no-dwarf.o -+# RUN: llvm-mc --filetype=obj %t/main.s -o %t/no-dwarf.o - # RUN: llvm-nm -l %t/no-dwarf.o | FileCheck %s --check-prefix=NO-DWARF --match-full-lines --implicit-check-not={{.}} - - # NO-DWARF: 0000000000001234 a absolute_symbol -@@ -49,7 +49,7 @@ - - ## Check that printing line numbers for undefined values is not attempted in - ## the absence of any relocation section. --# RUN: llvm-mc --filetype=obj %t/undef-no-reloc-sections.s -triple=x86_64-pc-linux -o %t/undef-no-reloc-sections.o -+# RUN: llvm-mc --filetype=obj %t/undef-no-reloc-sections.s -o %t/undef-no-reloc-sections.o - # RUN: llvm-nm --line-numbers %t/undef-no-reloc-sections.o | FileCheck %s --check-prefix=UNDEF-NO-RELOC-SECTIONS --match-full-lines --implicit-check-not={{.}} - - # UNDEF-NO-RELOC-SECTIONS: U undef -@@ -57,7 +57,7 @@ - ## Check that printing line numbers for undefined values does not include - ## relocations for non-text sections. This is broken out of main.s to ensure - ## that the data relocation for undef comes first. --# RUN: llvm-mc -g --filetype=obj %t/undef-data-reloc.s -triple=x86_64-pc-linux -o %t/undef-data-reloc.o -+# RUN: llvm-mc -g --filetype=obj %t/undef-data-reloc.s -o %t/undef-data-reloc.o - # RUN: llvm-nm --line-numbers %t/undef-data-reloc.o | FileCheck %s --check-prefix=UNDEF-DATA-RELOC --match-full-lines --implicit-check-not={{.}} - - # UNDEF-DATA-RELOC: 0000000000000000 r data_reloc -@@ -65,7 +65,7 @@ - - ## Check that line numbers can be printed for data definitions. These are broken - ## out of main.s since their DWARF cannot be generated with llvm-mc -g. --# RUN: llvm-mc -g --filetype=obj %t/data-dwarf.s -triple=x86_64-pc-linux -o %t/data-dwarf.o -+# RUN: llvm-mc -g --filetype=obj %t/data-dwarf.s -o %t/data-dwarf.o - # RUN: llvm-nm --line-numbers %t/data-dwarf.o | FileCheck %s --check-prefix=DATA-DWARF --match-full-lines --implicit-check-not={{.}} - - # DATA-DWARF: 0000000000000000 D defined_data /tmp/tmp.c:1 --- -2.41.0.3.g1cb8d410ac - diff --git a/build/build-clang/revert-llvmorg-18-init-6208-g2baf4a06ef06.patch b/build/build-clang/revert-llvmorg-18-init-6208-g2baf4a06ef06.patch deleted file mode 100644 index ba2116d4ba87..000000000000 --- a/build/build-clang/revert-llvmorg-18-init-6208-g2baf4a06ef06.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9d81bf8d2e457540b8bd93859baef79a043c8482 Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Wed, 20 Sep 2023 10:08:13 +0900 -Subject: [PATCH 1/3] Revert "Fix test added in D150987 to account for - different path separators which was causing the test to fail on Windows." - -This reverts commit 2baf4a06ef06c51c2ef09f981f204983b0f8082c because it -depends on c649f29c24c9fc1502d8d53e0c96c3d24b31de1a which we revert. ---- - llvm/test/tools/llvm-nm/X86/line-numbers.test | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/test/tools/llvm-nm/X86/line-numbers.test b/llvm/test/tools/llvm-nm/X86/line-numbers.test -index e254df67f955..4acda8afb2a4 100644 ---- a/llvm/test/tools/llvm-nm/X86/line-numbers.test -+++ b/llvm/test/tools/llvm-nm/X86/line-numbers.test -@@ -68,7 +68,7 @@ - # RUN: llvm-mc -g --filetype=obj %t/data-dwarf.s -triple=x86_64-pc-linux -o %t/data-dwarf.o - # RUN: llvm-nm --line-numbers %t/data-dwarf.o | FileCheck %s --check-prefix=DATA-DWARF --match-full-lines --implicit-check-not={{.}} - --# DATA-DWARF: 0000000000000000 D defined_data /tmp{{\\|/}}tmp.c:1 -+# DATA-DWARF: 0000000000000000 D defined_data /tmp/tmp.c:1 - - #--- main.s - .text --- -2.41.0.3.g1cb8d410ac -