Merge remote-tracking branch 'mpg123/master' into master-with-github-ci

madebr · Jan 25, 2024 · c2b5c82 · c2b5c82
2 parents 94091f8 + 9d8333e
commit c2b5c82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/NEWS b/NEWS
@@ -3,6 +3,9 @@
 
 - build:
 -- CMake port uses CFLAGS for pulse/jack/tinyalsa properly now (bug 366).
+- libmpg123:
+-- Also avoid indirect branches for builds with a single CPU optmization
+   (no OPT_MULTI) by actually using the wrappers in that case (bug 367).
 
 1.32.4
 ------

diff --git a/src/libmpg123/optimize.h b/src/libmpg123/optimize.h
@@ -265,7 +265,7 @@ enum optcla INT123_decclass(const enum optdec);
 #define OPT_X86
 #ifndef OPT_MULTI
 #	define defopt sse
-#	define opt_dct36(fr) INT123_dct36_sse
+#	define opt_dct36(fr) INT123_dct36_sse_wrap
 #endif
 #endif
 
@@ -294,7 +294,7 @@ enum optcla INT123_decclass(const enum optdec);
 #define OPT_X86
 #ifndef OPT_MULTI
 #	define defopt dreidnowext_vintage
-#	define opt_dct36(fr) INT123_dct36_3dnowext
+#	define opt_dct36(fr) INT123_dct36_3dnowext_wrap
 #endif
 #endif
 
@@ -316,7 +316,7 @@ extern const int INT123_costab_mmxsse[];
 #define OPT_X86
 #ifndef OPT_MULTI
 #	define defopt dreidnow_vintage
-#	define opt_dct36(fr) INT123_dct36_3dnow
+#	define opt_dct36(fr) INT123_dct36_3dnow_wrap
 #endif
 #endif
 
@@ -330,15 +330,15 @@ extern const int INT123_costab_mmxsse[];
 #define OPT_MMXORSSE
 #ifndef OPT_MULTI
 #	define defopt x86_64
-#	define opt_dct36(fr) INT123_dct36_x86_64
+#	define opt_dct36(fr) INT123_dct36_x86_64_wrap
 #endif
 #endif
 
 #ifdef OPT_AVX
 #define OPT_MMXORSSE
 #ifndef OPT_MULTI
 #	define defopt avx
-#	define opt_dct36(fr) INT123_dct36_avx
+#	define opt_dct36(fr) INT123_dct36_avx_wrap
 #endif
 #endif
 
@@ -352,15 +352,15 @@ extern const int INT123_costab_mmxsse[];
 #define OPT_MMXORSSE
 #ifndef OPT_MULTI
 #	define defopt neon
-#	define opt_dct36(fr) INT123_dct36_neon
+#	define opt_dct36(fr) INT123_dct36_neon_wrap
 #endif
 #endif
 
 #ifdef OPT_NEON64
 #define OPT_MMXORSSE
 #ifndef OPT_MULTI
 #	define defopt neon64
-#	define opt_dct36(fr) INT123_dct36_neon64
+#	define opt_dct36(fr) INT123_dct36_neon64_wrap
 #endif
 #endif