From a28e2dda67ad39a483e9941ac4fec1b63f3ae861 Mon Sep 17 00:00:00 2001 From: thor Date: Tue, 6 Feb 2024 06:49:30 +0000 Subject: [PATCH] revert r5396: no OPT_MULTI means no indirect branches! Bug 367 needs a different fix git-svn-id: svn://scm.orgis.org/mpg123/trunk@5400 35dc7657-300d-0410-a2e5-dc2837fedb53 --- NEWS | 2 -- src/libmpg123/optimize.h | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index d4f6a3e5..7d44e8f8 100644 --- a/NEWS +++ b/NEWS @@ -4,8 +4,6 @@ - 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). -- Fix --enable-portable (no usage of LFS_WRAP_NONE, bug 368). 1.32.4 diff --git a/src/libmpg123/optimize.h b/src/libmpg123/optimize.h index 0a6ec463..6c0c19c4 100644 --- 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_wrap +# define opt_dct36(fr) INT123_dct36_sse #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_wrap +# define opt_dct36(fr) INT123_dct36_3dnowext #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_wrap +# define opt_dct36(fr) INT123_dct36_3dnow #endif #endif @@ -330,7 +330,7 @@ extern const int INT123_costab_mmxsse[]; #define OPT_MMXORSSE #ifndef OPT_MULTI # define defopt x86_64 -# define opt_dct36(fr) INT123_dct36_x86_64_wrap +# define opt_dct36(fr) INT123_dct36_x86_64 #endif #endif @@ -338,7 +338,7 @@ extern const int INT123_costab_mmxsse[]; #define OPT_MMXORSSE #ifndef OPT_MULTI # define defopt avx -# define opt_dct36(fr) INT123_dct36_avx_wrap +# define opt_dct36(fr) INT123_dct36_avx #endif #endif @@ -352,7 +352,7 @@ extern const int INT123_costab_mmxsse[]; #define OPT_MMXORSSE #ifndef OPT_MULTI # define defopt neon -# define opt_dct36(fr) INT123_dct36_neon_wrap +# define opt_dct36(fr) INT123_dct36_neon #endif #endif @@ -360,7 +360,7 @@ extern const int INT123_costab_mmxsse[]; #define OPT_MMXORSSE #ifndef OPT_MULTI # define defopt neon64 -# define opt_dct36(fr) INT123_dct36_neon64_wrap +# define opt_dct36(fr) INT123_dct36_neon64 #endif #endif