diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-23 12:52:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-23 12:52:45 +0200 |
| commit | 409612eaaf38ca7ec55392607b08baec0fcbf4a4 (patch) | |
| tree | e975404b94403da3d5c7ca4dbba13e9abb63ddd5 /toolchain | |
| parent | 2f0d4983409f3e92b9d55bde57dc7e79376f6576 (diff) | |
| parent | a4eee64317667b94e86844d565111056c5836c55 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/eglibc/Makefile | 5 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.7.3/musl-sparc.patch | 24 |
2 files changed, 24 insertions, 5 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 13a537c05..76b09237d 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -7,11 +7,6 @@ include Makefile.inc include Makefile.multilib include ${TOPDIR}/mk/buildhlp.mk -# eglibc does not compile with Os -TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS)) -ifneq ($(ADK_DEBUG),) -TARGET_CFLAGS_LIBC+= -O2 -endif # ssp partially supported TARGET_CFLAGS_LIBC:= $(filter-out -fstack-protector,$(TARGET_CFLAGS_LIBC)) diff --git a/toolchain/gcc/patches/4.7.3/musl-sparc.patch b/toolchain/gcc/patches/4.7.3/musl-sparc.patch new file mode 100644 index 000000000..228b8522d --- /dev/null +++ b/toolchain/gcc/patches/4.7.3/musl-sparc.patch @@ -0,0 +1,24 @@ +diff -Nur gcc-4.7.3.orig/gcc/config/sparc/linux64.h gcc-4.7.3/gcc/config/sparc/linux64.h +--- gcc-4.7.3.orig/gcc/config/sparc/linux64.h 2011-11-12 02:05:07.000000000 +0100 ++++ gcc-4.7.3/gcc/config/sparc/linux64.h 2013-09-19 11:37:50.000000000 +0200 +@@ -95,6 +95,9 @@ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.1" ++ + + #ifdef SPARC_BI_ARCH + +diff -Nur gcc-4.7.3.orig/gcc/config/sparc/linux.h gcc-4.7.3/gcc/config/sparc/linux.h +--- gcc-4.7.3.orig/gcc/config/sparc/linux.h 2011-11-12 02:05:07.000000000 +0100 ++++ gcc-4.7.3/gcc/config/sparc/linux.h 2013-09-19 11:37:12.000000000 +0200 +@@ -85,6 +85,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sparc.1" + + #undef LINK_SPEC + #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ |