[all-commits] [llvm/llvm-project] 36430d: [Driver] Use normalized triples for per-target run...

[Petr Hosek via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 36430d44edba9063a08493c89864edf5f071d08c
      https://github.com/llvm/llvm-project/commit/36430d44edba9063a08493c89864edf5f071d08c
  Author: Petr Hosek <phosek at google.com>
  Date:   2021-04-27 (Tue, 27 Apr 2021)

  Changed paths:
    M clang/cmake/caches/Fuchsia-stage2.cmake
    M clang/lib/Driver/ToolChain.cpp
    M clang/lib/Driver/ToolChains/Fuchsia.cpp
    M clang/lib/Driver/ToolChains/Fuchsia.h
    M clang/lib/Driver/ToolChains/Linux.cpp
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-fuchsia/asan+noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-fuchsia/asan/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-fuchsia/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-fuchsia/noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-fuchsia/relative-vtables+noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-fuchsia/relative-vtables/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-unknown-fuchsia/asan+noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-unknown-fuchsia/asan/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-unknown-fuchsia/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-unknown-fuchsia/noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-unknown-fuchsia/relative-vtables+noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/aarch64-unknown-fuchsia/relative-vtables/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/asan+noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/asan/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/hwasan+noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/hwasan/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/relative-vtables+asan+noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/relative-vtables+asan/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/relative-vtables+hwasan+noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/relative-vtables+hwasan/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/relative-vtables+noexcept/libc++.so
    R clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-fuchsia/relative-vtables/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/asan+noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/asan/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/hwasan+noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/hwasan/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/relative-vtables+asan+noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/relative-vtables+asan/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/relative-vtables+hwasan+noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/relative-vtables+hwasan/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/relative-vtables+noexcept/libc++.so
    A clang/test/Driver/Inputs/basic_fuchsia_tree/lib/x86_64-unknown-fuchsia/relative-vtables/libc++.so
    R clang/test/Driver/Inputs/basic_linux_libcxx_tree/usr/lib/x86_64-linux-gnu/.keep
    A clang/test/Driver/Inputs/basic_linux_libcxx_tree/usr/lib/x86_64-unknown-linux-gnu/.keep
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/.keep
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.asan-preinit.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.asan.so
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.builtins.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.fuzzer.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.lsan.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.profile.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.scudo.so
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.xray-basic.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-fuchsia/libclang_rt.xray.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/.keep
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.asan-preinit.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.asan.so
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.builtins.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.fuzzer.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.lsan.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.profile.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.scudo.so
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.xray-basic.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/aarch64-unknown-fuchsia/libclang_rt.xray.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/i386-linux-gnu/.keep
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/i386-linux-gnu/libclang_rt.builtins.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/i386-unknown-linux-gnu/.keep
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/i386-unknown-linux-gnu/libclang_rt.builtins.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/riscv64-fuchsia/libclang_rt.builtins.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/riscv64-unknown-fuchsia/libclang_rt.builtins.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/.keep
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.asan-preinit.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.asan.so
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.builtins.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.fuzzer.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.lsan.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.profile.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.scudo.so
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.xray-basic.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-fuchsia/libclang_rt.xray.a
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-linux-gnu/.keep
    R clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-linux-gnu/libclang_rt.builtins.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/.keep
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.asan-preinit.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.asan.so
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.builtins.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.fuzzer.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.lsan.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.profile.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.scudo.so
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.xray-basic.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-fuchsia/libclang_rt.xray.a
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-linux-gnu/.keep
    A clang/test/Driver/Inputs/resource_dir_with_per_target_subdir/lib/x86_64-unknown-linux-gnu/libclang_rt.builtins.a
    M clang/test/Driver/fuchsia.c
    M clang/test/Driver/fuchsia.cpp
    M clang/test/Driver/linux-per-target-runtime-dir.c
    M clang/test/Driver/print-file-name.c
    M libcxx/utils/ci/run-buildbot

  Log Message:
  -----------
  [Driver] Use normalized triples for per-target runtimes

This is a partial revert of b4537c3f51bc6c011ddd9c10b80043ac4ce16a01
based on the discussion in https://reviews.llvm.org/D101194. Rather
than using the getMultiarchTriple, we use the getTripleString.