From 37034ff4bbc9b85807a28c74077473f3c96c463a Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 29 Aug 2017 10:54:50 +0800 Subject: mariadb: disable thumb on armv4 and armv5 Disable thumb on armv4 and armv5 for mariadb which causes link error: | libsql.a(mysqld.cc.o): In function `test_if_case_insensitive(char const*) [clone .constprop.28]': | /usr/src/debug/mariadb/5.5.57-r0/mariadb-5.5.57/sql/mysqld.cc:8276:(.text.unlikely+0xbe): | relocation truncated to fit: R_ARM_THM_CALL against symbol `fn_format' defined | in .glue_7 section in linker stubs | /usr/src/debug/mariadb/5.5.57-r0/mariadb-5.5.57/sql/mysqld.cc:8278:(.text.unlikely+0xd0): | relocation truncated to fit: R_ARM_THM_CALL against symbol `fn_format' defined | in .glue_7 section in linker stubs | /usr/src/debug/mariadb/5.5.57-r0/mariadb-5.5.57/sql/mysqld.cc:8285:(.text.unlikely+0x150): | relocation truncated to fit: R_ARM_THM_CALL against symbol | `sql_print_warning(char const*, ...)' defined in .glue_7 section in linker stubs Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- meta-oe/recipes-support/mysql/mariadb.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 32e3eaa6d4..16dd9f9d59 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -82,6 +82,9 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DCAT_EXECUTABLE=`which cat` \ -DCMAKE_AR:FILEPATH=${AR}" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + do_configure_append() { # handle distros with different values of ${libexecdir} libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` -- cgit 1.2.3-korg