[oe-commits] [meta-openembedded] 01/54: mariadb: disable thumb on armv4 and armv5

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit b74641ad3cb9cea31ef119c40cf7342dc4dfb11e
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Tue Aug 29 10:54:50 2017 +0800

    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 <kai.kang at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/recipes-support/mysql/mariadb.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index 32e3eaa..16dd9f9 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'`

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.