From ee3e4fc7abfc6c169fb8d8ad5c3d182ab2d9b867 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Tue, 14 May 2019 01:36:04 +0200 Subject: [PATCH] toolchain: musl: drop 3 backported patches from musl staging tree Signed-off-by: Zoltan HERPAI --- ...ameat-use-renameat2-when-appropriate.patch | 26 ---------------- ...ename-use-renameat2-when-appropriate.patch | 30 ------------------- ...an-mlock-use-mlock2-when-appropriate.patch | 26 ---------------- 3 files changed, 82 deletions(-) delete mode 100644 toolchain/musl/patches/801-unistd-renameat-use-renameat2-when-appropriate.patch delete mode 100644 toolchain/musl/patches/802-stdio-rename-use-renameat2-when-appropriate.patch delete mode 100644 toolchain/musl/patches/803-mman-mlock-use-mlock2-when-appropriate.patch diff --git a/toolchain/musl/patches/801-unistd-renameat-use-renameat2-when-appropriate.patch b/toolchain/musl/patches/801-unistd-renameat-use-renameat2-when-appropriate.patch deleted file mode 100644 index 82279a4b55..0000000000 --- a/toolchain/musl/patches/801-unistd-renameat-use-renameat2-when-appropriate.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 79aae4f28f12ea23590fabc26e1e60514a7303c7 Mon Sep 17 00:00:00 2001 -From: Drew DeVault -Date: Thu, 21 Mar 2019 11:30:28 -0400 -Subject: [PATCH 01/15] unistd/renameat: use renameat2 when appropriate - ---- - src/unistd/renameat.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/unistd/renameat.c b/src/unistd/renameat.c -index 1257482..c3b40a2 100644 ---- a/src/unistd/renameat.c -+++ b/src/unistd/renameat.c -@@ -3,5 +3,9 @@ - - int renameat(int oldfd, const char *old, int newfd, const char *new) - { -+#ifdef SYS_renameat - return syscall(SYS_renameat, oldfd, old, newfd, new); -+#else -+ return syscall(SYS_renameat2, oldfd, old, newfd, new, 0); -+#endif - } --- -2.1.4 - diff --git a/toolchain/musl/patches/802-stdio-rename-use-renameat2-when-appropriate.patch b/toolchain/musl/patches/802-stdio-rename-use-renameat2-when-appropriate.patch deleted file mode 100644 index cc71713736..0000000000 --- a/toolchain/musl/patches/802-stdio-rename-use-renameat2-when-appropriate.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4a8a79f6f3a52f10abe5cbe6204bc9b4180522a7 Mon Sep 17 00:00:00 2001 -From: Drew DeVault -Date: Thu, 21 Mar 2019 11:30:11 -0400 -Subject: [PATCH 02/15] stdio/rename: use renameat2 when appropriate - ---- - src/stdio/rename.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/stdio/rename.c b/src/stdio/rename.c -index 04c90c0..f540adb 100644 ---- a/src/stdio/rename.c -+++ b/src/stdio/rename.c -@@ -4,9 +4,11 @@ - - int rename(const char *old, const char *new) - { --#ifdef SYS_rename -+#if defined(SYS_rename) - return syscall(SYS_rename, old, new); --#else -+#elif defined(SYS_renameat) - return syscall(SYS_renameat, AT_FDCWD, old, AT_FDCWD, new); -+#else -+ return syscall(SYS_renameat2, AT_FDCWD, old, AT_FDCWD, new, 0); - #endif - } --- -2.1.4 - diff --git a/toolchain/musl/patches/803-mman-mlock-use-mlock2-when-appropriate.patch b/toolchain/musl/patches/803-mman-mlock-use-mlock2-when-appropriate.patch deleted file mode 100644 index 1225b453ec..0000000000 --- a/toolchain/musl/patches/803-mman-mlock-use-mlock2-when-appropriate.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5ffd928d81315911773b770fd5083b1cdf0e3184 Mon Sep 17 00:00:00 2001 -From: Drew DeVault -Date: Thu, 21 Mar 2019 11:29:59 -0400 -Subject: [PATCH 03/15] mman/mlock: use mlock2 when appropriate - ---- - src/mman/mlock.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/mman/mlock.c b/src/mman/mlock.c -index e683a44..71af582 100644 ---- a/src/mman/mlock.c -+++ b/src/mman/mlock.c -@@ -3,5 +3,9 @@ - - int mlock(const void *addr, size_t len) - { -+#ifdef SYS_mlock - return syscall(SYS_mlock, addr, len); -+#else -+ return syscall(SYS_mlock2, addr, len, 0); -+#endif - } --- -2.1.4 - -- 2.30.2