diff options
| author | Jonas Devlieghere <jonas@devlieghere.com> | 2018-03-18 11:38:41 +0000 |
|---|---|---|
| committer | Jonas Devlieghere <jonas@devlieghere.com> | 2018-03-18 11:38:41 +0000 |
| commit | a6ef1abc0970ff3ae49a643cf3575226e3c5e762 (patch) | |
| tree | 23cd6d86b21fa86086e5f2ff498d602b476c8954 | |
| parent | f86d48b3ae89df16b4d39b45b55de444375c240e (diff) | |
| download | bcm5719-llvm-a6ef1abc0970ff3ae49a643cf3575226e3c5e762.tar.gz bcm5719-llvm-a6ef1abc0970ff3ae49a643cf3575226e3c5e762.zip | |
[dsymutil] Rename llvm-dsymutil -> dsymutil
Now that almost all functionality of Apple's dsymutil has been
upstreamed, the open source variant can be used as a drop in
replacement. Hence we feel it's no longer necessary to have the llvm
prefix.
Differential revision: https://reviews.llvm.org/D44527
llvm-svn: 327790
70 files changed, 135 insertions, 136 deletions
diff --git a/clang/cmake/caches/Apple-stage2.cmake b/clang/cmake/caches/Apple-stage2.cmake index d58e4b6fafd..fd46c1e9fd4 100644 --- a/clang/cmake/caches/Apple-stage2.cmake +++ b/clang/cmake/caches/Apple-stage2.cmake @@ -47,7 +47,7 @@ set(LLVM_CREATE_XCODE_TOOLCHAIN ON CACHE BOOL "") # setup toolchain set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS - llvm-dsymutil + dsymutil llvm-cov llvm-dwarfdump llvm-profdata diff --git a/clang/cmake/caches/BaremetalARM.cmake b/clang/cmake/caches/BaremetalARM.cmake index 73f797d9c4b..d9d2efcbb4b 100644 --- a/clang/cmake/caches/BaremetalARM.cmake +++ b/clang/cmake/caches/BaremetalARM.cmake @@ -24,11 +24,11 @@ set(BUILTINS_armv7em-none-eabi_COMPILER_RT_OS_DIR "baremetal" CACHE STRING "armv set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS + dsymutil llc llvm-ar llvm-cxxfilt llvm-dwarfdump - llvm-dsymutil llvm-nm llvm-objdump llvm-ranlib diff --git a/clang/cmake/caches/DistributionExample-stage2.cmake b/clang/cmake/caches/DistributionExample-stage2.cmake index 894ea6af6c3..600ba56e456 100644 --- a/clang/cmake/caches/DistributionExample-stage2.cmake +++ b/clang/cmake/caches/DistributionExample-stage2.cmake @@ -10,7 +10,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only -DNDEBUG" CACHE STRIN # setup toolchain set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS - llvm-dsymutil + dsymutil llvm-cov llvm-dwarfdump llvm-profdata diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index 2d36f09c999..4f975ac1a97 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -57,12 +57,12 @@ endforeach() # Setup toolchain. set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS + dsymutil llc llvm-ar llvm-cov llvm-cxxfilt llvm-dwarfdump - llvm-dsymutil llvm-lib llvm-nm llvm-objcopy diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst index 5ac1289a86e..b3fa4b4149e 100644 --- a/llvm/docs/CMake.rst +++ b/llvm/docs/CMake.rst @@ -12,8 +12,8 @@ Introduction does not build the project, it generates the files needed by your build tool (GNU make, Visual Studio, etc.) for building LLVM. -If **you are a new contributor**, please start with the :doc:`GettingStarted` -page. This page is geared for existing contributors moving from the +If **you are a new contributor**, please start with the :doc:`GettingStarted` +page. This page is geared for existing contributors moving from the legacy configure/make system. If you are really anxious about getting a functional LLVM build, go to the @@ -413,10 +413,10 @@ LLVM-specific variables **LLVM_BUILD_DOCS**:BOOL Adds all *enabled* documentation targets (i.e. Doxgyen and Sphinx targets) as dependencies of the default build targets. This results in all of the (enabled) - documentation targets being as part of a normal build. If the ``install`` - target is run then this also enables all built documentation targets to be - installed. Defaults to OFF. To enable a particular documentation target, see - see LLVM_ENABLE_SPHINX and LLVM_ENABLE_DOXYGEN. + documentation targets being as part of a normal build. If the ``install`` + target is run then this also enables all built documentation targets to be + installed. Defaults to OFF. To enable a particular documentation target, see + see LLVM_ENABLE_SPHINX and LLVM_ENABLE_DOXYGEN. **LLVM_ENABLE_DOXYGEN**:BOOL Enables the generation of browsable HTML documentation using doxygen. @@ -513,7 +513,7 @@ LLVM-specific variables OS X Only: If enabled CMake will generate a target named 'install-xcode-toolchain'. This target will create a directory at $CMAKE_INSTALL_PREFIX/Toolchains containing an xctoolchain directory which can - be used to override the default system tools. + be used to override the default system tools. **LLVM_BUILD_LLVM_DYLIB**:BOOL If enabled, the target for building the libLLVM shared library is added. @@ -534,7 +534,7 @@ LLVM-specific variables library (ON) or as a static library (OFF). Its default value is OFF. On Windows, shared libraries may be used when building with MinGW, including mingw-w64, but not when building with the Microsoft toolchain. - + .. note:: BUILD_SHARED_LIBS is only recommended for use by LLVM developers. If you want to build LLVM as a shared library, you should use the ``LLVM_BUILD_LLVM_DYLIB`` option. diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 6455b6343d2..f08bd9251f9 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -214,7 +214,7 @@ const DataLayout &AsmPrinter::getDataLayout() const { } // Do not use the cached DataLayout because some client use it without a Module -// (llvm-dsymutil, llvm-dwarfdump). +// (dsymutil, llvm-dwarfdump). unsigned AsmPrinter::getPointerSize() const { return TM.getPointerSize(0); // FIXME: Default address space } diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt index ec6d7d518ad..5a97677373a 100644 --- a/llvm/test/CMakeLists.txt +++ b/llvm/test/CMakeLists.txt @@ -56,7 +56,7 @@ set(LLVM_TEST_DEPENDS llvm-diff llvm-dis llvm-dlltool - llvm-dsymutil + dsymutil llvm-dwarfdump llvm-dwp llvm-extract diff --git a/llvm/test/DebugInfo/dwarfdump-macho-universal.test b/llvm/test/DebugInfo/dwarfdump-macho-universal.test index 986decb7628..5bf707358c4 100644 --- a/llvm/test/DebugInfo/dwarfdump-macho-universal.test +++ b/llvm/test/DebugInfo/dwarfdump-macho-universal.test @@ -1,4 +1,4 @@ -Reuse a test input from llvm-dsymutil, it's perfect for what we want to exercise +Reuse a test input from dsymutil, it's perfect for what we want to exercise RUN: llvm-dwarfdump -v %S/Inputs/fat-test.o --debug-info | FileCheck %s CHECK: fat-test.o(x86_64): file format Mach-O 64-bit x86-64 diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py index e8fdba5e795..4c019928882 100644 --- a/llvm/test/lit.cfg.py +++ b/llvm/test/lit.cfg.py @@ -138,8 +138,8 @@ tools = [ # FIXME: Why do we have both `lli` and `%lli` that do slightly different things? tools.extend([ - 'lli', 'lli-child-target', 'llvm-ar', 'llvm-as', 'llvm-bcanalyzer', 'llvm-config', 'llvm-cov', - 'llvm-cxxdump', 'llvm-cvtres', 'llvm-diff', 'llvm-dis', 'llvm-dsymutil', + 'dsymutil', 'lli', 'lli-child-target', 'llvm-ar', 'llvm-as', 'llvm-bcanalyzer', + 'llvm-config', 'llvm-cov', 'llvm-cxxdump', 'llvm-cvtres', 'llvm-diff', 'llvm-dis', 'llvm-dwarfdump', 'llvm-extract', 'llvm-isel-fuzzer', 'llvm-opt-fuzzer', 'llvm-lib', 'llvm-link', 'llvm-lto', 'llvm-lto2', 'llvm-mc', 'llvm-mca','llvm-mcmarkup', 'llvm-modextract', 'llvm-nm', 'llvm-objcopy', 'llvm-objdump', diff --git a/llvm/test/tools/dsymutil/ARM/empty-map.test b/llvm/test/tools/dsymutil/ARM/empty-map.test index 54d9a35cc6e..1b9bde45ede 100644 --- a/llvm/test/tools/dsymutil/ARM/empty-map.test +++ b/llvm/test/tools/dsymutil/ARM/empty-map.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s --- triple: 'thumbv7-apple-darwin' diff --git a/llvm/test/tools/dsymutil/ARM/fat-arch-name.test b/llvm/test/tools/dsymutil/ARM/fat-arch-name.test index ac7af1e55d5..14d33d0adcb 100644 --- a/llvm/test/tools/dsymutil/ARM/fat-arch-name.test +++ b/llvm/test/tools/dsymutil/ARM/fat-arch-name.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -no-output %p/../Inputs/fat-test.arm.dylib -o %t.dSYM -verbose 2>&1 | FileCheck %s +# RUN: dsymutil -no-output %p/../Inputs/fat-test.arm.dylib -o %t.dSYM -verbose 2>&1 | FileCheck %s # We detect thumb triples from the binaries, because those are the only ones # that are guaranteed to be able to generate a Target instance (for example diff --git a/llvm/test/tools/dsymutil/ARM/fat-arch-not-found.test b/llvm/test/tools/dsymutil/ARM/fat-arch-not-found.test index e15d9b69b5f..5bccb58b3e4 100644 --- a/llvm/test/tools/dsymutil/ARM/fat-arch-not-found.test +++ b/llvm/test/tools/dsymutil/ARM/fat-arch-not-found.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s --- triple: 'armv7-apple-darwin' diff --git a/llvm/test/tools/dsymutil/ARM/fat-threading.test b/llvm/test/tools/dsymutil/ARM/fat-threading.test index 0d48a5f80b0..a72381291ef 100644 --- a/llvm/test/tools/dsymutil/ARM/fat-threading.test +++ b/llvm/test/tools/dsymutil/ARM/fat-threading.test @@ -1,4 +1,4 @@ # REQUIRES: object-emission # By default, dsymutil spawns one thread per architecture and this test just # ensures that things don't break when processing multiple archs. -# RUN: llvm-dsymutil -no-output %p/../Inputs/fat-test.arm.dylib -o %t.brief.dSYM 2>&1 +# RUN: dsymutil -no-output %p/../Inputs/fat-test.arm.dylib -o %t.brief.dSYM 2>&1 diff --git a/llvm/test/tools/dsymutil/ARM/inlined-low_pc.c b/llvm/test/tools/dsymutil/ARM/inlined-low_pc.c index 7ade33e3e44..99fe0450dc8 100644 --- a/llvm/test/tools/dsymutil/ARM/inlined-low_pc.c +++ b/llvm/test/tools/dsymutil/ARM/inlined-low_pc.c @@ -3,7 +3,7 @@ static int foo(int i) { return 42 + i; } int bar(int a) { return foo(a); } -// RUN: llvm-dsymutil -f -y %p/dummy-debug-map-amr64.map -oso-prepend-path %p/../Inputs/inlined-low_pc -o - | llvm-dwarfdump - | FileCheck %s +// RUN: dsymutil -f -y %p/dummy-debug-map-amr64.map -oso-prepend-path %p/../Inputs/inlined-low_pc -o - | llvm-dwarfdump - | FileCheck %s // CHECK: DW_TAG_subprogram // CHECK: DW_AT_low_pc{{.*}}0x0000000000010000 diff --git a/llvm/test/tools/dsymutil/ARM/scattered.c b/llvm/test/tools/dsymutil/ARM/scattered.c index 01d9e1ab866..81082bcd736 100644 --- a/llvm/test/tools/dsymutil/ARM/scattered.c +++ b/llvm/test/tools/dsymutil/ARM/scattered.c @@ -1,7 +1,7 @@ -RUN: llvm-dsymutil -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/scattered-reloc/ -f -o - | llvm-dwarfdump -debug-info - | FileCheck %s +RUN: dsymutil -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/scattered-reloc/ -f -o - | llvm-dwarfdump -debug-info - | FileCheck %s // See Inputs/scattered-reloc/scattered.s to see how this test -// actually works. +// actually works. int bar = 42; CHECK: DW_TAG_variable diff --git a/llvm/test/tools/dsymutil/ARM/thumb.c b/llvm/test/tools/dsymutil/ARM/thumb.c index 4589653305a..81602d17e87 100644 --- a/llvm/test/tools/dsymutil/ARM/thumb.c +++ b/llvm/test/tools/dsymutil/ARM/thumb.c @@ -1,5 +1,5 @@ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/.. %p/../Inputs/thumb.armv7m -o - | llvm-dwarfdump - | FileCheck %s -// RUN: llvm-dsymutil -arch armv7m -f -oso-prepend-path=%p/.. %p/../Inputs/thumb.armv7m -o - | llvm-dwarfdump - | FileCheck %s +// RUN: dsymutil -f -oso-prepend-path=%p/.. %p/../Inputs/thumb.armv7m -o - | llvm-dwarfdump - | FileCheck %s +// RUN: dsymutil -arch armv7m -f -oso-prepend-path=%p/.. %p/../Inputs/thumb.armv7m -o - | llvm-dwarfdump - | FileCheck %s /* Compile with: clang -c thumb.c -arch armv7m -g diff --git a/llvm/test/tools/dsymutil/PowerPC/sibling.test b/llvm/test/tools/dsymutil/PowerPC/sibling.test index b38b98a19bf..29f4662306b 100644 --- a/llvm/test/tools/dsymutil/PowerPC/sibling.test +++ b/llvm/test/tools/dsymutil/PowerPC/sibling.test @@ -14,7 +14,7 @@ # Compiled with Apple-GCC 4.0.1 (build 5370): # g++ -g -c sibling.cpp -o sibling.o -# RUN: llvm-dsymutil -arch ppc -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s +# RUN: dsymutil -arch ppc -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s # CHECK: DW_TAG_structure_type # CHECK-NEXT: DW_AT_name ("A") diff --git a/llvm/test/tools/dsymutil/X86/alias.test b/llvm/test/tools/dsymutil/X86/alias.test index ccffac97c13..2e56ba5719b 100644 --- a/llvm/test/tools/dsymutil/X86/alias.test +++ b/llvm/test/tools/dsymutil/X86/alias.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/alias \ +# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/alias \ # RUN: %p/../Inputs/alias/foobar -o - | llvm-dwarfdump - 2>&1 | FileCheck %s # CHECK-NOT: could not find object file symbol for symbol # CHECK: DW_AT_name ("foo.c") diff --git a/llvm/test/tools/dsymutil/X86/basic-linking-bundle.test b/llvm/test/tools/dsymutil/X86/basic-linking-bundle.test index 282f44fa09c..11c2130e313 100644 --- a/llvm/test/tools/dsymutil/X86/basic-linking-bundle.test +++ b/llvm/test/tools/dsymutil/X86/basic-linking-bundle.test @@ -2,7 +2,7 @@ RUN: rm -rf %t RUN: mkdir -p %t/dsymdest RUN: cat %p/../Inputs/basic.macho.x86_64 > %t/basic.macho.x86_64 -RUN: llvm-dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 +RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 Check that the object file in the bundle exists and is sane: RUN: llvm-dwarfdump -a %t/basic.macho.x86_64.dSYM/Contents/Resources/DWARF/basic.macho.x86_64 | FileCheck %S/basic-linking-x86.test @@ -12,7 +12,7 @@ RUN: llvm-dwarfdump -a %t/basic.macho.x86_64.dSYM | FileCheck %S/basic-linking-x RUN: FileCheck %s --input-file %t/basic.macho.x86_64.dSYM/Contents/Info.plist -RUN: llvm-dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM +RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM RUN: llvm-dwarfdump -a %t/dsymdest/basic.macho.x86_64.dSYM/Contents/Resources/DWARF/basic.macho.x86_64 | FileCheck %S/basic-linking-x86.test RUN: FileCheck %s --input-file %t/dsymdest/basic.macho.x86_64.dSYM/Contents/Info.plist diff --git a/llvm/test/tools/dsymutil/X86/basic-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-linking-x86.test index a792c1c54a2..8535153d648 100644 --- a/llvm/test/tools/dsymutil/X86/basic-linking-x86.test +++ b/llvm/test/tools/dsymutil/X86/basic-linking-x86.test @@ -1,12 +1,12 @@ RUN: cat %p/../Inputs/basic.macho.x86_64 > %t1 -RUN: llvm-dsymutil -f -oso-prepend-path=%p/.. %t1 +RUN: dsymutil -f -oso-prepend-path=%p/.. %t1 RUN: llvm-dwarfdump -a %t1.dwarf | FileCheck %s -RUN: llvm-dsymutil -f -o %t2 -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 +RUN: dsymutil -f -o %t2 -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 RUN: llvm-dwarfdump -a %t2 | FileCheck %s -RUN: llvm-dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s --check-prefix=CHECK --check-prefix=BASIC -RUN: llvm-dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-archive.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s --check-prefix=CHECK --check-prefix=ARCHIVE -RUN: llvm-dsymutil -dump-debug-map -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-dsymutil -f -y -o - - | llvm-dwarfdump -a - | FileCheck %s --check-prefix=CHECK --check-prefix=BASIC -RUN: llvm-dsymutil -dump-debug-map -oso-prepend-path=%p/.. %p/../Inputs/basic-archive.macho.x86_64 | llvm-dsymutil -f -o - -y - | llvm-dwarfdump -a - | FileCheck %s --check-prefix=CHECK --check-prefix=ARCHIVE +RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s --check-prefix=CHECK --check-prefix=BASIC +RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-archive.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s --check-prefix=CHECK --check-prefix=ARCHIVE +RUN: dsymutil -dump-debug-map -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | dsymutil -f -y -o - - | llvm-dwarfdump -a - | FileCheck %s --check-prefix=CHECK --check-prefix=BASIC +RUN: dsymutil -dump-debug-map -oso-prepend-path=%p/.. %p/../Inputs/basic-archive.macho.x86_64 | dsymutil -f -o - -y - | llvm-dwarfdump -a - | FileCheck %s --check-prefix=CHECK --check-prefix=ARCHIVE CHECK: file format Mach-O 64-bit x86-64 diff --git a/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test index bbff5b8a166..616a3d40e30 100644 --- a/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test +++ b/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto-dw4.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s +RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto-dw4.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s CHECK: file format Mach-O 64-bit x86-64 diff --git a/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test index c791987e660..2613a0ea935 100644 --- a/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test +++ b/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test @@ -1,5 +1,5 @@ -RUN: llvm-dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s -RUN: llvm-dsymutil -oso-prepend-path=%p/.. -dump-debug-map %p/../Inputs/basic-lto.macho.x86_64 | llvm-dsymutil -f -o - -y - | llvm-dwarfdump -a - | FileCheck %s +RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s +RUN: dsymutil -oso-prepend-path=%p/.. -dump-debug-map %p/../Inputs/basic-lto.macho.x86_64 | dsymutil -f -o - -y - | llvm-dwarfdump -a - | FileCheck %s CHECK: file format Mach-O 64-bit x86-64 diff --git a/llvm/test/tools/dsymutil/X86/basic-with-libfat-test.test b/llvm/test/tools/dsymutil/X86/basic-with-libfat-test.test index 0ec2d537f42..fb5ee7dd2a9 100644 --- a/llvm/test/tools/dsymutil/X86/basic-with-libfat-test.test +++ b/llvm/test/tools/dsymutil/X86/basic-with-libfat-test.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-with-libfat-test.macho.x86_64 | llvm-dwarfdump - | FileCheck %s +RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-with-libfat-test.macho.x86_64 | llvm-dwarfdump - | FileCheck %s The test binary was created by force-linking the libfat-test.a fat archive with the basic linking test archive, like so: diff --git a/llvm/test/tools/dsymutil/X86/common-sym.test b/llvm/test/tools/dsymutil/X86/common-sym.test index e6938bd4d2c..0f07c8f39b8 100644 --- a/llvm/test/tools/dsymutil/X86/common-sym.test +++ b/llvm/test/tools/dsymutil/X86/common-sym.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -oso-prepend-path %p/.. %p/../Inputs/common.macho.x86_64 -f -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s +RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/common.macho.x86_64 -f -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s The test was compiled from a single source: $ cat common.c diff --git a/llvm/test/tools/dsymutil/X86/custom-line-table.test b/llvm/test/tools/dsymutil/X86/custom-line-table.test index 424d86feed7..f75e01a12fb 100644 --- a/llvm/test/tools/dsymutil/X86/custom-line-table.test +++ b/llvm/test/tools/dsymutil/X86/custom-line-table.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-line | FileCheck %s +# RUN: dsymutil -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-line | FileCheck %s # This test runs dsymutil on an object file with non-standard (as far # as llvm is concerned) line table settings. diff --git a/llvm/test/tools/dsymutil/X86/darwin-bundle.test b/llvm/test/tools/dsymutil/X86/darwin-bundle.test index 59434c5e6d9..e1117807a65 100644 --- a/llvm/test/tools/dsymutil/X86/darwin-bundle.test +++ b/llvm/test/tools/dsymutil/X86/darwin-bundle.test @@ -5,10 +5,10 @@ RUN: mkdir -p %t/dsymdest RUN: cat %p/../Inputs/basic.macho.x86_64 > %t/basic.macho.x86_64 RUN: cat %p/../Inputs/Info.plist > %t/Info.plist -RUN: llvm-dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM +RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM RUN: FileCheck %s --input-file %t/dsymdest/basic.macho.x86_64.dSYM/Contents/Info.plist -RUN: llvm-dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -toolchain "toolchain" -o %t/dsymdest/basic.macho.x86_64.dSYM +RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -toolchain "toolchain" -o %t/dsymdest/basic.macho.x86_64.dSYM RUN: FileCheck %s --input-file %t/dsymdest/basic.macho.x86_64.dSYM/Contents/Info.plist --check-prefix=CHECK --check-prefix=TOOLCHAIN CHECK: <?xml version="1.0" encoding="UTF-8"?> diff --git a/llvm/test/tools/dsymutil/X86/dead-stripped.cpp b/llvm/test/tools/dsymutil/X86/dead-stripped.cpp index a0244157ed8..8ec1c85a661 100644 --- a/llvm/test/tools/dsymutil/X86/dead-stripped.cpp +++ b/llvm/test/tools/dsymutil/X86/dead-stripped.cpp @@ -1,4 +1,4 @@ -// RUN: llvm-dsymutil -f -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/dead-stripped -o - | llvm-dwarfdump - --debug-info | FileCheck %s +// RUN: dsymutil -f -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/dead-stripped -o - | llvm-dwarfdump - --debug-info | FileCheck %s // The test was compiled with: // clang++ -O2 -g -c dead-strip.cpp -o 1.o diff --git a/llvm/test/tools/dsymutil/X86/dsym-companion.test b/llvm/test/tools/dsymutil/X86/dsym-companion.test index 4327a2953d9..8f16bf74fd1 100644 --- a/llvm/test/tools/dsymutil/X86/dsym-companion.test +++ b/llvm/test/tools/dsymutil/X86/dsym-companion.test @@ -1,11 +1,11 @@ -RUN: llvm-dsymutil -o - %p/../Inputs/basic.macho.i386 -f | llvm-readobj -file-headers -program-headers -sections -symbols - | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK32 -RUN: llvm-dsymutil -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -f | llvm-readobj -file-headers -program-headers -sections -symbols - | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK64 +RUN: dsymutil -o - %p/../Inputs/basic.macho.i386 -f | llvm-readobj -file-headers -program-headers -sections -symbols - | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK32 +RUN: dsymutil -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -f | llvm-readobj -file-headers -program-headers -sections -symbols - | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK64 This test checks that the dSYM companion binaries generated in 32 and 64 bits are correct. The check are pretty strict (we check even the offsets and sizes of the sections) in order to test the VM address layout algorithm. As the debug sections are generated, this is a bit risky, but I don't expect -llvm-dsymutil's output to change much for these tiny C programs so this should +dsymutil's output to change much for these tiny C programs so this should be OK. The 32bits version doesn't have object files, thus it has basically no debug sections. diff --git a/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test b/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test index 39de076ca01..4de68abbf06 100644 --- a/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test +++ b/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s # Source: # int main() { diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test b/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test index 8622c37dc4c..c4ee8bd4e1d 100644 --- a/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test +++ b/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s # Source: # int main() { diff --git a/llvm/test/tools/dsymutil/X86/empty_range.s b/llvm/test/tools/dsymutil/X86/empty_range.s index c221b674313..efd366dab37 100644 --- a/llvm/test/tools/dsymutil/X86/empty_range.s +++ b/llvm/test/tools/dsymutil/X86/empty_range.s @@ -1,10 +1,10 @@ # This test verifies that an empty range list in the .debug_ranges section -# doesn't crash llvm-dsymutil. As clang does not produce this kind of debug +# doesn't crash dsymutil. As clang does not produce this kind of debug # info anymore, we used this hand-crafted assembly file to produce a testcase # Compile with: # llvm-mc -triple x86_64-apple-darwin -filetype=obj -o 1.o empty_range.o -# RUN: llvm-dsymutil -f -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/empty_range -o - | llvm-dwarfdump -debug-info - | FileCheck %s +# RUN: dsymutil -f -y %p/dummy-debug-map.map -oso-prepend-path %p/../Inputs/empty_range -o - | llvm-dwarfdump -debug-info - | FileCheck %s .section __TEXT,__text,regular,pure_instructions .macosx_version_min 10, 11 diff --git a/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test b/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test index 0765c38b6b2..5fcfe5412a6 100644 --- a/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test +++ b/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s --- triple: 'i386-apple-darwin' diff --git a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test index 810b540e568..178bb0a3583 100644 --- a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test +++ b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s --- triple: 'x86_64-apple-darwin' diff --git a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test index 03d430e6f2f..c4187b6eeaf 100644 --- a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test +++ b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test @@ -1,5 +1,5 @@ # REQUIRES: object-emission -# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s --- triple: 'x86_64h-apple-darwin' diff --git a/llvm/test/tools/dsymutil/X86/frame-1.test b/llvm/test/tools/dsymutil/X86/frame-1.test index 513694bed14..44ee78831c5 100644 --- a/llvm/test/tools/dsymutil/X86/frame-1.test +++ b/llvm/test/tools/dsymutil/X86/frame-1.test @@ -2,7 +2,7 @@ # RUN: rm -rf %t # RUN: mkdir -p %t # RUN: llc -filetype=obj %p/../Inputs/frame-dw2.ll -o %t/frame-dw2.o -# RUN: llvm-dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s # This test is meant to verify that identical CIEs will get reused # in the same file but also inbetween files. For this to happen, we diff --git a/llvm/test/tools/dsymutil/X86/frame-2.test b/llvm/test/tools/dsymutil/X86/frame-2.test index 613ccb80eab..65d9b6416b3 100644 --- a/llvm/test/tools/dsymutil/X86/frame-2.test +++ b/llvm/test/tools/dsymutil/X86/frame-2.test @@ -3,7 +3,7 @@ # RUN: mkdir -p %t # RUN: llc -filetype=obj %p/../Inputs/frame-dw2.ll -o %t/frame-dw2.o # RUN: llc -filetype=obj %p/../Inputs/frame-dw4.ll -o %t/frame-dw4.o -# RUN: llvm-dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s # Check the handling of multiple different CIEs. To have CIEs that # appear to be different, use a dwarf2 version of the file along with diff --git a/llvm/test/tools/dsymutil/X86/generate-empty-CU.test b/llvm/test/tools/dsymutil/X86/generate-empty-CU.test index 51e2435fe37..5b1dd751593 100644 --- a/llvm/test/tools/dsymutil/X86/generate-empty-CU.test +++ b/llvm/test/tools/dsymutil/X86/generate-empty-CU.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -f -o - -oso-prepend-path=%p/.. -y %s | llvm-dwarfdump -v - | FileCheck %s +# RUN: dsymutil -f -o - -oso-prepend-path=%p/.. -y %s | llvm-dwarfdump -v - | FileCheck %s # This test on links the Dwarf for an LTO binary and on purpose doesn't retain # any symbol in the second CU out of 3. This is the only case where dsymutil diff --git a/llvm/test/tools/dsymutil/X86/label.test b/llvm/test/tools/dsymutil/X86/label.test index be4bc3c83b4..62c9d62b76b 100644 --- a/llvm/test/tools/dsymutil/X86/label.test +++ b/llvm/test/tools/dsymutil/X86/label.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-info | FileCheck %s +# RUN: dsymutil -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-info | FileCheck %s # Compile with: # echo -e ".global _foo;\nfoo:\nnop" | clang -x assembler -g - -c -o /tmp/label.o diff --git a/llvm/test/tools/dsymutil/X86/minimize.test b/llvm/test/tools/dsymutil/X86/minimize.test index 7005926aa3f..d4e8de5e464 100644 --- a/llvm/test/tools/dsymutil/X86/minimize.test +++ b/llvm/test/tools/dsymutil/X86/minimize.test @@ -1,6 +1,6 @@ -RUN: llvm-dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s --check-prefix=FULL -RUN: llvm-dsymutil --minimize -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s -RUN: llvm-dsymutil -z -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s +RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s --check-prefix=FULL +RUN: dsymutil --minimize -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s +RUN: dsymutil -z -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s FULL: Name: __debug_pubnames FULL: Name: __debug_pubtypes diff --git a/llvm/test/tools/dsymutil/X86/mismatch.m b/llvm/test/tools/dsymutil/X86/mismatch.m index 0bebe70c12d..2e907530c5b 100644 --- a/llvm/test/tools/dsymutil/X86/mismatch.m +++ b/llvm/test/tools/dsymutil/X86/mismatch.m @@ -17,7 +17,7 @@ // RUN: rm -rf %t.dir && mkdir %t.dir // RUN: cp %p/../Inputs/mismatch/1.o %p/../Inputs/mismatch/mismatch.pcm %t.dir // RUN: cp %p/../Inputs/mismatch/1.o %t.dir/2.o -// RUN: llvm-dsymutil --verbose -f -oso-prepend-path=%t.dir \ +// RUN: dsymutil --verbose -f -oso-prepend-path=%t.dir \ // RUN: -y %p/dummy-debug-map.map -o %t.bin 2>&1 | FileCheck %s @import mismatch; diff --git a/llvm/test/tools/dsymutil/X86/module-warnings.test b/llvm/test/tools/dsymutil/X86/module-warnings.test index 453e90ee748..2304e978711 100644 --- a/llvm/test/tools/dsymutil/X86/module-warnings.test +++ b/llvm/test/tools/dsymutil/X86/module-warnings.test @@ -23,7 +23,7 @@ # RUN: cp %p/../Inputs/module-warnings/1.o %t.dir # RUN: cp %p/../Inputs/module-warnings/Foo.pcm %t.dir/ModuleCache # -# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y \ +# RUN: dsymutil -f -oso-prepend-path=%t.dir -y \ # RUN: %p/dummy-debug-map.map -o %t 2>&1 | FileCheck %s # # Module-not-found should be reported only once. @@ -32,12 +32,12 @@ # CHECK-NOT: warning: {{.*}}Bar.pcm: # # RUN: cp %p/../Inputs/module-warnings/libstatic.a %t.dir -# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 | FileCheck %s +# RUN: dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 | FileCheck %s # CHECK: rebuild the module cache # CHECK-NOT: static libraries # # RUN: rm -rf %t.dir/ModuleCache -# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 \ +# RUN: dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 \ # RUN: | FileCheck %s --check-prefix=STATIC # STATIC: warning: {{.*}}Bar.pcm: # STATIC: note: Linking a static library diff --git a/llvm/test/tools/dsymutil/X86/modules-dwarf-version.m b/llvm/test/tools/dsymutil/X86/modules-dwarf-version.m index 7fed28226d3..2a49eeb5040 100644 --- a/llvm/test/tools/dsymutil/X86/modules-dwarf-version.m +++ b/llvm/test/tools/dsymutil/X86/modules-dwarf-version.m @@ -8,7 +8,7 @@ // RUN: mkdir %t.dir // RUN: cp %p/../Inputs/modules/Bar.pcm %t.dir // RUN: cp %p/../Inputs/modules-dwarf-version/1.o %t.dir -// RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir \ +// RUN: dsymutil -f -oso-prepend-path=%t.dir \ // RUN: -y %p/dummy-debug-map.map -o - \ // RUN: | llvm-dwarfdump --debug-info - | FileCheck %s diff --git a/llvm/test/tools/dsymutil/X86/modules-empty.m b/llvm/test/tools/dsymutil/X86/modules-empty.m index 22de004cf61..6f956772465 100644 --- a/llvm/test/tools/dsymutil/X86/modules-empty.m +++ b/llvm/test/tools/dsymutil/X86/modules-empty.m @@ -13,7 +13,7 @@ EOF // RUN: rm -rf %t.dir // RUN: mkdir %t.dir // RUN: cp %p/../Inputs/modules-empty/1.o %p/../Inputs/modules-empty/Empty.pcm %t.dir -// RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir \ +// RUN: dsymutil -f -oso-prepend-path=%t.dir \ // RUN: -y %p/dummy-debug-map.map -o - \ // RUN: | llvm-dwarfdump --debug-info - | FileCheck %s diff --git a/llvm/test/tools/dsymutil/X86/modules.m b/llvm/test/tools/dsymutil/X86/modules.m index 37e18b75b4b..1a5209e42bb 100644 --- a/llvm/test/tools/dsymutil/X86/modules.m +++ b/llvm/test/tools/dsymutil/X86/modules.m @@ -18,11 +18,11 @@ EOF clang -c -g odr_violation.c -o 2.o */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/modules \ +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/modules \ // RUN: -y %p/dummy-debug-map.map -o - \ // RUN: | llvm-dwarfdump -v --debug-info - | FileCheck %s -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/modules -y \ +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/modules -y \ // RUN: %p/dummy-debug-map.map -o %t 2>&1 | FileCheck --check-prefix=WARN %s // WARN-NOT: warning: hash mismatch diff --git a/llvm/test/tools/dsymutil/X86/multiple-inputs.test b/llvm/test/tools/dsymutil/X86/multiple-inputs.test index 21219b409ec..bf4674f91ee 100644 --- a/llvm/test/tools/dsymutil/X86/multiple-inputs.test +++ b/llvm/test/tools/dsymutil/X86/multiple-inputs.test @@ -7,7 +7,7 @@ RUN: cat %p/../Inputs/basic-lto.macho.x86_64 > %t/basic-lto.macho.x86_64 RUN: cat %p/../Inputs/basic-lto-dw4.macho.x86_64 > %t/basic-lto-dw4.macho.x86_64 # Multiple inputs in flat mode -RUN: llvm-dsymutil -f -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 +RUN: dsymutil -f -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 RUN: llvm-dwarfdump -a %t/basic.macho.x86_64.dwarf \ RUN: | FileCheck %S/basic-linking-x86.test --check-prefix=CHECK --check-prefix=BASIC RUN: llvm-dwarfdump -a %t/basic-archive.macho.x86_64.dwarf \ @@ -16,7 +16,7 @@ RUN: llvm-dwarfdump -a %t/basic-lto.macho.x86_64.dwarf | FileCheck %S/basic-lto- RUN: llvm-dwarfdump -a %t/basic-lto-dw4.macho.x86_64.dwarf | FileCheck %S/basic-lto-dw4-linking-x86.test # Multiple inputs that end up in the same named bundle -RUN: llvm-dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 -o %t.dSYM +RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 -o %t.dSYM RUN: llvm-dwarfdump -a %t.dSYM/Contents/Resources/DWARF/basic.macho.x86_64 \ RUN: | FileCheck %S/basic-linking-x86.test --check-prefix=CHECK --check-prefix=BASIC RUN: llvm-dwarfdump -a %t.dSYM/Contents/Resources/DWARF/basic-archive.macho.x86_64 \ @@ -25,7 +25,7 @@ RUN: llvm-dwarfdump -a %t.dSYM/Contents/Resources/DWARF/basic-lto.macho.x86_64 | RUN: llvm-dwarfdump -a %t.dSYM/Contents/Resources/DWARF/basic-lto-dw4.macho.x86_64 | FileCheck %S/basic-lto-dw4-linking-x86.test # Multiple inputs in a named bundle in flat mode... impossible. -RUN: not llvm-dsymutil -f -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s +RUN: not dsymutil -f -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s CHECK: error: cannot use -o with multiple inputs in flat mode diff --git a/llvm/test/tools/dsymutil/X86/objc.test b/llvm/test/tools/dsymutil/X86/objc.test index 7dc4d67c090..7acb7c7f0bb 100644 --- a/llvm/test/tools/dsymutil/X86/objc.test +++ b/llvm/test/tools/dsymutil/X86/objc.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -f -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o - \ +RUN: dsymutil -f -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o - \ RUN: | llvm-dwarfdump -apple-types -apple-objc - | FileCheck %s CHECK: .apple_types contents: diff --git a/llvm/test/tools/dsymutil/X86/odr-anon-namespace.cpp b/llvm/test/tools/dsymutil/X86/odr-anon-namespace.cpp index c414a2a2ca9..0bca8f4592c 100644 --- a/llvm/test/tools/dsymutil/X86/odr-anon-namespace.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-anon-namespace.cpp @@ -4,10 +4,10 @@ done */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-anon-namespace -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck %s +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/odr-anon-namespace -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck %s #ifdef FILE1 -// Currently llvm-dsymutil will unique the contents of anonymous +// Currently dsymutil will unique the contents of anonymous // namespaces if they are from the same file/line. Force this // namespace to appear different eventhough it's the same (this // uniquing is actually a bug kept for backward compatibility, see the diff --git a/llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp b/llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp index 7b5c1756a4e..8803b7c64b6 100644 --- a/llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp @@ -4,7 +4,7 @@ done */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-fwd-declaration -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/odr-fwd-declaration -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s #ifdef FILE1 # 1 "Header.h" 1 diff --git a/llvm/test/tools/dsymutil/X86/odr-fwd-declaration2.cpp b/llvm/test/tools/dsymutil/X86/odr-fwd-declaration2.cpp index 0cdc9b4d6a2..7bb159fc0bf 100644 --- a/llvm/test/tools/dsymutil/X86/odr-fwd-declaration2.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-fwd-declaration2.cpp @@ -4,7 +4,7 @@ done */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-fwd-declaration2 -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/odr-fwd-declaration2 -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s #ifdef FILE1 # 1 "Header.h" 1 diff --git a/llvm/test/tools/dsymutil/X86/odr-member-functions.cpp b/llvm/test/tools/dsymutil/X86/odr-member-functions.cpp index 25c4f2a8eca..99fecd0b4ad 100644 --- a/llvm/test/tools/dsymutil/X86/odr-member-functions.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-member-functions.cpp @@ -4,7 +4,7 @@ done */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-member-functions -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck %s +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/odr-member-functions -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -debug-info - | FileCheck %s struct S { __attribute__((always_inline)) void foo() { bar(); } diff --git a/llvm/test/tools/dsymutil/X86/odr-uniquing.cpp b/llvm/test/tools/dsymutil/X86/odr-uniquing.cpp index b45cd3c882e..c94404696d9 100644 --- a/llvm/test/tools/dsymutil/X86/odr-uniquing.cpp +++ b/llvm/test/tools/dsymutil/X86/odr-uniquing.cpp @@ -11,8 +11,8 @@ - without ODR uniquing: all types are re-emited in the second CU */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -v -debug-info - | FileCheck -check-prefix=ODR -check-prefix=CHECK %s -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing -y %p/dummy-debug-map.map -no-odr -o - | llvm-dwarfdump -v -debug-info - | FileCheck -check-prefix=NOODR -check-prefix=CHECK %s +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing -y %p/dummy-debug-map.map -o - | llvm-dwarfdump -v -debug-info - | FileCheck -check-prefix=ODR -check-prefix=CHECK %s +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing -y %p/dummy-debug-map.map -no-odr -o - | llvm-dwarfdump -v -debug-info - | FileCheck -check-prefix=NOODR -check-prefix=CHECK %s // The first compile unit contains all the types: // CHECK: TAG_compile_unit diff --git a/llvm/test/tools/dsymutil/X86/submodules.m b/llvm/test/tools/dsymutil/X86/submodules.m index ef657ff0194..12a3c210659 100644 --- a/llvm/test/tools/dsymutil/X86/submodules.m +++ b/llvm/test/tools/dsymutil/X86/submodules.m @@ -16,7 +16,7 @@ EOF -fdisable-module-hash submodules.m -o 1.o */ -// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/submodules \ +// RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/submodules \ // RUN: -y %p/dummy-debug-map.map -o - \ // RUN: | llvm-dwarfdump -v --debug-info - | FileCheck %s diff --git a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test index daee1cdc72e..95f8e4aa3bf 100644 --- a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test +++ b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -o %T/swift-ast.dSYM -verbose -no-swiftmodule-timestamp | FileCheck %s --check-prefix=DSYMUTIL +RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -o %T/swift-ast.dSYM -verbose -no-swiftmodule-timestamp | FileCheck %s --check-prefix=DSYMUTIL RUN: llvm-readobj -sections -section-data %T/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast.macho.x86_64 | FileCheck %s --check-prefix=READOBJ The tested object file has been created by the dummy Swift code: @@ -15,5 +15,5 @@ READOBJ: Name:{{.*}}__swift_ast READOBJ: |SWIFTMODULE DATA| READOBJ-NEXT: |.| -RUN: llvm-dsymutil -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -no-output -verbose 2>&1 | FileCheck %s --check-prefix=TIMESTAMP +RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -no-output -verbose 2>&1 | FileCheck %s --check-prefix=TIMESTAMP TIMESTAMP: warning: Timestamp mismatch diff --git a/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test b/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test index 29310cae6a4..65282223a30 100644 --- a/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test +++ b/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/swift-dwarf-loc.macho.x86_64 -no-output -verbose | FileCheck %s +RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/swift-dwarf-loc.macho.x86_64 -no-output -verbose | FileCheck %s This test checks that dsymutil generates a valid dwarf location for a symbol with no flags set. diff --git a/llvm/test/tools/dsymutil/X86/update-one-CU.test b/llvm/test/tools/dsymutil/X86/update-one-CU.test index b64ef6a4e04..0759334a62e 100644 --- a/llvm/test/tools/dsymutil/X86/update-one-CU.test +++ b/llvm/test/tools/dsymutil/X86/update-one-CU.test @@ -1,8 +1,8 @@ UNSUPPORTED: system-windows Remove UNSUPPORTED once we figure out why this fails on Windows. -RUN: llvm-dsymutil -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.dSYM -RUN: llvm-dsymutil -update %t.dSYM +RUN: dsymutil -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.dSYM +RUN: dsymutil -update %t.dSYM RUN: llvm-dwarfdump -apple-types -apple-objc %t.dSYM | FileCheck %s CHECK: .apple_types contents: diff --git a/llvm/test/tools/dsymutil/X86/update.test b/llvm/test/tools/dsymutil/X86/update.test index 48a28833468..93e9b3617a6 100644 --- a/llvm/test/tools/dsymutil/X86/update.test +++ b/llvm/test/tools/dsymutil/X86/update.test @@ -4,15 +4,15 @@ Remove UNSUPPORTED once we figure out why this fails on Windows. RUN: rm -rf %t.dir RUN: mkdir -p %t.dir RUN: cat %p/../Inputs/basic.macho.x86_64 > %t.dir/basic -RUN: llvm-dsymutil -oso-prepend-path=%p/.. %t.dir/basic +RUN: dsymutil -oso-prepend-path=%p/.. %t.dir/basic RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %S/basic-linking-x86.test -RUN: llvm-dsymutil --update %t.dir/basic.dSYM +RUN: dsymutil --update %t.dir/basic.dSYM RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %S/basic-linking-x86.test -RUN: llvm-dsymutil -u %t.dir/basic.dSYM +RUN: dsymutil -u %t.dir/basic.dSYM RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %S/basic-linking-x86.test -RUN: llvm-dsymutil --update %t.dir/basic.dSYM -o %t.dir/updated.dSYM +RUN: dsymutil --update %t.dir/basic.dSYM -o %t.dir/updated.dSYM RUN: llvm-dwarfdump -a %t.dir/updated.dSYM | FileCheck %S/basic-linking-x86.test -RUN: llvm-dsymutil -f -o %t2 -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -RUN: llvm-dsymutil -f -u %t2 -o %t3 +RUN: dsymutil -f -o %t2 -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 +RUN: dsymutil -f -u %t2 -o %t3 RUN: llvm-dwarfdump -a %t3 | FileCheck %S/basic-linking-x86.test diff --git a/llvm/test/tools/dsymutil/X86/verify.test b/llvm/test/tools/dsymutil/X86/verify.test index 9f601ac752d..f551bbebd5e 100644 --- a/llvm/test/tools/dsymutil/X86/verify.test +++ b/llvm/test/tools/dsymutil/X86/verify.test @@ -1,14 +1,14 @@ # Positive tests in regular and verbose mode. -# RUN: llvm-dsymutil -verify -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s --allow-empty --check-prefix=QUIET-SUCCESS -# RUN: llvm-dsymutil -verify -verbose -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-SUCCESS --check-prefix=VERBOSE +# RUN: dsymutil -verify -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s --allow-empty --check-prefix=QUIET-SUCCESS +# RUN: dsymutil -verify -verbose -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-SUCCESS --check-prefix=VERBOSE # VERBOSE: Verifying DWARF for architecture: x86_64 # QUIET-SUCCESS-NOT: error: verification failed # Negative tests in regular and verbose mode. # (Invalid object generated from ../Inputs/invalid.s by modified the low PC.) -# RUN: not llvm-dsymutil -verify -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-FAIL -# RUN: not llvm-dsymutil -verify -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-FAIL --check-prefix=VERBOSE +# RUN: not dsymutil -verify -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-FAIL +# RUN: not dsymutil -verify -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-FAIL --check-prefix=VERBOSE # QUIET-FAIL: error: verification failed diff --git a/llvm/test/tools/dsymutil/absolute_symbol.test b/llvm/test/tools/dsymutil/absolute_symbol.test index d20e99b9a29..d813d970139 100644 --- a/llvm/test/tools/dsymutil/absolute_symbol.test +++ b/llvm/test/tools/dsymutil/absolute_symbol.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -dump-debug-map -oso-prepend-path %p %p/Inputs/absolute_sym.macho.i386 | FileCheck %s +RUN: dsymutil -dump-debug-map -oso-prepend-path %p %p/Inputs/absolute_sym.macho.i386 | FileCheck %s The tested object file has been created by the dummy Objective-C code: @interface Foo diff --git a/llvm/test/tools/dsymutil/arch-option.test b/llvm/test/tools/dsymutil/arch-option.test index 02a151cc553..802c417325c 100644 --- a/llvm/test/tools/dsymutil/arch-option.test +++ b/llvm/test/tools/dsymutil/arch-option.test @@ -1,15 +1,15 @@ Processing of the -arch option happens at debug map parsing time, thus just looking at the dumped debug maps is enough to validate their effects. -RUN: llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib | FileCheck %s -check-prefix=ARM64 -check-prefix=ARMV7S -check-prefix=ARMV7 -check-prefix=CHECK -RUN: llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch all | FileCheck %s -check-prefix=ARM64 -check-prefix=ARMV7S -check-prefix=ARMV7 -check-prefix=CHECK -RUN: llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch='*' | FileCheck %s -check-prefix=ARM64 -check-prefix=ARMV7S -check-prefix=ARMV7 -check-prefix=CHECK -RUN: llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm64 | FileCheck %s -check-prefix=ARM64 -check-prefix=CHECK -RUN: llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm | FileCheck %s -check-prefix=ARMV7S -check-prefix=ARMV7 -check-prefix=CHECK -RUN: llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch armv7 | FileCheck %s -check-prefix=ARMV7 -check-prefix=CHECK -RUN: llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm64 -arch armv7s | FileCheck %s -check-prefix=ARM64 -check-prefix=ARMV7S -check-prefix=CHECK -RUN: not llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm42 2>&1 | FileCheck %s -check-prefix=BADARCH -RUN: not llvm-dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch i386 2>&1 | FileCheck %s -check-prefix=EMPTY +RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib | FileCheck %s -check-prefix=ARM64 -check-prefix=ARMV7S -check-prefix=ARMV7 -check-prefix=CHECK +RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch all | FileCheck %s -check-prefix=ARM64 -check-prefix=ARMV7S -check-prefix=ARMV7 -check-prefix=CHECK +RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch='*' | FileCheck %s -check-prefix=ARM64 -check-prefix=ARMV7S -check-prefix=ARMV7 -check-prefix=CHECK +RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm64 | FileCheck %s -check-prefix=ARM64 -check-prefix=CHECK +RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm | FileCheck %s -check-prefix=ARMV7S -check-prefix=ARMV7 -check-prefix=CHECK +RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch armv7 | FileCheck %s -check-prefix=ARMV7 -check-prefix=CHECK +RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm64 -arch armv7s | FileCheck %s -check-prefix=ARM64 -check-prefix=ARMV7S -check-prefix=CHECK +RUN: not dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm42 2>&1 | FileCheck %s -check-prefix=BADARCH +RUN: not dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch i386 2>&1 | FileCheck %s -check-prefix=EMPTY ARMV7: --- diff --git a/llvm/test/tools/dsymutil/archive-timestamp.test b/llvm/test/tools/dsymutil/archive-timestamp.test index f3f2162fa59..f8575442b31 100644 --- a/llvm/test/tools/dsymutil/archive-timestamp.test +++ b/llvm/test/tools/dsymutil/archive-timestamp.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -no-output -oso-prepend-path=%p -y %s 2>&1 | FileCheck %s +# RUN: dsymutil -no-output -oso-prepend-path=%p -y %s 2>&1 | FileCheck %s # This is the archive member part of basic-archive.macho.x86_64 debug map with corrupted timestamps. diff --git a/llvm/test/tools/dsymutil/basic-linking.test b/llvm/test/tools/dsymutil/basic-linking.test index a145e4775a3..1c235312d1c 100644 --- a/llvm/test/tools/dsymutil/basic-linking.test +++ b/llvm/test/tools/dsymutil/basic-linking.test @@ -1,7 +1,7 @@ -RUN: llvm-dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s -RUN: llvm-dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO -RUN: llvm-dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK-ARCHIVE -RUN: llvm-dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 %p/Inputs/basic-lto.macho.x86_64 %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LTO --check-prefix=CHECK-ARCHIVE +RUN: dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s +RUN: dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO +RUN: dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK-ARCHIVE +RUN: dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 %p/Inputs/basic-lto.macho.x86_64 %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LTO --check-prefix=CHECK-ARCHIVE This test check the basic Dwarf linking process through the debug dumps. diff --git a/llvm/test/tools/dsymutil/cmdline.test b/llvm/test/tools/dsymutil/cmdline.test index c45aa676650..ff1fc71b197 100644 --- a/llvm/test/tools/dsymutil/cmdline.test +++ b/llvm/test/tools/dsymutil/cmdline.test @@ -1,6 +1,6 @@ -RUN: llvm-dsymutil -help 2>&1 | FileCheck --check-prefix=HELP %s +RUN: dsymutil -help 2>&1 | FileCheck --check-prefix=HELP %s HELP: OVERVIEW: manipulate archived DWARF debug symbol files. -HELP: USAGE: llvm-dsymutil{{[^ ]*}} [options] <input files> +HELP: USAGE: dsymutil{{[^ ]*}} [options] <input files> HELP-NOT: -reverse-iterate HELP: Specific Options: HELP: -arch=<arch> @@ -21,5 +21,5 @@ HELP: -verify HELP: -y HELP-NOT: -reverse-iterate -RUN: llvm-dsymutil --version 2>&1 | FileCheck --check-prefix=VERSION %s +RUN: dsymutil --version 2>&1 | FileCheck --check-prefix=VERSION %s VERSION: {{ version }} diff --git a/llvm/test/tools/dsymutil/debug-map-parsing.test b/llvm/test/tools/dsymutil/debug-map-parsing.test index 60c1085600c..7cdfdea8fdd 100644 --- a/llvm/test/tools/dsymutil/debug-map-parsing.test +++ b/llvm/test/tools/dsymutil/debug-map-parsing.test @@ -1,8 +1,8 @@ -RUN: llvm-dsymutil -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s -RUN: llvm-dsymutil -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO -RUN: llvm-dsymutil -verbose -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK-ARCHIVE -RUN: llvm-dsymutil -dump-debug-map %p/Inputs/basic.macho.x86_64 2>&1 | FileCheck %s --check-prefix=NOT-FOUND -RUN: not llvm-dsymutil -dump-debug-map %p/Inputs/inexistant 2>&1 | FileCheck %s --check-prefix=NO-EXECUTABLE +RUN: dsymutil -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s +RUN: dsymutil -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO +RUN: dsymutil -verbose -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK-ARCHIVE +RUN: dsymutil -dump-debug-map %p/Inputs/basic.macho.x86_64 2>&1 | FileCheck %s --check-prefix=NOT-FOUND +RUN: not dsymutil -dump-debug-map %p/Inputs/inexistant 2>&1 | FileCheck %s --check-prefix=NO-EXECUTABLE Check that We can parse the debug map of the basic executable. diff --git a/llvm/test/tools/dsymutil/dump-symtab.test b/llvm/test/tools/dsymutil/dump-symtab.test index b83ac7f7ad1..45832356d89 100644 --- a/llvm/test/tools/dsymutil/dump-symtab.test +++ b/llvm/test/tools/dsymutil/dump-symtab.test @@ -1,5 +1,5 @@ -RUN: llvm-dsymutil -s %p/Inputs/fat-test.dylib | FileCheck -check-prefix=ALL -check-prefix=I386 %s -RUN: llvm-dsymutil -arch i386 -s %p/Inputs/fat-test.dylib | FileCheck -check-prefix=I386 -check-prefix=ONE %s +RUN: dsymutil -s %p/Inputs/fat-test.dylib | FileCheck -check-prefix=ALL -check-prefix=I386 %s +RUN: dsymutil -arch i386 -s %p/Inputs/fat-test.dylib | FileCheck -check-prefix=I386 -check-prefix=ONE %s ALL: ---------------------------------------------------------------------- @@ -41,4 +41,4 @@ ALL-NEXT: [ 2] 00000016 66 (N_OSO ) 08 0001 0000000055b1d0b9 ' ALL-NEXT: [ 3] 00000029 20 (N_GSYM ) 00 0000 0000000000000000 '_x86_64h_var' ALL-NEXT: [ 4] 00000001 64 (N_SO ) 01 0000 0000000000000000 ALL-NEXT: [ 5] 00000036 0f ( SECT EXT) 02 0000 0000000000001000 '_x86_64h_var' -ALL-NEXT: [ 6] 00000043 01 ( UNDF EXT) 00 0100 0000000000000000 'dyld_stub_binder'
\ No newline at end of file +ALL-NEXT: [ 6] 00000043 01 ( UNDF EXT) 00 0100 0000000000000000 'dyld_stub_binder' diff --git a/llvm/test/tools/dsymutil/fat-binary-output.test b/llvm/test/tools/dsymutil/fat-binary-output.test index 94345a893e6..7d379c8dc58 100644 --- a/llvm/test/tools/dsymutil/fat-binary-output.test +++ b/llvm/test/tools/dsymutil/fat-binary-output.test @@ -1,4 +1,4 @@ -RUN: llvm-dsymutil -f -verbose -no-output %p/Inputs/fat-test.dylib -oso-prepend-path %p | FileCheck %s +RUN: dsymutil -f -verbose -no-output %p/Inputs/fat-test.dylib -oso-prepend-path %p | FileCheck %s This test doesn't produce any filesytstem output, we just look at the verbose log output. diff --git a/llvm/test/tools/dsymutil/null-die.test b/llvm/test/tools/dsymutil/null-die.test index 253c23c6058..f046c5a2796 100644 --- a/llvm/test/tools/dsymutil/null-die.test +++ b/llvm/test/tools/dsymutil/null-die.test @@ -1,4 +1,4 @@ -#RUN: llvm-dsymutil -f -oso-prepend-path=%p/Inputs/ -y %s -no-output 2>&1 \ +#RUN: dsymutil -f -oso-prepend-path=%p/Inputs/ -y %s -no-output 2>&1 \ #RUN: | FileCheck %s # CHECK: warning: could not find referenced DIE @@ -26,7 +26,7 @@ # To generate the debug map: # # $ ld -arch x86_64 -macosx_version_min 10.13.0 -lSystem null_die.o -o null_die -# $ llvm-dsymutil -dump-debug-map null_die +# $ dsymutil -dump-debug-map null_die --- triple: 'x86_64-apple-darwin' diff --git a/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test b/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test index a108d63ce18..a14217d3947 100644 --- a/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test +++ b/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test @@ -1,4 +1,4 @@ -# RUN: llvm-dsymutil -dump-debug-map -oso-prepend-path=%p -y %s | FileCheck %s +# RUN: dsymutil -dump-debug-map -oso-prepend-path=%p -y %s | FileCheck %s # # The YAML debug map bellow is the one from basic-archive.macho.x86_64 with # the object addresses set to zero. Check that the YAML import is able to diff --git a/llvm/tools/dsymutil/CMakeLists.txt b/llvm/tools/dsymutil/CMakeLists.txt index a5783f5a67e..8d50ad6bac5 100644 --- a/llvm/tools/dsymutil/CMakeLists.txt +++ b/llvm/tools/dsymutil/CMakeLists.txt @@ -8,7 +8,7 @@ set(LLVM_LINK_COMPONENTS Target ) -add_llvm_tool(llvm-dsymutil +add_llvm_tool(dsymutil dsymutil.cpp BinaryHolder.cpp CFBundle.cpp @@ -23,10 +23,10 @@ add_llvm_tool(llvm-dsymutil ) if(APPLE) - target_link_libraries(llvm-dsymutil PRIVATE "-framework CoreFoundation") + target_link_libraries(dsymutil PRIVATE "-framework CoreFoundation") endif(APPLE) if(LLVM_INSTALL_CCTOOLS_SYMLINKS) - add_llvm_tool_symlink(dsymutil llvm-dsymutil) + add_llvm_tool_symlink(dsymutil dsymutil) endif() diff --git a/llvm/tools/dsymutil/DebugMap.cpp b/llvm/tools/dsymutil/DebugMap.cpp index fc5e879f4f7..341f93e30ad 100644 --- a/llvm/tools/dsymutil/DebugMap.cpp +++ b/llvm/tools/dsymutil/DebugMap.cpp @@ -244,11 +244,10 @@ MappingTraits<dsymutil::DebugMapObject>::YamlDMO::denormalize(IO &IO) { if (auto EC = ErrOrObjectFiles.getError()) { warn_ostream() << "Unable to open " << Path << " " << EC.message() << '\n'; } else if (auto ErrOrObjectFile = BinHolder.Get(Ctxt.BinaryTriple)) { - // Rewrite the object file symbol addresses in the debug map. The - // YAML input is mainly used to test llvm-dsymutil without - // requiring binaries checked-in. If we generate the object files - // during the test, we can't hard-code the symbols addresses, so - // look them up here and rewrite them. + // Rewrite the object file symbol addresses in the debug map. The YAML + // input is mainly used to test dsymutil without requiring binaries + // checked-in. If we generate the object files during the test, we can't + // hard-code the symbols addresses, so look them up here and rewrite them. for (const auto &Sym : ErrOrObjectFile->symbols()) { uint64_t Address = Sym.getValue(); Expected<StringRef> Name = Sym.getName(); diff --git a/llvm/tools/dsymutil/LLVMBuild.txt b/llvm/tools/dsymutil/LLVMBuild.txt index 99b0b441c28..3769fbe33f2 100644 --- a/llvm/tools/dsymutil/LLVMBuild.txt +++ b/llvm/tools/dsymutil/LLVMBuild.txt @@ -17,6 +17,6 @@ [component_0] type = Tool -name = llvm-dsymutil +name = dsymutil parent = Tools required_libraries = AsmPrinter DebugInfoDWARF MC Object Support all-targets |
