Commit 0153c59d authored by Michal Hrusecky's avatar Michal Hrusecky 🦎

mariadb: More ppc & uclibc fixes

parent b812c2a9
......@@ -31,8 +31,15 @@ include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk
ifneq ($(CONFIG_USE_UCLIBC),)
ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-stub
TARGET_CFLAGS:=-I$(ICONV_PREFIX)/include
TARGET_LDFLAGS:=-L$(ICONV_PREFIX)/lib -liconv-stub -latomic
endif
CMAKE_OPTIONS:= -DSTACK_DIRECTION=-1 \
-DHAVE_IB_GCC_ATOMIC_BUILTINS=1 \
-DHAVE_GCC_ATOMIC_BUILTINS=1 \
-DIMPORT_EXECUTABLES=$(STAGING_DIR_HOST)/mariadb-import_executables \
-DPLUGIN_HANDLERSOCKET=NO \
-DPLUGIN_XTRADB=DYNAMIC \
......@@ -50,7 +57,7 @@ CMAKE_OPTIONS:= -DSTACK_DIRECTION=-1 \
define Package/libmariadbclient
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=$(CXX_DEPENDS) +zlib +libpthread +libopenssl
DEPENDS:=$(CXX_DEPENDS) +zlib +libpthread +libopenssl +USE_UCLIBC:libiconv +USE_UCLIBC:libatomic
TITLE:=MariaDB client library
PROVIDES:=libmysqlclient
URL:=http://dev.mysql.com/
......
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -70,9 +70,6 @@ typedef time_t ib_time_t;
the YieldProcessor macro defined in WinNT.h. It is a CPU architecture-
independent way by using YieldProcessor. */
# define UT_RELAX_CPU() YieldProcessor()
-#elif defined(__powerpc__) && defined __GLIBC__
-# include <sys/platform/ppc.h>
-# define UT_RELAX_CPU() __ppc_get_timebase()
#else
# define UT_RELAX_CPU() do { \
volatile int32 volatile_var; \
@@ -89,14 +86,8 @@ typedef time_t ib_time_t;
# define UT_COMPILER_BARRIER()
#endif
-#if defined(HAVE_HMT_PRIORITY_INSTRUCTION)
-# include <sys/platform/ppc.h>
-# define UT_LOW_PRIORITY_CPU() __ppc_set_ppr_low()
-# define UT_RESUME_PRIORITY_CPU() __ppc_set_ppr_med()
-#else
-# define UT_LOW_PRIORITY_CPU() ((void)0)
-# define UT_RESUME_PRIORITY_CPU() ((void)0)
-#endif
+#define UT_LOW_PRIORITY_CPU() ((void)0)
+#define UT_RESUME_PRIORITY_CPU() ((void)0)
/*********************************************************************//**
Delays execution for at most max_wait_us microseconds or returns earlier
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment