Skip to contentSkip to conversation

libvorbis: Ignore -mfused-madd as well for clang

PATCH New Khem Raj 1 participant 2 messages May 17, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 libvorbis: Ignore -mfused-madd as well for clang

This option is not universal for all compilers

---
 .../0001-configure-Check-for-clang.patch      | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)
meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch +17 -5
index d4fac605b66..36f47f91739 100644
@@ -12,8 +12,6 @@ Signed-off-by: Khem Raj <[email protected]>
  configure.ac | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 28b0a14..2d4e984 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -98,6 +98,16 @@ AC_ARG_ENABLE(examples,
@@ -51,6 +49,20 @@ index 28b0a14..2d4e984 100644
  
  		# glibc < 2.1.3 has a serious FP bug in the math inline header
  		# that will cripple Vorbis.  Look to see if the magic FP stack
--- 
-2.17.0
-
+@@ -178,12 +193,12 @@ else
+   		fi;;
+         powerpc-*-linux*spe)
+  	        DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES"
+- 	        CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -D_REENTRANT"
+- 	        PROFILE="-pg -g -O3 -ffast-math -mfused-madd -D_REENTRANT";;
++			CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT"
++			PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT";;
+ 	powerpc-*-linux*)
+ 		DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES"
+-		CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
+-		PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
++		CFLAGS="-O3 -Wall -Wextra -ffast-math -mcpu=750 -D_REENTRANT"
++		PROFILE="-pg -g -O3 -ffast-math -mcpu=750 -D_REENTRANT";;
+ 	*-*-linux*)
+ 		DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+ 		CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
author
#1 lore raw

PATCH 2/2 kexec-tools: Fix ppc build

Compiler can analyse function pointer parameters now a days and it reports the mismatches, hence fixed.

---
 ...-ppc-fs2dt-Match-function-signatures.patch | 31 +++++++++++++++++++
 .../kexec/kexec-tools_2.0.31.bb               |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-ppc-fs2dt-Match-function-signatures.patch
meta/recipes-kernel/kexec/kexec-tools/0001-ppc-fs2dt-Match-function-signatures.patch new file +31 -0
new file mode 100644
index 00000000000..483e5195a9d
@@ -0,0 +1,31 @@
+From 4a07e8f22b4f224dca79767e5cb86a0de91498dc Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 17 May 2025 07:48:50 -0700
+Subject: [PATCH] ppc/fs2dt: Match function signatures
+
+The prototypes of function pointers is analysed and
+compiler finds the signature mismatches and complain about it.
+
+../kexec-tools-2.0.31/kexec/arch/ppc/fs2dt.c:338:44: error: incompatible function pointer types passing 'int (const void *, const void *)' to parameter of type 'int (*)(const struct dirent **, const struct dirent **)' [-Wincompatible-function-pointer-types]
+  338 |         numlist = scandir(pathname, &namelist, 0, comparefunc);
+      |                                                   ^~~~~~~~~~~
+
+Upstream-Status: Submitted [https://lore.kernel.org/kexec/[email protected]/T/#u]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ kexec/arch/ppc/fs2dt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c
+index fed499b..4952bfc 100644
+--- a/kexec/arch/ppc/fs2dt.c
++++ b/kexec/arch/ppc/fs2dt.c
+@@ -292,7 +292,7 @@ static void putprops(char *fn, struct dirent **nlist, int numlist)
+  * Compare function used to sort the device-tree directories
+  * This function will be passed to scandir.
+  */
+-static int comparefunc(const void *dentry1, const void *dentry2)
++static int comparefunc(const struct dirent ** dentry1, const struct dirent **dentry2)
+ {
+ 	char *str1 = (*(struct dirent **)dentry1)->d_name;
+ 	char *str2 = (*(struct dirent **)dentry2)->d_name;
meta/recipes-kernel/kexec/kexec-tools_2.0.31.bb +4 -0
index d824859686b..7333aa73c17 100644
@@ -18,6 +18,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
            file://0005-Disable-PIE-during-link.patch \
            file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
            file://0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch \
+           file://0001-ppc-fs2dt-Match-function-signatures.patch \
            "
 
 SRC_URI[sha256sum] = "ddaaa65b02b4f8aa9222586b1f26565b93a4baeffd35bcbd523f15fae7aa4897"
@@ -27,6 +28,9 @@ inherit autotools update-rc.d systemd
 export LDFLAGS = "-L${STAGING_LIBDIR}"
 EXTRA_OECONF = " --with-zlib=yes"
 
+# purgatory uses -msoft-float for ppc32/ppc64, it does not go with -maltivec
+TUNE_CCARGS:remove:powerpc = "-maltivec"
+
 do_compile:prepend() {
     # Remove the prepackaged config.h from the source tree as it overrides
     # the same file generated by configure and placed in the build tree