From patchwork Wed Feb 22 06:37:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [03/10] arch-mips.inc: rearrange for gcc-multilib Date: Wed, 22 Feb 2012 06:37:46 -0000 From: Nitin A Kamble X-Patchwork-Id: 21539 Message-Id: To: openembedded-core@lists.openembedded.org From: Nitin A Kamble make tune feature names mips specific no functional changes here Signed-off-by: Nitin A Kamble --- meta/conf/machine/include/mips/arch-mips.inc | 65 +++++++++++++------------ 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc index b7ded76..b674d66 100644 --- a/meta/conf/machine/include/mips/arch-mips.inc +++ b/meta/conf/machine/include/mips/arch-mips.inc @@ -7,61 +7,64 @@ DEFAULTTUNE ?= "mips" # Endianess -TUNEVALID[bigendian] = "Enable big-endian mode" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-meb", "-mel", d)}" +TUNEVALID[mips-bigendian] = "Enable big-endian mode" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips-bigendian", "-meb", "-mel", d)}" # ABI flags -TUNEVALID[o32] = "MIPS o32 ABI" -TUNECONFLICT[o32] = "n32 n64" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "o32", "-mabi=32", "", d)}" +TUNEVALID[mips-o32] = "MIPS o32 ABI" +TUNECONFLICT[mips-o32] = "mips-n32 mips-n64" +TUNE_FEATURE_CCARGS-mips-o32 ?= "-mabi=32" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips-o32", "${TUNE_FEATURE_CCARGS-mips-o32}", "", d)}" -TUNEVALID[n32] = "MIPS64 n32 ABI" -TUNECONFLICT[n32] = "o32 n64" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n32", "-mabi=n32", "", d)}" +TUNEVALID[mips-n32] = "MIPS64 n32 ABI" +TUNECONFLICT[mips-n32] = "mips-o32 mips-n64" +TUNE_FEATURE_CCARGS-mips-n32 ?= "-mabi=n32" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips-n32", "${TUNE_FEATURE_CCARGS-mips-n32}", "", d)}" -TUNEVALID[n64] = "MIPS64 n64 ABI" -TUNECONFLICT[n64] = "o32 n32" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n64", "-mabi=64", "", d)}" +TUNEVALID[mips-n64] = "MIPS64 n64 ABI" +TUNECONFLICT[mips-n64] = "mips-o32 mips-n32" +TUNE_FEATURE_CCARGS-mips-n64 ?= "-mabi=64" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips-n64", "${TUNE_FEATURE_CCARGS-mips-n64}", "", d)}" # Floating point -TUNEVALID[fpu-hard] = "Use hardware FPU" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "-mhard-float", "-msoft-float", d)}" -TARGET_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "", "soft", d)}" +TUNEVALID[mips-fpu-hard] = "Use hardware FPU" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips-fpu-hard", "-mhard-float", "-msoft-float", d)}" +TARGET_FPU = "${@bb.utils.contains("TUNE_FEATURES", "mips-fpu-hard", "", "soft", d)}" # Package naming -MIPSPKGSFX_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" -MIPSPKGSFX_BYTE = "${@bb.utils.contains("TUNE_FEATURES", "n64" , "64", "", d)}" -MIPSPKGSFX_BYTE .= "${@bb.utils.contains("TUNE_FEATURES", "n32" , "64", "", d)}" -MIPSPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}" -MIPSPKGSFX_ABI = "${@bb.utils.contains("TUNE_FEATURES", "n32", "-n32", "", d)}" +MIPSPKGSFX_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "mips-bigendian", "", "el", d)}" +MIPSPKGSFX_BYTE = "${@bb.utils.contains("TUNE_FEATURES", "mips-n64" , "64", "", d)}" +MIPSPKGSFX_BYTE .= "${@bb.utils.contains("TUNE_FEATURES", "mips-n32" , "64", "", d)}" +MIPSPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "mips-fpu-hard" , "", "-nf", d)}" +MIPSPKGSFX_ABI = "${@bb.utils.contains("TUNE_FEATURES", "mips-n32", "-n32", "", d)}" TUNE_ARCH = "mips${MIPSPKGSFX_BYTE}${MIPSPKGSFX_ENDIAN}" TUNE_PKGARCH ?= "${TUNE_ARCH}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}" # Base tunes AVAILTUNES += "mips mips64-n32 mips64 mipsel mips64el-n32 mips64el mips-nf mips64-nf-n32 mips64-nf mipsel-nf mips64el-nf-n32 mips64el-nf" -TUNE_FEATURES_tune-mips = "o32 bigendian fpu-hard" +TUNE_FEATURES_tune-mips = "mips-o32 mips-bigendian mips-fpu-hard" BASE_LIB_tune-mips = "lib" -TUNE_FEATURES_tune-mips64-n32 = "n32 bigendian fpu-hard" +TUNE_FEATURES_tune-mips64-n32 = "mips-n32 mips-bigendian mips-fpu-hard" BASE_LIB_tune-mips64-n32 = "lib32" -TUNE_FEATURES_tune-mips64 = "n64 bigendian fpu-hard" +TUNE_FEATURES_tune-mips64 = "mips-n64 mips-bigendian mips-fpu-hard" BASE_LIB_tune-mips64 = "lib64" -TUNE_FEATURES_tune-mipsel = "o32 fpu-hard" +TUNE_FEATURES_tune-mipsel = "mips-o32 mips-fpu-hard" BASE_LIB_tune-mipsel = "lib" -TUNE_FEATURES_tune-mips64el-n32 = "n32 fpu-hard" +TUNE_FEATURES_tune-mips64el-n32 = "mips-n32 mips-fpu-hard" BASE_LIB_tune-mips64el-n32 = "lib32" -TUNE_FEATURES_tune-mips64el = "n64 fpu-hard" +TUNE_FEATURES_tune-mips64el = "mips-n64 mips-fpu-hard" BASE_LIB_tune-mips64el = "lib64" -TUNE_FEATURES_tune-mips-nf = "o32 bigendian" +TUNE_FEATURES_tune-mips-nf = "mips-o32 mips-bigendian" BASE_LIB_tune-mips-nf = "lib" -TUNE_FEATURES_tune-mips64-nf-n32 = "n32 bigendian" +TUNE_FEATURES_tune-mips64-nf-n32 = "mips-n32 mips-bigendian" BASE_LIB_tune-mips64-nf-n32 = "lib32" -TUNE_FEATURES_tune-mips64-nf = "n64 bigendian" +TUNE_FEATURES_tune-mips64-nf = "mips-n64 mips-bigendian" BASE_LIB_tune-mips64-nf = "lib64" -TUNE_FEATURES_tune-mipsel-nf = "o32" +TUNE_FEATURES_tune-mipsel-nf = "mips-o32" BASE_LIB_tune-mipsel-nf = "lib" -TUNE_FEATURES_tune-mips64el-nf-n32 = "n32" +TUNE_FEATURES_tune-mips64el-nf-n32 = "mips-n32" BASE_LIB_tune-mips64el-nf-n32 = "lib32" -TUNE_FEATURES_tune-mips64el-nf = "n64" +TUNE_FEATURES_tune-mips64el-nf = "mips-n64" BASE_LIB_tune-mips64el-nf = "lib64"