diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-30 01:07:06 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-30 01:08:53 +0200 |
| commit | 96b68fb7047d2d355a6d3cc8409a0f1db95acec9 (patch) | |
| tree | 8842fd79d60699a37fdeddd34ce4b3b690b87d4d /toolchain/gcc/Makefile | |
| parent | 81d7f759d5c9bff2cfedfe121dbdff2f7842dcc2 (diff) | |
fix 32 bit userland with 64 bit kernel support
after onger discussion with Phil, I understood his old
patches and fixed support for x86 systems with 32 Bit userland
and 64 Bit kernel by using a biarch toolchain instead of
a multilib one.
Diffstat (limited to 'toolchain/gcc/Makefile')
| -rw-r--r-- | toolchain/gcc/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 63d0237c3..12ad4ebca 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -35,7 +35,7 @@ GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \ --disable-nls GCC_FINAL_CONFOPTS:= -ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64),) +ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64)$(ADK_LINUX_X86),) GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif @@ -48,13 +48,18 @@ endif GCC_FINAL_CONFOPTS+= --enable-multilib --with-multilib-list=m4,m4-nofpu endif +ifeq ($(ADK_LINUX_X86),y) +ifeq ($(ADK_TARGET_KERNEL_64),y) +GCC_FINAL_CONFOPTS+= --enable-biarch --enable-targets=all --disable-multilib +else +GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib +endif +endif + ifeq ($(ADK_LINUX_X86_64),y) ifeq ($(ADK_x32),y) GCC_FINAL_CONFOPTS+= --with-abi=x32 endif -ifeq ($(ADK_32),y) -GCC_FINAL_CONFOPTS+= --with-abi=32 -endif ifeq ($(ADK_64),y) GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif |