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/eglibc | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain/eglibc')
| -rw-r--r-- | toolchain/eglibc/patches/sparc64.patch | 21 |
1 files changed, 21 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 ++ |