SHA256
1
0
forked from pool/llvm14

Accepting request 1005472 from devel:tools:compiler

- Always drop -gnu from triple for consistency. Patch a test that
  was looking for -linux- in clang-test-xfail-gnuless-triple.patch.
- Use correct LLVM_HOST_TRIPLE for riscv64

OBS-URL: https://build.opensuse.org/request/show/1005472
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/llvm14?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2022-09-25 13:34:13 +00:00 committed by Git OBS Bridge
commit a065261332
3 changed files with 26 additions and 3 deletions

View File

@ -0,0 +1,10 @@
diff --git a/clang/test/Driver/XRay/xray-instrument-os.c b/clang/test/Driver/XRay/xray-instrument-os.c
index 3a0397208326..5cf7e35fdbf3 100644
--- a/clang/test/Driver/XRay/xray-instrument-os.c
+++ b/clang/test/Driver/XRay/xray-instrument-os.c
@@ -1,4 +1,4 @@
// RUN: not %clang -o /dev/null -v -fxray-instrument -c %s
-// XFAIL: -linux-, -freebsd, x86_64-apple-darwin, x86_64-apple-macos
+// XFAIL: linux, freebsd, x86_64-apple-darwin, x86_64-apple-macos
// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64
typedef int a;

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Sep 21 21:21:19 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Always drop -gnu from triple for consistency. Patch a test that
was looking for -linux- in clang-test-xfail-gnuless-triple.patch.
-------------------------------------------------------------------
Mon Sep 19 18:32:11 UTC 2022 - Andreas Schwab <schwab@suse.de>
- Use correct LLVM_HOST_TRIPLE for riscv64
-------------------------------------------------------------------
Sat Sep 3 15:15:10 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>

View File

@ -75,11 +75,10 @@
%endif
%ifarch %{arm}
%define host_runtime gnueabihf
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-gnueabihf
%else
%define host_runtime gnu
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}
%endif
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-%{host_runtime}
# By default, build everything.
%global llvm_targets "all"
@ -376,6 +375,8 @@ Patch33: CMake-Look-up-target-subcomponents-in-LLVM_AVAILABLE_LIBS.patch
Patch34: clang-repl-private-deps.patch
# Cherry pick patch from LLVM 15: https://github.com/llvm/llvm-project/issues/56421
Patch35: llvm-glibc-2-36.patch
# Let test match for linux instead of -linux-.
Patch36: clang-test-xfail-gnuless-triple.patch
BuildRequires: binutils-devel >= 2.21.90
BuildRequires: cmake >= 3.13.4
BuildRequires: fdupes
@ -813,6 +814,7 @@ pushd clang-%{_version}.src
%patch6 -p1
%patch9 -p2
%patch34 -p2
%patch36 -p2
# We hardcode openSUSE
rm unittests/Driver/DistroTest.cpp