Skip to contentSkip to conversation

mariadb: disable thumb on armv4 and armv5

PATCH New [email protected] 1 participant 1 message Aug 29, 2017

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mariadb: disable thumb on armv4 and armv5

From: Kai Kang <[email protected]>

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
---
 meta-oe/recipes-support/mysql/mariadb.inc | 3 +++
 1 file changed, 3 insertions(+)
meta-oe/recipes-support/mysql/mariadb.inc +3 -0
index 32e3eaa6d..16dd9f9d5 100644
@@ -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'`
Signature · 1 line
2.14.1