From f0164ab61f840a2cc822bc8cf22d14654d904ba2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 13:32:29 +0200 Subject: disable TLS in gcc for m68k, needs to be checked for eglibc/glibc later --- toolchain/gcc/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'toolchain/gcc') diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index ff8c3d509..b88bf6ccc 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -59,7 +59,9 @@ else GCC_CONFOPTS+= --disable-lto endif -ifeq ($(ARCH),cris) +ifeq ($(ARCH),m68k) +GCC_CONFOPTS+= --disable-tls +else if ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls -- cgit v1.2.3 From afeecde92280c6ee0f8e8cfe5d631db039ab5c45 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 14:41:28 +0200 Subject: hopefully get it right with teh if else construct --- toolchain/gcc/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'toolchain/gcc') diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b88bf6ccc..634bea2f1 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -61,11 +61,13 @@ endif ifeq ($(ARCH),m68k) GCC_CONFOPTS+= --disable-tls -else if ($(ARCH),cris) +else +if ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls endif +endif ifeq ($(ARCH),powerpc) ifeq ($(ADK_TARGET_LIBC),musl) -- cgit v1.2.3 From 6433416b4ab7246ebb9fc63c72eb53a844fd6145 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 14:46:25 +0200 Subject: another try to get it right --- toolchain/gcc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolchain/gcc') diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 634bea2f1..775f871c1 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -62,7 +62,7 @@ endif ifeq ($(ARCH),m68k) GCC_CONFOPTS+= --disable-tls else -if ($(ARCH),cris) +ifeq ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls -- cgit v1.2.3