diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /toolchain | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/eglibc/patches/sparc64.patch | 21 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 1 | ||||
| -rw-r--r-- | toolchain/glibc/patches/sparc64.patch | 21 | ||||
| -rw-r--r-- | toolchain/uClibc/patches/netlinkaccess.patch | 20 |
4 files changed, 63 insertions, 0 deletions
diff --git a/toolchain/eglibc/patches/sparc64.patch b/toolchain/eglibc/patches/sparc64.patch new file mode 100644 index 000000000..1fa281a9a --- /dev/null +++ b/toolchain/eglibc/patches/sparc64.patch @@ -0,0 +1,21 @@ +diff -Nur eglibc-2.12.1.orig/libc/sysdeps/sparc/sparc64/Makefile eglibc-2.12.1/libc/sysdeps/sparc/sparc64/Makefile +--- eglibc-2.12.1.orig/libc/sysdeps/sparc/sparc64/Makefile 2010-09-28 19:13:11.000000000 +0200 ++++ eglibc-2.12.1/libc/sysdeps/sparc/sparc64/Makefile 2011-01-02 12:43:41.009426907 +0100 +@@ -1,3 +1,5 @@ ++sysdep-CFLAGS += -mcpu=v9 -Wa,-Av9a ++ + ifeq ($(subdir),csu) + sysdep_routines += hp-timing + elide-routines.os += hp-timing +@@ -10,3 +12,11 @@ + ifeq ($(subdir),string) + sysdep_routines += align-cpy + endif ++ ++ASFLAGS-.o += -Wa,-Av9a ++ASFLAGS-.os += -Wa,-Av9a ++ASFLAGS-.op += -Wa,-Av9a ++ASFLAGS-.og += -Wa,-Av9a ++ASFLAGS-.ob += -Wa,-Av9a ++ASFLAGS-.oS += -Wa,-Av9a ++ diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 414790a23..ff4753465 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -31,3 +31,4 @@ GLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_forced_unwind=yes \ libc_cv_c_cleanup=yes \ libc_cv_gnu99_inline=yes \ + libc_cv_sparc64_tls=yes \ diff --git a/toolchain/glibc/patches/sparc64.patch b/toolchain/glibc/patches/sparc64.patch new file mode 100644 index 000000000..c8ff7ce9f --- /dev/null +++ b/toolchain/glibc/patches/sparc64.patch @@ -0,0 +1,21 @@ +diff -Nur glibc-2.12.1.orig/sysdeps/sparc/sparc64/Makefile glibc-2.12.1/sysdeps/sparc/sparc64/Makefile +--- glibc-2.12.1.orig/sysdeps/sparc/sparc64/Makefile 2010-07-27 13:34:39.000000000 +0200 ++++ glibc-2.12.1/sysdeps/sparc/sparc64/Makefile 2011-01-01 23:58:16.370676501 +0100 +@@ -1,3 +1,5 @@ ++sysdep-CFLAGS += -mcpu=v9 -Wa,-Av9a ++ + ifeq ($(subdir),csu) + sysdep_routines += hp-timing + elide-routines.os += hp-timing +@@ -10,3 +12,11 @@ + ifeq ($(subdir),string) + sysdep_routines += align-cpy + endif ++ ++ASFLAGS-.o += -Wa,-Av9a ++ASFLAGS-.os += -Wa,-Av9a ++ASFLAGS-.op += -Wa,-Av9a ++ASFLAGS-.og += -Wa,-Av9a ++ASFLAGS-.ob += -Wa,-Av9a ++ASFLAGS-.oS += -Wa,-Av9a ++ diff --git a/toolchain/uClibc/patches/netlinkaccess.patch b/toolchain/uClibc/patches/netlinkaccess.patch new file mode 100644 index 000000000..a022d53fa --- /dev/null +++ b/toolchain/uClibc/patches/netlinkaccess.patch @@ -0,0 +1,20 @@ +diff -Nur uClibc-0.9.32-rc1.orig/libc/inet/netlinkaccess.h uClibc-0.9.32-rc1/libc/inet/netlinkaccess.h +--- uClibc-0.9.32-rc1.orig/libc/inet/netlinkaccess.h 2010-12-17 20:05:17.000000000 +0100 ++++ uClibc-0.9.32-rc1/libc/inet/netlinkaccess.h 2011-01-01 15:49:58.906931975 +0100 +@@ -22,15 +22,8 @@ + #include <features.h> + #include <stdint.h> + #include <unistd.h> +-#include <sys/types.h> +- + #if defined __ASSUME_NETLINK_SUPPORT || defined __UCLIBC_USE_NETLINK__ +-#define _LINUX_TYPES_H +-typedef uint8_t __u8; +-typedef uint16_t __u16; +-typedef uint32_t __u32; +-typedef uint64_t __u64; +-typedef int32_t __s32; ++#include <asm/types.h> + #include <linux/rtnetlink.h> + #include <linux/netlink.h> + |