aboutsummaryrefslogtreecommitdiff
Don't refer to x86-specific function on other architectures to avoid linker error.

Submitted upstream at <https://marc.info/?l=linux-bluetooth&m=160857625608440&w=2>

diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
--- a/sbc/sbc_primitives.c
+++ b/sbc/sbc_primitives.c
@@ -593,7 +593,9 @@ static int sbc_calc_scalefactors_j(
 
 static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
 {
+#if defined(__x86_64__) || defined(__i386__)
 	__builtin_cpu_init();
+#endif
 
 #ifdef SBC_BUILD_WITH_MMX_SUPPORT
 	if (__builtin_cpu_supports("mmx"))
n2' href='#n2'>2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
Author: Danny Milosavljevic <dannym@scratchpost.org>
Date: 2023-09-20

diff -ru openjdk-21/make/modules/jdk.internal.le/Lib.gmk.orig openjdk-21.drv-4/source/make/modules/jdk.internal.le/Lib.gmk
--- openjdk-21/make/modules/jdk.internal.le/Lib.gmk.orig	1970-01-01 01:00:01.000000000 +0100
+++ openjdk-21/make/modules/jdk.internal.le/Lib.gmk	2023-09-20 21:42:04.626821839 +0200
@@ -34,7 +34,8 @@
       TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CXXFLAGS_JDKLIB), \
-      LDFLAGS := $(LDFLAGS_JDKLIB), \
+      LDFLAGS := $(LDFLAGS_JDKLIB) \
+        $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS_unix := $(JDKLIB_LIBS) $(LIBCXX), \
       LIBS_windows := $(JDKLIB_LIBS) user32.lib, \
   ))