From 6174900a0e949c00c5a683f080b0cae73fdeb10b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 25 Apr 2012 15:35:39 -0700 Subject: gcc-4.6, gcc-4.7: Add support for building mips64 cross compiler Defaults to n64 ABI (From OE-Core rev: 253f1f3aebd1a90c55efcc6d1f585204e7f3c371) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.6.inc | 1 + .../gcc/gcc-4.6/mips64-default-n64.patch | 32 ++++++++++++++++++++++ meta/recipes-devtools/gcc/gcc-4.7.inc | 1 + .../gcc/gcc-4.7/mips64-default-n64.patch | 19 +++++++++++++ meta/recipes-devtools/gcc/gcc-configure-common.inc | 4 +++ 5 files changed, 57 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.7/mips64-default-n64.patch (limited to 'meta') diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index 65bc65d..7a70a38 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -74,6 +74,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \ file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \ file://fortran-cross-compile-hack.patch \ file://cpp-honour-sysroot.patch \ + file://mips64-default-n64.patch \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch " diff --git a/meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch b/meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch new file mode 100644 index 0000000..bf930ec --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch @@ -0,0 +1,32 @@ +MIPS64 defaults to n32 ABI, this patch makes it +so that it defaults to N64 ABI + +Upstream-Status: Inappropriate [OE config specific] + +Signed-off-by: Khem Raj +Index: gcc-4_6-branch/gcc/config.gcc +=================================================================== +--- gcc-4_6-branch.orig/gcc/config.gcc 2012-04-22 19:12:12.431061229 -0700 ++++ gcc-4_6-branch/gcc/config.gcc 2012-04-22 19:13:36.307065289 -0700 +@@ -1882,7 +1882,7 @@ + mips64*-*-linux* | mipsisa64*-*-linux*) + tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/linux.h mips/linux64.h" + tmake_file="${tmake_file} mips/t-linux64 mips/t-libgcc-mips16" +- tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32" ++ tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_64" + case ${target} in + mips64el-st-linux-gnu) + tm_file="${tm_file} mips/st.h" +Index: gcc-4_6-branch/gcc/config/mips/linux64.h +=================================================================== +--- gcc-4_6-branch.orig/gcc/config/mips/linux64.h 2012-04-22 19:10:59.743057711 -0700 ++++ gcc-4_6-branch/gcc/config/mips/linux64.h 2012-04-22 19:11:56.919060479 -0700 +@@ -26,7 +26,7 @@ + BASE_DRIVER_SELF_SPECS, \ + LINUX_DRIVER_SELF_SPECS \ + " %{!EB:%{!EL:%(endian_spec)}}" \ +- " %{!mabi=*: -mabi=n32}" ++ " %{!mabi=*: -mabi=64}" + + #undef LIB_SPEC + #define LIB_SPEC "\ diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc index 8adeb8d..efd166c 100644 --- a/meta/recipes-devtools/gcc/gcc-4.7.inc +++ b/meta/recipes-devtools/gcc/gcc-4.7.inc @@ -64,6 +64,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \ file://fortran-cross-compile-hack.patch \ file://libgcc-sjlj-check.patch \ file://cpp-honor-sysroot.patch \ + file://mips64-default-n64.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${BRANCH}" diff --git a/meta/recipes-devtools/gcc/gcc-4.7/mips64-default-n64.patch b/meta/recipes-devtools/gcc/gcc-4.7/mips64-default-n64.patch new file mode 100644 index 0000000..a42569e --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.7/mips64-default-n64.patch @@ -0,0 +1,19 @@ +MIPS64 defaults to n32 ABI, this patch makes it +so that it defaults to N64 ABI + +Upstream-Status: Inappropriate [OE config specific] + +Signed-off-by: Khem Raj +Index: gcc-4_7-branch/gcc/config.gcc +=================================================================== +--- gcc-4_7-branch.orig/gcc/config.gcc 2012-04-22 19:30:21.000000000 -0700 ++++ gcc-4_7-branch/gcc/config.gcc 2012-04-22 21:09:57.783403173 -0700 +@@ -1750,7 +1750,7 @@ + mips64*-*-linux* | mipsisa64*-*-linux*) + tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/gnu-user64.h mips/linux64.h" + tmake_file="${tmake_file} mips/t-linux64" +- tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32" ++ tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_64" + case ${target} in + mips64el-st-linux-gnu) + tm_file="${tm_file} mips/st.h" diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index a812b98..4d11ef4 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -49,6 +49,10 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True) != # Build uclibc compilers without cxa_atexit support EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit" + +EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" + EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" CPPFLAGS = "" -- cgit v1.1