From da2aa7ff28655bbb810017378833666a1be854da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 17 Sep 2024 17:30:25 +0200 Subject: [PATCH] Update to 19.1.0-rc4 --- 0001-flang-Remove-the-dependency-on-Bye.patch | 25 +++++------ flang.spec | 42 +++++++++---------- remove-clangBasic-dependency.diff | 13 ------ sources | 4 +- 4 files changed, 33 insertions(+), 51 deletions(-) delete mode 100644 remove-clangBasic-dependency.diff diff --git a/0001-flang-Remove-the-dependency-on-Bye.patch b/0001-flang-Remove-the-dependency-on-Bye.patch index 1aa1cf2..736746d 100644 --- a/0001-flang-Remove-the-dependency-on-Bye.patch +++ b/0001-flang-Remove-the-dependency-on-Bye.patch @@ -9,12 +9,11 @@ This plugin is not distributed on Fedora. flang/test/Driver/frontend-forwarding.f90 | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) -diff --git a/flang/test/CMakeLists.txt b/flang/test/CMakeLists.txt -index 7d96a72e5f36..73a1f11b4533 100644 ---- a/flang/test/CMakeLists.txt -+++ b/flang/test/CMakeLists.txt -@@ -65,9 +65,6 @@ set(FLANG_TEST_DEPENDS - Fortran_main +diff ---git a/flang/test/CMakeLists.txt b/flang/test/CMakeLists.txt +--- a/flang-19.1.0-rc4.src.orig/test/CMakeLists.txt 2024-09-03 16:09:11.000000000 +0200 ++++ b/flang-19.1.0-rc4.src/test/CMakeLists.txt 2024-09-14 06:41:27.990104254 +0200 +@@ -64,9 +64,6 @@ + FortranRuntime FortranDecimal ) -if (LLVM_ENABLE_PLUGINS AND NOT WIN32) @@ -23,27 +22,25 @@ index 7d96a72e5f36..73a1f11b4533 100644 if (FLANG_INCLUDE_TESTS) if (FLANG_GTEST_AVAIL) -diff --git a/flang/test/Driver/frontend-forwarding.f90 b/flang/test/Driver/frontend-forwarding.f90 -index 8e9c9b78c3c1..79f9ecbbec8d 100644 ---- a/flang/test/Driver/frontend-forwarding.f90 -+++ b/flang/test/Driver/frontend-forwarding.f90 +diff -ruN flang-19.1.0-rc4.src.orig/test/Driver/frontend-forwarding.f90 flang-19.1.0-rc4.src/test/Driver/frontend-forwarding.f90 +--- a/flang-19.1.0-rc4.src.orig/test/Driver/frontend-forwarding.f90 2024-09-03 16:09:11.000000000 +0200 ++++ b/flang-19.1.0-rc4.src/test/Driver/frontend-forwarding.f90 2024-09-14 06:41:27.990104254 +0200 @@ -15,7 +15,6 @@ ! RUN: -fassociative-math \ ! RUN: -freciprocal-math \ ! RUN: -fomit-frame-pointer \ -! RUN: -fpass-plugin=Bye%pluginext \ ! RUN: -fversion-loops-for-stride \ - ! RUN: -flang-experimental-polymorphism \ ! RUN: -flang-experimental-hlfir \ -@@ -47,7 +46,7 @@ + ! RUN: -flang-deprecated-no-hlfir \ +@@ -47,7 +46,6 @@ ! CHECK: "-mreassociate" ! CHECK: "-freciprocal-math" ! CHECK: "-fconvert=little-endian" -! CHECK: "-fpass-plugin=Bye -+! CHECK: "-flang-experimental-polymorphism" ! CHECK: "-fversion-loops-for-stride" - ! CHECK: "-flang-experimental-polymorphism" ! CHECK: "-flang-experimental-hlfir" + ! CHECK: "-flang-deprecated-no-hlfir" -- 2.41.0 diff --git a/flang.spec b/flang.spec index dda137f..dda442d 100644 --- a/flang.spec +++ b/flang.spec @@ -1,9 +1,10 @@ -%global maj_ver 18 +%global maj_ver 19 %global min_ver 1 -%global patch_ver 8 -#global rc_ver 4 +%global patch_ver 0 +%global rc_ver 4 %global flang_version %{maj_ver}.%{min_ver}.%{patch_ver} -%global flang_srcdir flang-%{flang_version}%{?rc_ver:rc%{rc_ver}}.src +%global flang_srcdir flang-%{flang_version}%{?rc_ver:-rc%{rc_ver}}.src +%global toolchain clang # Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer # https://bugzilla.redhat.com/show_bug.cgi?id=2158587 @@ -11,7 +12,7 @@ Name: flang Version: %{flang_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: a Fortran language front-end designed for integration with LLVM License: Apache-2.0 WITH LLVM-exception @@ -152,6 +153,8 @@ cp %{SOURCE4} include/mlir/test/lib/Analysis/ -DMLIR_TABLEGEN_EXE=%{_bindir}/mlir-tblgen \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_RPATH=";" \ + -DMLIR_DIR=%{_libdir}/cmake/mlir \ + -DLLVM_DIR=%{_libdir}/cmake/llvm \ -DCLANG_DIR=%{_libdir}/cmake/clang \ -DCLANG_LINK_CLANG_DYLIB:BOOL=ON \ -DCLANG_RESOURCE_DIR=../../%{clang_resource_dir} \ @@ -241,8 +244,10 @@ rm -f test/Semantics/spec-expr.f90 rm -f test/Evaluate/folding19.f90 %endif -# Remove failing test +# Remove failing tests rm -rf test/Driver/frontend-forwarding.f90 +rm -rf test/Driver/arch-specific-libdir-rpath.f95 +rm -rf test/Driver/linker-flags.f90 export LD_LIBRARY_PATH=%{_builddir}/%{flang_srcdir}/%{_vpath_builddir}/lib %cmake_build --target check-flang @@ -251,35 +256,22 @@ export LD_LIBRARY_PATH=%{_builddir}/%{flang_srcdir}/%{_vpath_builddir}/lib %license LICENSE.TXT %{_bindir}/tco %{_bindir}/bbc -%{_bindir}/flang-to-external-fc %{_bindir}/fir-opt %{_bindir}/flang-new -%{_includedir}/flang/__cuda_builtins.f18.mod %{_includedir}/flang/__cuda_builtins.mod -%{_includedir}/flang/__fortran_builtins.f18.mod %{_includedir}/flang/__fortran_builtins.mod -%{_includedir}/flang/__fortran_ieee_exceptions.f18.mod %{_includedir}/flang/__fortran_ieee_exceptions.mod -%{_includedir}/flang/__fortran_type_info.f18.mod %{_includedir}/flang/__fortran_type_info.mod -%{_includedir}/flang/__ppc_intrinsics.f18.mod %{_includedir}/flang/__ppc_intrinsics.mod -%{_includedir}/flang/__ppc_types.f18.mod %{_includedir}/flang/__ppc_types.mod -%{_includedir}/flang/ieee_arithmetic.f18.mod %{_includedir}/flang/ieee_arithmetic.mod -%{_includedir}/flang/ieee_exceptions.f18.mod %{_includedir}/flang/ieee_exceptions.mod -%{_includedir}/flang/ieee_features.f18.mod %{_includedir}/flang/ieee_features.mod -%{_includedir}/flang/iso_c_binding.f18.mod %{_includedir}/flang/iso_c_binding.mod -%{_includedir}/flang/iso_fortran_env.f18.mod %{_includedir}/flang/iso_fortran_env.mod -%{_includedir}/flang/omp_lib.f18.mod -%{_includedir}/flang/omp_lib.mod -%{_includedir}/flang/mma.f18.mod %{_includedir}/flang/mma.mod +%{_includedir}/flang/cudadevice.mod +%{_includedir}/flang/iso_fortran_env_impl.mod %{_libdir}/libFIRAnalysis.so.%{maj_ver}.%{min_ver} %{_libdir}/libFIRBuilder.so.%{maj_ver}.%{min_ver} @@ -298,9 +290,12 @@ export LD_LIBRARY_PATH=%{_builddir}/%{flang_srcdir}/%{_vpath_builddir}/lib %{_libdir}/libFortranParser.so.%{maj_ver}.%{min_ver}* %{_libdir}/libFortranRuntime.so %{_libdir}/libFortranSemantics.so.%{maj_ver}.%{min_ver}* -%{_libdir}/libFortran_main.a %{_libdir}/libHLFIRDialect.so.%{maj_ver}.%{min_ver} %{_libdir}/libHLFIRTransforms.so.%{maj_ver}.%{min_ver} +%{_libdir}/libCUFAttrs.so +%{_libdir}/libCUFAttrs.so.%{maj_ver}.%{min_ver}* +%{_libdir}/libCUFDialect.so +%{_libdir}/libCUFDialect.so.%{maj_ver}.%{min_ver}* %{clang_resource_dir}/include/ISO_Fortran_binding.h @@ -313,6 +308,9 @@ export LD_LIBRARY_PATH=%{_builddir}/%{flang_srcdir}/%{_vpath_builddir}/lib %{_libdir}/libFortranRuntime.so.%{maj_ver}.%{min_ver}* %changelog +* Tue Sep 17 2024 Timm Bäder - 19.1.0~rc4-1 +- Update to 19.1.0-rc4 + * Wed Jul 17 2024 Fedora Release Engineering - 18.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/remove-clangBasic-dependency.diff b/remove-clangBasic-dependency.diff deleted file mode 100644 index 15540b6..0000000 --- a/remove-clangBasic-dependency.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/flang/unittests/Frontend/CMakeLists.txt b/flang/unittests/Frontend/CMakeLists.txt -index 79a394f161ed..8e535c88e153 100644 ---- a/flang/unittests/Frontend/CMakeLists.txt -+++ b/flang/unittests/Frontend/CMakeLists.txt -@@ -10,7 +10,7 @@ add_flang_unittest(FlangFrontendTests - - target_link_libraries(FlangFrontendTests - PRIVATE -- clangBasic -+ clang-cpp - flangFrontend - flangFrontendTool - FortranLower diff --git a/sources b/sources index 1bcde34..c090151 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (flang-18.1.8.src.tar.xz) = d466e3c4b8638301ccfed9aab7154a85ea9b48de20452446bcf7fbe28b858f17b1f136b83a34fe033fea7f25dcb41985171cce977b7411a83e8c099557422155 -SHA512 (flang-18.1.8.src.tar.xz.sig) = a09e60bf47e6e0fe3a90dd86fe87c19111a46da515b68d8c4e94e0c0eeb36255f76e0fa784e4cd661f88c27d60fba3f6476833de93852e505a8eb3574e1560e6 +SHA512 (flang-19.1.0-rc4.src.tar.xz) = 0d9dc5b269e7a7b3fd7c7dff8a16957143f809f441bdc6c3357aa9acda6c3d369ebb8bdd192d7a7c5b2e2f04ca6b657e8ccd7da59f5d586c37d56bb7f75eceaf +SHA512 (flang-19.1.0-rc4.src.tar.xz.sig) = ffd66bce9dc076fe7474027d348691da0cc07eedaab59d126a0c7daed0e2ce4dba6089bc8904abc5d02b84caff5aee763ee0d6ca496423fb76aabab0fd007c98 SHA512 (Options.td) = 9ecb452051ddcf3de3093dc276acbe9f5c16f7955d76e4a75bd21318074c13df1990e45044392dda39d64fa40119981f22a6ef7bfaf1ca16ba5b7eeb2468c155 SHA512 (TestAliasAnalysis.h) = d1f99cca362e2e9d169b25e71cc761d92618981af07c0de10a56f497aba2ccadb0b808705e08c51f1e5aad235f25a9aad819039e3592ee0ac3594ba7a9116d60