commit: 7ecb51009b5824d21c73caf7c62b48d46b651049 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Apr 10 13:01:55 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Apr 10 14:42:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ecb5100
dev-util/rr: remove unused patch(es) Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15289 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-util/rr/files/rr-5.2.0-c++14.patch | 13 ----- dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch | 35 ------------ dev-util/rr/files/rr-5.2.0-ucontext_t.patch | 65 ---------------------- 3 files changed, 113 deletions(-) diff --git a/dev-util/rr/files/rr-5.2.0-c++14.patch b/dev-util/rr/files/rr-5.2.0-c++14.patch deleted file mode 100644 index 8458de5f1e9..00000000000 --- a/dev-util/rr/files/rr-5.2.0-c++14.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d711f9..756a62e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,7 @@ set(FLAGS_COMMON "-msse2 -D__MMX__ -D__SSE__ -D__SSE2__ -D__USE_LARGEFILE64 -pth - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS_COMMON} -Wstrict-prototypes -std=gnu11") - # Define __STDC_LIMIT_MACROS so |#include <stdint.h>| works as expected. - # Define __STDC_FORMAT_MACROS so |#include <inttypes.h>| works as expected. --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++14") - set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g3") - - set(RR_FLAGS_DEBUG "-Wall -Wextra -O0 -DDEBUG -UNDEBUG") diff --git a/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch b/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch deleted file mode 100644 index 2a6e9daef2f..00000000000 --- a/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/699886 - -From 7044c5c6a8e64c737ba3cdb97187ff5c406e5162 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emi...@crisal.io> -Date: Thu, 23 May 2019 23:18:26 +0200 -Subject: [PATCH] Fix build in newer glibc. - -Seems tgkill was added recently to glibc. - -build/32/tgkill.c:7:12: error: static declaration of 'tgkill' follows non-static declaration -static int tgkill(int tgid, int tid, int sig) { - ^ -/usr/include/bits/signal_ext.h:29:12: note: previous declaration is here -extern int tgkill (__pid_t __tgid, __pid_t __tid, int __signal); ---- - src/test/tgkill.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/src/test/tgkill.c -+++ b/src/test/tgkill.c -@@ -4,9 +4,8 @@ - - static int num_signals_caught; - --static int tgkill(int tgid, int tid, int sig) { -- return syscall(SYS_tgkill, tgid, tid, sig); --} -+#define tgkill(tgid, tid, sig) \ -+ syscall(SYS_tgkill, (int)(tgid), (int)(tid), (int)(sig)) - - static void sighandler(int sig) { - atomic_printf("Task %d got signal %d\n", sys_gettid(), sig); --- -2.24.0 - diff --git a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch deleted file mode 100644 index 0015f0b150c..00000000000 --- a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 53c5bd72bae089616a3ca626b8af240481d70e6f Mon Sep 17 00:00:00 2001 -From: Robert O'Callahan <rob...@ocallahan.org> -Date: Fri, 10 Aug 2018 15:17:55 +1200 -Subject: [PATCH] Remove ucontext_t/rt_sigframe from kernel-abi - -These were added in 18bb097736a1b728f1e5bfec972ca10f6e763d82 to help us determine -the sigmask effect of rt_sigreturn syscalls, but they're no longer needed -because we query the new mask via /proc instead. - -Resolves #2237 ---- - src/kernel_abi.h | 33 --------------------------------- - 1 file changed, 33 deletions(-) - -diff --git a/src/kernel_abi.h b/src/kernel_abi.h -index e73e49933..29d3c9242 100644 ---- a/src/kernel_abi.h -+++ b/src/kernel_abi.h -@@ -1609,23 +1609,6 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> { - }; - RR_VERIFY_TYPE_ARCH(SupportedArch::x86, ::sigcontext, sigcontext); - -- struct ucontext_t { -- uint32_t uc_flags; -- uint32_t uc_link; -- stack_t uc_stack; -- sigcontext uc_mcontext; -- kernel_sigset_t uc_sigmask; -- }; -- -- struct rt_sigframe { -- uint32_t pretcode; -- int sig; -- uint32_t pinfo; -- uint32_t puc; -- siginfo_t info; -- struct ucontext_t uc; -- }; -- - struct _fpstate_32 { - uint32_t cw, sw, tag, ipoff, cssel, dataoff, datasel; - uint16_t _st[40]; -@@ -1806,22 +1789,6 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> { - RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::user_fpregs_struct, - user_fpregs_struct); - -- struct ucontext_t { -- uint64_t ucflags; -- ptr<struct ucontext_t> uc_link; -- stack_t uc_stack; -- struct sigcontext uc_mcontext; -- sigset_t uc_sigmask; -- user_fpregs_struct uc_fpregs; -- }; -- RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::ucontext_t, ucontext_t); -- -- struct rt_sigframe { -- ptr<char> pretcode; -- struct ucontext_t uc; -- siginfo_t info; -- }; -- - struct user { - struct user_regs_struct regs; - int u_fpvalid;
