aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/musl/patches/015-fix-pread-pwrite-syscall-calling-convention-on-sh.patch
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2017-01-03 17:51:04 +0100
committerFelix Fietkau <nbd@nbd.name>2017-01-16 20:40:00 +0100
commita8a5cb9595cd64a48c1cea6a1478c11e022474a9 (patch)
treeea0417332a8bbea1bc2b1d2e810044558c54da51 /toolchain/musl/patches/015-fix-pread-pwrite-syscall-calling-convention-on-sh.patch
parentda5d060ac9171029cfde61ee45aa417696e45da0 (diff)
downloadupstream-a8a5cb9595cd64a48c1cea6a1478c11e022474a9.tar.gz
upstream-a8a5cb9595cd64a48c1cea6a1478c11e022474a9.tar.bz2
upstream-a8a5cb9595cd64a48c1cea6a1478c11e022474a9.zip
musl: update musl to 1.1.16+ and switch to download from git
This patch updates musl to 1.1.16+ [0] and removes all the backported patches. This is a major release and tagged as such. For more information visit musl-libc.org or read the WHATSNEW. Furthermore, this patch also changes musl to download directly from git. This makes it easier to update musl in the future. The patch custom Add-format-attribute-to-some-function-declarations.patch was assigned a new 400- number. This should avoid confusion since 0xx numbers are usually assigned to backports. [0] <http://git.musl-libc.org/cgit/musl/commit/?id=769f53598e781ffc89191520f3f8a93cb58db91f> Cc: Hannu Nyman <hannu.nyman@iki.fi> Cc: Koen Vandeputte <koen.vandeputte@ncentric.com> Cc: Jo-Philipp Wich <jo@mein.io> Cc: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Diffstat (limited to 'toolchain/musl/patches/015-fix-pread-pwrite-syscall-calling-convention-on-sh.patch')
-rw-r--r--toolchain/musl/patches/015-fix-pread-pwrite-syscall-calling-convention-on-sh.patch71
1 files changed, 0 insertions, 71 deletions
diff --git a/toolchain/musl/patches/015-fix-pread-pwrite-syscall-calling-convention-on-sh.patch b/toolchain/musl/patches/015-fix-pread-pwrite-syscall-calling-convention-on-sh.patch
deleted file mode 100644
index b4b20d8ae2..0000000000
--- a/toolchain/musl/patches/015-fix-pread-pwrite-syscall-calling-convention-on-sh.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 7cc3a28eed7e3b72a1ce4568fb55154bb0540726 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Thu, 11 Aug 2016 18:36:46 -0400
-Subject: fix pread/pwrite syscall calling convention on sh
-
-despite sh not generally using register-pair alignment for 64-bit
-syscall arguments, there are arch-specific versions of the syscall
-entry points for pread and pwrite which include a dummy argument for
-alignment before the 64-bit offset argument.
----
- arch/sh/syscall_arch.h | 1 +
- src/internal/syscall.h | 4 ++++
- src/unistd/pread.c | 2 +-
- src/unistd/pwrite.c | 2 +-
- 4 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/arch/sh/syscall_arch.h b/arch/sh/syscall_arch.h
-index f63675a..84758fe 100644
---- a/arch/sh/syscall_arch.h
-+++ b/arch/sh/syscall_arch.h
-@@ -2,6 +2,7 @@
- ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
- ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
- #define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
-+#define __SYSCALL_LL_PRW(x) 0, __SYSCALL_LL_E((x))
-
- /* The extra OR instructions are to work around a hardware bug:
- * http://documentation.renesas.com/doc/products/mpumcu/tu/tnsh7456ae.pdf
-diff --git a/src/internal/syscall.h b/src/internal/syscall.h
-index ff3cf53..6d378a8 100644
---- a/src/internal/syscall.h
-+++ b/src/internal/syscall.h
-@@ -12,6 +12,10 @@
- #define SYSCALL_MMAP2_UNIT 4096ULL
- #endif
-
-+#ifndef __SYSCALL_LL_PRW
-+#define __SYSCALL_LL_PRW(x) __SYSCALL_LL_O(x)
-+#endif
-+
- #ifndef __scc
- #define __scc(X) ((long) (X))
- typedef long syscall_arg_t;
-diff --git a/src/unistd/pread.c b/src/unistd/pread.c
-index 3d2799f..5483eb9 100644
---- a/src/unistd/pread.c
-+++ b/src/unistd/pread.c
-@@ -4,7 +4,7 @@
-
- ssize_t pread(int fd, void *buf, size_t size, off_t ofs)
- {
-- return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL_O(ofs));
-+ return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL_PRW(ofs));
- }
-
- LFS64(pread);
-diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c
-index bbe4c34..4bf3d7d 100644
---- a/src/unistd/pwrite.c
-+++ b/src/unistd/pwrite.c
-@@ -4,7 +4,7 @@
-
- ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs)
- {
-- return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL_O(ofs));
-+ return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL_PRW(ofs));
- }
-
- LFS64(pwrite);
---
-cgit v0.11.2