Remove patch for ppc64le triple

Prefer the python-lit patch from https://reviews.llvm.org/D149746
This commit is contained in:
Tulio Magno Quites Machado Filho 2023-05-03 14:59:05 -03:00
parent 85337ee5cf
commit cb8551ea43
2 changed files with 4 additions and 30 deletions

View File

@ -1,26 +0,0 @@
From a17ee723f05887f291937750c81ea86422f7e4fd Mon Sep 17 00:00:00 2001
From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
Date: Thu, 23 Mar 2023 08:25:14 -0300
Subject: [PATCH] [PowerPC][Flang] Fix triple
Some Linux distributions use ppc64le instead of powerpc.
---
flang/test/Driver/fast_math.f90 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flang/test/Driver/fast_math.f90 b/flang/test/Driver/fast_math.f90
index aadd7231b52b..8a63832e2259 100644
--- a/flang/test/Driver/fast_math.f90
+++ b/flang/test/Driver/fast_math.f90
@@ -58,7 +58,7 @@
! Check that -ffast-math causes us to link to crtfastmath.o
! UNSUPPORTED: system-windows
-! UNSUPPORTED: target=powerpc{{.*}}
+! UNSUPPORTED: target={{(ppc|powerpc).*}}
! RUN: %flang -ffast-math -### %s -o %t 2>&1 \
! RUN: | FileCheck --check-prefix=CHECK-CRT %s
! CHECK-CRT: {{crtbegin.?\.o}}
--
2.39.2

View File

@ -12,7 +12,7 @@
Name: flang
Version: %{flang_version}%{?rc_ver:~rc%{rc_ver}}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: a Fortran language front-end designed for integration with LLVM
License: Apache-2.0 WITH LLVM-exception
@ -40,9 +40,6 @@ Patch4: remove-clangBasic-dependency.diff
# Fedora uses CLANG_DEFAULT_PIE_ON_LINUX=OFF.
Patch5: 0001-Match-Fedora-s-value-for-CLANG_DEFAULT_PIE_ON_LINUX.patch
# Fedora and RHEL use a different triple for ppc64le
Patch6: 0001-PowerPC-Flang-Fix-triple.patch
%{lua:
-- Return the maximum number of parallel jobs a build can run based on the
@ -275,6 +272,9 @@ export LD_LIBRARY_PATH=%{_builddir}/%{flang_srcdir}/%{_build}/lib
%doc %{_pkgdocdir}/html/
%changelog
* Mon May 15 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.3-2
- Remove patch for ppc64le triple in favor of https://reviews.llvm.org/D149746
* Thu May 11 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.3-1
- Update to LLVM 16.0.3