mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

uClibc: Resolve conflicting options when building for mips32

Browse Source 
(From OE-Core rev: c096d57d7c55f97897956c192c9ccef2c9cbbe44)

Signed-off-by: Aristov Maxim <m@ximilian.ru>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aristov Maxim
2012-10-20 06:57:07 +04:00
committed by Richard Purdie
parent 72d7f8dc27
commit 616642f094
3 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/uclibc/uclibc-0.9.33/mips/uClibc.machine
-16
View File
@@ -1,16 +0,0 @@
# in OE we use TARGET_CC_ARCH="-march=mips32" but by
# default uclibc uses mips1 ISA for o32 ABI which ends
# up with conflicting march options to gcc. Here we
# ask for MIPS32 ISA to match the OE defaults
CONFIG_MIPS_ISA_MIPS32=y
# Below options are exact copy of general
# uClibc.machine file
#
FORCE_OPTIONS_FOR_ARCH=y
ARCH_HAS_MMU=y
ARCH_USE_MMU=y
KERNEL_HEADERS="/usr/include"
HAVE_DOT_CONFIG=y
meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine
-16
View File
@@ -1,16 +0,0 @@
# in OE we use TARGET_CC_ARCH="-march=mips32" but by
# default uclibc uses mips1 ISA for o32 ABI which ends
# up with conflicting march options to gcc. Here we
# ask for MIPS32 ISA to match the OE defaults
CONFIG_MIPS_ISA_MIPS32=y
# Below options are exact copy of general
# uClibc.machine file
#
FORCE_OPTIONS_FOR_ARCH=y
ARCH_HAS_MMU=y
ARCH_USE_MMU=y
KERNEL_HEADERS="/usr/include"
HAVE_DOT_CONFIG=y
meta/recipes-core/uclibc/uclibc.inc
+10
View File
@@ -85,6 +85,15 @@ OE_DEL := "${@features_to_uclibc_del(d)}"
python () { python () {
if "${OE_DEL}": if "${OE_DEL}":
d.setVar('configmangle_append', "${OE_DEL}" + "\n") d.setVar('configmangle_append', "${OE_DEL}" + "\n")
# by default uclibc uses mips1 ISA for o32 ABI
# if we use TARGET_CC_ARCH="-march=mips32" we end up
# with conflicting march options to gcc. Here we
# ask for MIPS32 ISA to match the chosen arch
if "mips32" in d.getVar("TUNE_FEATURES",True):
d.setVar('configmangle_append',
"/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_MIPS32=y\n\n")
if "${OE_FEATURES}": if "${OE_FEATURES}":
d.setVar('configmangle_append', d.setVar('configmangle_append',
"/^### DISTRO FEATURES$/a\\\n%s\n\n" % "/^### DISTRO FEATURES$/a\\\n%s\n\n" %
@@ -133,6 +142,7 @@ do_configure() {
echo "### FPU" >>${S}/merged.config echo "### FPU" >>${S}/merged.config
echo "### ABI" >>${S}/merged.config echo "### ABI" >>${S}/merged.config
echo "### DISTRO FEATURES" >>${S}/merged.config echo "### DISTRO FEATURES" >>${S}/merged.config
echo "### MIPS32_CHECK" >>${S}/merged.config
# Mangle the resulting .config depending on OE variables # Mangle the resulting .config depending on OE variables
sed -i -e '${configmangle}' ${S}/merged.config sed -i -e '${configmangle}' ${S}/merged.config