From 2484dc396a420ae5a5061e4b25307ee6107bcc31 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 12 Jan 2012 19:36:20 +0100 Subject: add support for 64bit kernels on supporting targets This is more commonly known as 32bit userland support on 64bit architectures. For simplicity's sake though, this implementation works the other way round: just build a 64bit-able linker and compiler, but no 64bit-libraries at all (i.e., no multilib). This is then just enough to compile a 64bit kernel, as that doesn't link to anything. The alternative would have been to build a native 64bit compiler with multilib-support in order to cross-compile a 32bit userland, resulting in a multilib system without need for it. In order to allow compilation of a 64bit kernel for a given target system, have it select ADK_TARGET_KERNEL_MAY_64BIT. Upon selection of that target, the symbol ADK_64BIT_KERNEL will occur in the "Global settings" menu. Since certain aspects of the 64bit kernel .config may greatly differ from it's 32bit counterpart, it has to be shipped separately: target//kernel64.config is the place to be. Conflicts: target/Makefile toolchain/gcc/Makefile Untested, due to conflicts (original patch conflicts with multiple kernel version support). --- toolchain/binutils/Makefile | 2 +- toolchain/gcc/Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'toolchain') diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index ba67263ef..36e5b51d6 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -12,7 +12,7 @@ else CONFOPTS+= --disable-libssp endif -ifeq ($(ADK_LINUX_64),y) +ifneq ($(strip $(ADK_LINUX_64)$(ADK_64BIT_KERNEL)),) CONFOPTS+= --enable-64-bit-bfd endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b2e8842d9..67a2b1b76 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -20,7 +20,6 @@ GCC_CONFOPTS= --prefix=$(STAGING_HOST_DIR) \ --disable-multilib \ --disable-libmudflap \ --disable-libgomp \ - --disable-biarch \ --disable-decimal-float \ --disable-libstdcxx-pch \ --disable-ppl-version-check \ @@ -35,6 +34,12 @@ else GCC_CONFOPTS+= --disable-sjlj-exceptions endif +ifeq ($(ADK_64BIT_KERNEL),y) +GCC_CONFOPTS+= --enable-targets=all +else +GCC_CONFOPTS+= --disable-biarch +endif + ifeq ($(ADK_TOOLCHAIN_GCC_SSP),y) GCC_CONFOPTS+= --enable-libssp else -- cgit v1.2.3