forked from pool/llvm14
Accepting request 1005471 from home:aaronpuchert:branches: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. OBS-URL: https://build.opensuse.org/request/show/1005471 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm14?expand=0&rev=42
This commit is contained in:
parent
77b3f7ed26
commit
abbfdf5c7d
10
clang-test-xfail-gnuless-triple.patch
Normal file
10
clang-test-xfail-gnuless-triple.patch
Normal 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;
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
Mon Sep 19 18:32:11 UTC 2022 - Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
|
11
llvm14.spec
11
llvm14.spec
@ -75,15 +75,9 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{arm}
|
%ifarch %{arm}
|
||||||
%define host_runtime gnueabihf
|
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-gnueabihf
|
||||||
%else
|
%else
|
||||||
%define host_runtime gnu
|
|
||||||
%endif
|
|
||||||
%ifarch riscv64
|
|
||||||
# This must match the gcc target exactly
|
|
||||||
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}
|
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}
|
||||||
%else
|
|
||||||
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-%{host_runtime}
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# By default, build everything.
|
# By default, build everything.
|
||||||
@ -381,6 +375,8 @@ Patch33: CMake-Look-up-target-subcomponents-in-LLVM_AVAILABLE_LIBS.patch
|
|||||||
Patch34: clang-repl-private-deps.patch
|
Patch34: clang-repl-private-deps.patch
|
||||||
# Cherry pick patch from LLVM 15: https://github.com/llvm/llvm-project/issues/56421
|
# Cherry pick patch from LLVM 15: https://github.com/llvm/llvm-project/issues/56421
|
||||||
Patch35: llvm-glibc-2-36.patch
|
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: binutils-devel >= 2.21.90
|
||||||
BuildRequires: cmake >= 3.13.4
|
BuildRequires: cmake >= 3.13.4
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -818,6 +814,7 @@ pushd clang-%{_version}.src
|
|||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch9 -p2
|
%patch9 -p2
|
||||||
%patch34 -p2
|
%patch34 -p2
|
||||||
|
%patch36 -p2
|
||||||
|
|
||||||
# We hardcode openSUSE
|
# We hardcode openSUSE
|
||||||
rm unittests/Driver/DistroTest.cpp
|
rm unittests/Driver/DistroTest.cpp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user