From 0284b24c0523e62f69fca7161cb1bd82218d5303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= Date: Wed, 14 Aug 2024 15:10:34 +0200 Subject: [PATCH 1/5] gnuconfig: sync with upstream git Commit sync: 00b15927496058d23e6258a28d8996f87cf1f191 --- config.guess | 11 +- config.sub | 729 +++++++++++++++++++++++++++++++---------- redhat-rpm-config.spec | 5 +- 3 files changed, 567 insertions(+), 178 deletions(-) diff --git a/config.guess b/config.guess index f6d217a..48a6846 100644 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2024-01-01' +timestamp='2024-07-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -123,7 +123,7 @@ set_cc_for_build() { dummy=$tmp/dummy case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do + for driver in cc gcc c17 c99 c89 ; do if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD=$driver break @@ -634,7 +634,8 @@ EOF sed 's/^ //' << EOF > "$dummy.c" #include - main() + int + main () { if (!__power_pc()) exit(1); @@ -718,7 +719,8 @@ EOF #include #include - int main () + int + main () { #if defined(_SC_KERNEL_BITS) long bits = sysconf(_SC_KERNEL_BITS); @@ -1621,6 +1623,7 @@ cat > "$dummy.c" <&2 exit 1 ;; - kfreebsd*-gnu*- | kopensolaris*-gnu*-) + kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-) ;; vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-) ;; @@ -1864,6 +2245,8 @@ case $kernel-$os-$obj in ;; os2-emx-) ;; + rtmk-nova-) + ;; *-eabi*- | *-gnueabi*-) ;; none--*) @@ -1890,7 +2273,7 @@ case $vendor in *-riscix*) vendor=acorn ;; - *-sunos*) + *-sunos* | *-solaris*) vendor=sun ;; *-cnk* | *-aix*) diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 107beb1..aff0eb4 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 293 +%global baserelease 294 Summary: Red Hat-family-specific rpm configuration files Name: redhat-rpm-config @@ -254,6 +254,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua %doc buildflags.md %changelog +* Wed Aug 14 2024 Frédéric Bérat - 294-1 +- Update config.{guess,sub} to gnuconfig git HEAD + * Fri Jun 7 2024 Florian Weimer - 293-1 - Enable DT_RELR for aarch64 From 1712c050a1dca4970af67717779167982ae13907 Mon Sep 17 00:00:00 2001 From: Dridi Boukelmoune Date: Fri, 6 Sep 2024 16:51:00 +0200 Subject: [PATCH 2/5] Add architectures macro for Hare --- macros.hare-srpm | 4 ++++ redhat-rpm-config.spec | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 macros.hare-srpm diff --git a/macros.hare-srpm b/macros.hare-srpm new file mode 100644 index 0000000..8cb5abc --- /dev/null +++ b/macros.hare-srpm @@ -0,0 +1,4 @@ +# Architecture Hare and dependent packages run on. This is the intersection of +# supported architectures across the Hare tool chain, essentially limited by +# available QBE targets. +%hare_arches x86_64 aarch64 riscv64 diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index aff0eb4..f627124 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 294 +%global baserelease 295 Summary: Red Hat-family-specific rpm configuration files Name: redhat-rpm-config @@ -45,6 +45,7 @@ Source105: macros.valgrind-srpm Source106: macros.java-srpm Source107: macros.gap-srpm Source108: macros.dotnet-srpm +Source109: macros.hare-srpm # Other misc macros Source150: macros.build-constraints @@ -254,6 +255,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua %doc buildflags.md %changelog +* Fri Sep 06 2024 Dridi Boukelmoune - 295-1 +- Define %%hare_arches with a list of Hare host architectures + * Wed Aug 14 2024 Frédéric Bérat - 294-1 - Update config.{guess,sub} to gnuconfig git HEAD From b0b2a84bc83e13dbef714ce1ebf84159cf81f9be Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Wed, 25 Sep 2024 00:08:04 -0400 Subject: [PATCH 3/5] Change ppc64le tuning to Power 10 for RHEL10 and beyond --- macros | 2 +- redhat-rpm-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros b/macros index 35f1dfa..4b2ca28 100644 --- a/macros +++ b/macros @@ -154,7 +154,7 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end # Also used for s390. %__cflags_arch_s390x %[0%{?rhel} >= 9 ? "-march=z14 -mtune=z15" : "-march=z13 -mtune=z14"] -%__cflags_arch_ppc64le %[0%{?rhel} >= 9 ? "-mcpu=power9 -mtune=power9" : "-mcpu=power8 -mtune=power8"] +%__cflags_arch_ppc64le %[0%{?rhel} >= 9 ? "-mcpu=power9 -mtune=power10" : "-mcpu=power8 -mtune=power8" ] #============================================================================== # ---- configure and makeinstall. diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index f627124..6ba0df0 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 295 +%global baserelease 296 Summary: Red Hat-family-specific rpm configuration files Name: redhat-rpm-config @@ -255,6 +255,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua %doc buildflags.md %changelog +* Wed Sep 25 2024 Siddhesh Poyarekar - 296-1 +- Change ppc64le tuning to Power 10 for RHEL10 and beyond. + * Fri Sep 06 2024 Dridi Boukelmoune - 295-1 - Define %%hare_arches with a list of Hare host architectures From 72010540323d8c8e6ffa7a89743a746db360ec42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 13 Jul 2024 20:30:40 +0200 Subject: [PATCH 4/5] Pull in filesystem-macro package for sbin merge https://src.fedoraproject.org/rpms/filesystem/pull-request/15 add the subpackage in filesystem. --- redhat-rpm-config.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 6ba0df0..489173a 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 296 +%global baserelease 297 Summary: Red Hat-family-specific rpm configuration files Name: redhat-rpm-config @@ -108,6 +108,8 @@ Requires: qt6-srpm-macros Requires: rust-srpm-macros Requires: package-notes-srpm-macros Requires: pyproject-srpm-macros +# ↓ Create compat Provides/Requires when things move around in filesystem +Requires: filesystem-srpm-macros %if ! 0%{?rhel} Requires: ansible-srpm-macros @@ -255,6 +257,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua %doc buildflags.md %changelog +* Wed Oct 2 2024 Zbigniew Jedrzejewski-Szmek - 297-1 +- Pull in filesystem-srpm-macros + * Wed Sep 25 2024 Siddhesh Poyarekar - 296-1 - Change ppc64le tuning to Power 10 for RHEL10 and beyond. From 93063bb396395b9a208a2448fdcf55eccf16219e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 4 Oct 2024 20:04:52 +0200 Subject: [PATCH 5/5] Update comment and documentation about DT_RELR or packed relocations Fallout from ed9ad0e79d9fe7025bce54e1098fa05f272eda05 https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/313 --- buildflags.md | 2 +- macros | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildflags.md b/buildflags.md index 0554f81..a78ecf6 100644 --- a/buildflags.md +++ b/buildflags.md @@ -654,7 +654,7 @@ to the compiler driver `gcc`, and not directly to the link editor * `-z pack-relative-relocs`: Use the portable `DT_RELR` scheme for relative relocations, resulting in reduced startup time compared to legacy architecture-specific relocations. (`-z pack-relative-relocs` - is currently disabled on aarch64 and s390x due to toolchain limitations.) + is currently disabled on s390x due to toolchain limitations.) * `-z defs`: Refuse to link shared objects (DSOs) with undefined symbols (optional, see above). diff --git a/macros b/macros index 4b2ca28..ef3df7e 100644 --- a/macros +++ b/macros @@ -380,7 +380,7 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end %_ld_as_needed 1 %_ld_as_needed_flags %{?_ld_as_needed:-Wl,--as-needed} -# aarch64 and s390x currently do not support packed relocations. +# s390x currently does not support packed relocations. %_ld_pack_relocs %[ "%{_arch}" == "x86_64" || "%{_arch}" == "i386" || "%{_arch}" == "ppc64le" || "%{_arch}" == "aarch64"] %_ld_pack_relocs_flags %[0%{?_ld_pack_relocs} ? "-Wl,-z,pack-relative-relocs" : ""]