From 41d2813a5faea1c18b7d329109e0287c5cd9ffea Mon Sep 17 00:00:00 2001 From: Alexandre Ganea Date: Fri, 10 Jul 2020 18:52:19 -0400 Subject: [PATCH] [PDB] Attempt fix for debug-info-codeview-buildinfo.c test This is a bit a shot in the dark, as it doesn't occur on my Windows 10 machines, nor on x64 Linux Ubuntu 18.04. This patch tries to fix the following kind of error: - http://lab.llvm.org:8011/builders/clang-ppc64le-linux/builds/31511/steps/cmake%20stage%201/logs/stdio - http://lab.llvm.org:8011/builders/clang-ppc64le-linux-lnt/builds/25150/steps/ninja%20check%201/logs/FAIL%3A%20Clang%3A%3Adebug-info-codeview-buildinfo.c - http://lab.llvm.org:8011/builders/fuchsia-x86_64-linux/builds/7947/steps/check/logs/stdio --- clang/cmake/caches/BaremetalARM.cmake | 1 + clang/cmake/caches/CrossWinToARMLinux.cmake | 1 + clang/cmake/caches/Fuchsia-stage2.cmake | 1 + clang/test/CMakeLists.txt | 1 + clang/test/CodeGen/debug-info-codeview-buildinfo.c | 5 ++--- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/clang/cmake/caches/BaremetalARM.cmake b/clang/cmake/caches/BaremetalARM.cmake index 85295d9db392..e44355cfcbd7 100644 --- a/clang/cmake/caches/BaremetalARM.cmake +++ b/clang/cmake/caches/BaremetalARM.cmake @@ -31,6 +31,7 @@ set(LLVM_TOOLCHAIN_TOOLS llvm-dwarfdump llvm-nm llvm-objdump + llvm-pdbutil llvm-ranlib llvm-readobj llvm-size diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake index 9aa0efa8049f..ccfccce3cb89 100644 --- a/clang/cmake/caches/CrossWinToARMLinux.cmake +++ b/clang/cmake/caches/CrossWinToARMLinux.cmake @@ -137,6 +137,7 @@ set(LLVM_TOOLCHAIN_TOOLS llvm-lib llvm-nm llvm-objdump + llvm-pdbutil llvm-profdata llvm-ranlib llvm-readobj diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index 259684ff2b0d..8b5e9d0c4181 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -240,6 +240,7 @@ set(LLVM_TOOLCHAIN_TOOLS llvm-nm llvm-objcopy llvm-objdump + llvm-pdbutil llvm-profdata llvm-ranlib llvm-readelf diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index 38bbc5be90d5..b2777fded0ae 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -126,6 +126,7 @@ if( NOT CLANG_BUILT_STANDALONE ) llvm-nm llvm-objcopy llvm-objdump + llvm-pdbutil llvm-profdata llvm-readelf llvm-readobj diff --git a/clang/test/CodeGen/debug-info-codeview-buildinfo.c b/clang/test/CodeGen/debug-info-codeview-buildinfo.c index 3434f5f86579..e1082d2532b2 100644 --- a/clang/test/CodeGen/debug-info-codeview-buildinfo.c +++ b/clang/test/CodeGen/debug-info-codeview-buildinfo.c @@ -1,7 +1,6 @@ -// UNSUPPORTED: s390x -// RUN: %clang_cl /c /Z7 /Fo%t.obj -- %s +// RUN: %clang_cl --target=i686-windows-msvc /c /Z7 /Fo%t.obj -- %s // RUN: llvm-pdbutil dump --types %t.obj | FileCheck %s -// RUN: %clang_cl /c /Z7 /Fo%t.obj -fdebug-compilation-dir . -- %s +// RUN: %clang_cl --target=i686-windows-msvc /c /Z7 /Fo%t.obj -fdebug-compilation-dir=. -- %s // RUN: llvm-pdbutil dump --types %t.obj | FileCheck %s --check-prefix RELATIVE int main() { return 42; }