124 lines
4.2 KiB
Diff
124 lines
4.2 KiB
Diff
diff --git a/configure.ac b/configure.ac
|
|
index 9bd8d6e..205acfc 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -526,7 +526,7 @@ case $host in
|
|
use_x11=no
|
|
build_shared_lib=yes
|
|
;;
|
|
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
|
|
+ i*86*-linux-*)
|
|
target_platform=target_linux
|
|
CORE_SYSTEM_NAME=linux
|
|
ARCH="i486-linux"
|
|
@@ -549,7 +549,7 @@ case $host in
|
|
fi
|
|
fi
|
|
;;
|
|
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
|
|
+ x86_64-*-linux-*)
|
|
target_platform=target_linux
|
|
CORE_SYSTEM_NAME=linux
|
|
ARCH="x86_64-linux"
|
|
diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4
|
|
index d28f263..6fb6210 100644
|
|
--- a/m4/xbmc_arch.m4
|
|
+++ b/m4/xbmc_arch.m4
|
|
@@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[
|
|
|
|
# build detection and setup - this is the native arch
|
|
case $build in
|
|
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
|
|
+ i*86*-linux-*)
|
|
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
|
|
+ x86_64-*-linux-*)
|
|
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
i386-*-freebsd*)
|
|
@@ -17,13 +17,13 @@ case $build in
|
|
*86*-apple-darwin*)
|
|
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
|
|
;;
|
|
- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
|
|
+ powerpc-*-linux-*)
|
|
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC")
|
|
;;
|
|
- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
|
|
+ powerpc64-*-linux-*)
|
|
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
|
|
;;
|
|
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
|
|
+ arm*-*-linux-*)
|
|
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
*)
|
|
@@ -33,10 +33,10 @@ esac
|
|
|
|
# host detection and setup - this is the target arch
|
|
case $host in
|
|
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
|
|
+ i*86*-linux-*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
|
|
+ x86_64-*-linux-*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
i386-*-freebsd*)
|
|
@@ -54,16 +54,16 @@ case $host in
|
|
powerpc-apple-darwin*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
|
|
;;
|
|
- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
|
|
+ powerpc-*-linux-*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC")
|
|
;;
|
|
- powerpc64*-*-linux-gnu*|powerpc64*-*-linux-uclibc*)
|
|
+ powerpc64*-*-linux-*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
|
|
;;
|
|
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*|aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*)
|
|
+ arm*-*-linux-*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
- mips*-*-linux-gnu*|mips*-*-linux-uclibc*)
|
|
+ mips*-*-linux-*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
*-*linux-android*)
|
|
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
|
|
index 3626ea5..f178f7a 100644
|
|
--- a/tools/depends/configure.ac
|
|
+++ b/tools/depends/configure.ac
|
|
@@ -120,13 +120,13 @@ platform_cc=gcc
|
|
platform_cxx=g++
|
|
|
|
case $build in
|
|
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
|
|
+ arm*-*-linux-*)
|
|
build_os="linux"
|
|
;;
|
|
- *i686*-linux-gnu*|i*86*-*-linux-uclibc*)
|
|
+ i*86*-*-linux-*)
|
|
build_os="linux"
|
|
;;
|
|
- x86_64*-linux-gnu*|x86_64-*-linux-uclibc*)
|
|
+ x86_64*-linux-*)
|
|
build_os="linux"
|
|
;;
|
|
*darwin*)
|
|
diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
|
|
index 3fe6854..ca78612 100644
|
|
--- a/xbmc/cores/DllLoader/ldt_keeper.c
|
|
+++ b/xbmc/cores/DllLoader/ldt_keeper.c
|
|
@@ -48,7 +48,7 @@ extern "C" {
|
|
#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0))
|
|
_syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount );
|
|
#else
|
|
-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
|
|
+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
|
|
#define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c);
|
|
#else
|
|
int modify_ldt(int func, void *ptr, unsigned long bytecount);
|