diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index a50d48c..52fd1fc 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 244 +%global baserelease 245 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config @@ -221,6 +221,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Tue Jan 17 2023 Davide Cavalca - 245-1 +- Do not include frame pointers on ppc64le for now + Fixes: rhbz#2161595 + * Mon Jan 16 2023 Tom Stellard - 244-1 - Make -flto=thin the default lto flag for clang diff --git a/rpmrc b/rpmrc index 9ccea43..a69a6c4 100644 --- a/rpmrc +++ b/rpmrc @@ -7,7 +7,7 @@ optflags: i686 %{__global_compiler_flags} -m32 -march=i686 -mtune=generic -msse2 optflags: athlon %{__global_compiler_flags} -m32 -march=athlon -fasynchronous-unwind-tables -fstack-clash-protection optflags: x86_64 %{__global_compiler_flags} -m64 %{__cflags_arch_x86_64} -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection %{_frame_pointers_cflags} %{_frame_pointers_cflags_x86_64} -optflags: ppc64le %{__global_compiler_flags} -m64 %{__cflags_arch_ppc64le} -fasynchronous-unwind-tables -fstack-clash-protection %{_frame_pointers_cflags} +optflags: ppc64le %{__global_compiler_flags} -m64 %{__cflags_arch_ppc64le} -fasynchronous-unwind-tables -fstack-clash-protection # TODO: Remove armv7hl once f36 goes EOL. optflags: armv7hl %{__global_compiler_flags} -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard %{_frame_pointers_cflags} diff --git a/tests/include-frame-pointers/runtest.sh b/tests/include-frame-pointers/runtest.sh index c00b31a..1b0c885 100755 --- a/tests/include-frame-pointers/runtest.sh +++ b/tests/include-frame-pointers/runtest.sh @@ -23,7 +23,7 @@ validate() { fi } -for arch in aarch64 armv7hl x86_64 ppc64le riscv64; do +for arch in aarch64 armv7hl x86_64 riscv64; do case "$arch" in x86_64|aarch64) flags='-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer' @@ -47,7 +47,7 @@ for arch in aarch64 armv7hl x86_64 ppc64le riscv64; do done flags='-fno-omit-frame-pointer' -for arch in i386 i486 i586 i686 athlon s390x; do +for arch in i386 i486 i586 i686 athlon ppc64le s390x; do rpmeval --target="${arch}-linux" --define='_include_frame_pointers 1' | grep -qv -- "$flags" validate "[${arch}] Test that the flags are not included if the macro is defined"