diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 19:01:41 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 19:01:41 +0100 |
| commit | 874680b5ffd55186d86c8259fdab74988d193ea9 (patch) | |
| tree | dda49405ca118f5f79466e1ead351be32de4fa68 /toolchain | |
| parent | 909df4c95187cff6fa1da4696abc9317d5b4e46f (diff) | |
| parent | f6d24fdf0f1c294628b979aa199e06ef6462df4e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/uClibc/Makefile | 5 | ||||
| -rw-r--r-- | toolchain/uClibc/patches/sparc.patch | 26 |
2 files changed, 26 insertions, 5 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index edb9bdc56..8ccc2ac98 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -8,11 +8,6 @@ include ../rules.mk include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk -#workaround for cris and gcc 4.4, where -Os generates ICE -#ifeq ($(ARCH),cris) -#TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS)) -#endif - $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \ diff --git a/toolchain/uClibc/patches/sparc.patch b/toolchain/uClibc/patches/sparc.patch new file mode 100644 index 000000000..bcf5b5fd8 --- /dev/null +++ b/toolchain/uClibc/patches/sparc.patch @@ -0,0 +1,26 @@ +diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/sparc/sigaction.c uClibc-0.9.30.2/libc/sysdeps/linux/sparc/sigaction.c +--- uClibc-0.9.30.2.orig/libc/sysdeps/linux/sparc/sigaction.c 2010-01-13 22:22:31.000000000 +0100 ++++ uClibc-0.9.30.2/libc/sysdeps/linux/sparc/sigaction.c 2010-02-14 12:10:52.000000000 +0100 +@@ -34,7 +34,8 @@ + static void __rt_sigreturn_stub(void); + static void __sigreturn_stub(void); + +-int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) ++libc_hidden_proto(sigaction) ++int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) + { + int ret; + struct sigaction kact, koact; +@@ -65,10 +66,8 @@ + return ret; + } + +-#ifndef LIBC_SIGACTION +-weak_alias(__libc_sigaction,sigaction) +-libc_hidden_weak(sigaction) +-#endif ++libc_hidden_def(sigaction) ++weak_alias(sigaction,__libc_sigaction) + + static void + __rt_sigreturn_stub(void) |