diff options
author | Fredrik Rinnestam <fredrik@crux.nu> | 2018-01-28 17:41:13 +0100 |
---|---|---|
committer | Fredrik Rinnestam <fredrik@crux.nu> | 2018-01-28 17:41:13 +0100 |
commit | f23421688339a6034eb73cf8967f2c5b1a0a4961 (patch) | |
tree | 62e2d473d559c6c3dcbc82c6dd5045f016810af9 /gcc | |
parent | 4aecdab44c5423323b79a7bc6a271a9dbf7bd1ee (diff) | |
download | core-f23421688339a6034eb73cf8967f2c5b1a0a4961.tar.gz core-f23421688339a6034eb73cf8967f2c5b1a0a4961.tar.xz |
gcc: remove obsolete patches
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/07-10-gcc-sanitizer-Fix-build-with-glibc-2.26.patch | 166 | ||||
-rw-r--r-- | gcc/gcc-7.1-ucontext_t.patch | 94 |
2 files changed, 0 insertions, 260 deletions
diff --git a/gcc/07-10-gcc-sanitizer-Fix-build-with-glibc-2.26.patch b/gcc/07-10-gcc-sanitizer-Fix-build-with-glibc-2.26.patch deleted file mode 100644 index fc41a4a5..00000000 --- a/gcc/07-10-gcc-sanitizer-Fix-build-with-glibc-2.26.patch +++ /dev/null @@ -1,166 +0,0 @@ -diff --git a/meta/recipes-devtools/gcc/gcc-7.1/0048-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch b/meta/recipes-devtools/gcc/gcc-7.1/0048-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch -new file mode 100644 -index 0000000000..ee15c6cac8 ---- /dev/null -+++ b/meta/recipes-devtools/gcc/gcc-7.1/0048-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch -@@ -0,0 +1,160 @@ -+From 4c07606bb77bbd30f02adb947d480516da3fa3f7 Mon Sep 17 00:00:00 2001 -+From: Khem Raj <raj.khem@gmail.com> -+Date: Sun, 11 Jun 2017 10:09:13 -0700 -+Subject: [PATCH] libsanitizer: Use stack_t instead of struct sigaltstack -+ -+Upstream-Status: Submitted -+ -+Signed-off-by: Khem Raj <raj.khem@gmail.com> -+--- -+ libsanitizer/sanitizer_common/sanitizer_linux.cc | 4 ++-- -+ libsanitizer/sanitizer_common/sanitizer_linux.h | 6 +++--- -+ .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 3 ++- -+ 3 files changed, 7 insertions(+), 6 deletions(-) -+ -+Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc -+=================================================================== -+--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_linux.cc -++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc -+@@ -14,6 +14,10 @@ -+ -+ #if SANITIZER_FREEBSD || SANITIZER_LINUX -+ -++#if !SANITIZER_ANDROID -++#include <sys/signal.h> -++#endif -++ -+ #include "sanitizer_common.h" -+ #include "sanitizer_flags.h" -+ #include "sanitizer_internal_defs.h" -+@@ -71,10 +75,6 @@ extern "C" { -+ extern char **environ; // provided by crt1 -+ #endif // SANITIZER_FREEBSD -+ -+-#if !SANITIZER_ANDROID -+-#include <sys/signal.h> -+-#endif -+- -+ #if SANITIZER_LINUX -+ // <linux/time.h> -+ struct kernel_timeval { -+@@ -605,8 +605,8 @@ uptr internal_prctl(int option, uptr arg -+ } -+ #endif -+ -+-uptr internal_sigaltstack(const struct sigaltstack *ss, -+- struct sigaltstack *oss) { -++uptr internal_sigaltstack(const stack_t *ss, -++ stack_t *oss) { -+ return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); -+ } -+ -+Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.h -+=================================================================== -+--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_linux.h -++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.h -+@@ -19,7 +19,10 @@ -+ #include "sanitizer_platform_limits_posix.h" -+ -+ struct link_map; // Opaque type returned by dlopen(). -+-struct sigaltstack; -++ -++#ifndef __stack_t_defined -++struct stack_t; -++#endif -+ -+ namespace __sanitizer { -+ // Dirent structure for getdents(). Note that this structure is different from -+@@ -28,8 +31,8 @@ struct linux_dirent; -+ -+ // Syscall wrappers. -+ uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); -+-uptr internal_sigaltstack(const struct sigaltstack* ss, -+- struct sigaltstack* oss); -++uptr internal_sigaltstack(const stack_t* ss, -++ stack_t* oss); -+ uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, -+ __sanitizer_sigset_t *oldset); -+ -+Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -+=================================================================== -+--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -+@@ -16,6 +16,7 @@ -+ defined(__aarch64__) || defined(__powerpc64__) || \ -+ defined(__s390__)) -+ -++#include <signal.h> -+ #include "sanitizer_stoptheworld.h" -+ -+ #include "sanitizer_platform_limits_posix.h" -+@@ -273,7 +274,7 @@ static int TracerThread(void* argument) -+ -+ // Alternate stack for signal handling. -+ InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize); -+- struct sigaltstack handler_stack; -++ stack_t handler_stack; -+ internal_memset(&handler_stack, 0, sizeof(handler_stack)); -+ handler_stack.ss_sp = handler_stack_memory.data(); -+ handler_stack.ss_size = kHandlerStackSize; -+Index: gcc-7.1.0/libsanitizer/tsan/tsan_platform_linux.cc -+=================================================================== -+--- gcc-7.1.0.orig/libsanitizer/tsan/tsan_platform_linux.cc -++++ gcc-7.1.0/libsanitizer/tsan/tsan_platform_linux.cc -+@@ -14,6 +14,7 @@ -+ #include "sanitizer_common/sanitizer_platform.h" -+ #if SANITIZER_LINUX || SANITIZER_FREEBSD -+ -++#include <signal.h> -+ #include "sanitizer_common/sanitizer_common.h" -+ #include "sanitizer_common/sanitizer_libc.h" -+ #include "sanitizer_common/sanitizer_linux.h" -+@@ -28,7 +29,6 @@ -+ -+ #include <fcntl.h> -+ #include <pthread.h> -+-#include <signal.h> -+ #include <stdio.h> -+ #include <stdlib.h> -+ #include <string.h> -+@@ -287,7 +287,7 @@ void InitializePlatform() { -+ int ExtractResolvFDs(void *state, int *fds, int nfd) { -+ #if SANITIZER_LINUX && !SANITIZER_ANDROID -+ int cnt = 0; -+- __res_state *statp = (__res_state*)state; -++ res_state statp = (res_state)state; -+ for (int i = 0; i < MAXNS && cnt < nfd; i++) { -+ if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) -+ fds[cnt++] = statp->_u._ext.nssocks[i]; -+Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc -+=================================================================== -+--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc -++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc -+@@ -14,6 +14,7 @@ -+ -+ #if SANITIZER_FREEBSD || SANITIZER_LINUX -+ -++#include <signal.h> -+ #include "sanitizer_allocator_internal.h" -+ #include "sanitizer_atomic.h" -+ #include "sanitizer_common.h" -+@@ -30,7 +31,6 @@ -+ -+ #include <link.h> -+ #include <pthread.h> -+-#include <signal.h> -+ #include <sys/resource.h> -+ #include <syslog.h> -+ -+Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc -+=================================================================== -+--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc -++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc -+@@ -12,6 +12,7 @@ -+ -+ #include "sanitizer_platform.h" -+ #if SANITIZER_POSIX -++#include <signal.h> -+ #include "sanitizer_allocator_internal.h" -+ #include "sanitizer_common.h" -+ #include "sanitizer_flags.h" diff --git a/gcc/gcc-7.1-ucontext_t.patch b/gcc/gcc-7.1-ucontext_t.patch deleted file mode 100644 index 4fb34aef..00000000 --- a/gcc/gcc-7.1-ucontext_t.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -rupN gcc-7.1.0.orig/libgcc/config/aarch64/linux-unwind.h gcc-7.1.0/libgcc/config/aarch64/linux-unwind.h ---- gcc-7.1.0.orig/libgcc/config/aarch64/linux-unwind.h 2017-08-03 17:57:35.224124437 +0200 -+++ gcc-7.1.0/libgcc/config/aarch64/linux-unwind.h 2017-08-03 17:58:50.244134563 +0200 -@@ -55,7 +55,7 @@ aarch64_fallback_frame_state (struct _Un - struct rt_sigframe - { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - }; - - struct rt_sigframe *rt_; -diff -rupN gcc-7.1.0.orig/libgcc/config/alpha/linux-unwind.h gcc-7.1.0/libgcc/config/alpha/linux-unwind.h ---- gcc-7.1.0.orig/libgcc/config/alpha/linux-unwind.h 2017-08-03 17:57:35.221124496 +0200 -+++ gcc-7.1.0/libgcc/config/alpha/linux-unwind.h 2017-08-03 17:59:28.195143475 +0200 -@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwi - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; - } -diff -rupN gcc-7.1.0.orig/libgcc/config/bfin/linux-unwind.h gcc-7.1.0/libgcc/config/bfin/linux-unwind.h ---- gcc-7.1.0.orig/libgcc/config/bfin/linux-unwind.h 2017-08-03 17:57:35.225124418 +0200 -+++ gcc-7.1.0/libgcc/config/bfin/linux-unwind.h 2017-08-03 17:59:51.829727193 +0200 -@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwin - void *puc; - char retcode[8]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - - /* The void * cast is necessary to avoid an aliasing warning. -diff -rupN gcc-7.1.0.orig/libgcc/config/i386/linux-unwind.h gcc-7.1.0/libgcc/config/i386/linux-unwind.h ---- gcc-7.1.0.orig/libgcc/config/i386/linux-unwind.h 2017-08-03 17:57:35.216124593 +0200 -+++ gcc-7.1.0/libgcc/config/i386/linux-unwind.h 2017-08-03 18:12:30.160537173 +0200 -@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unw - if (*(unsigned char *)(pc+0) == 0x48 - && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) - { -- struct ucontext *uc_ = context->cfa; -+ ucontext_t *uc_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem - because it does not alias anything. */ -@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind - siginfo_t *pinfo; - void *puc; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -Binary files gcc-7.1.0.orig/libgcc/config/i386/.linux-unwind.h.swp and gcc-7.1.0/libgcc/config/i386/.linux-unwind.h.swp differ -diff -rupN gcc-7.1.0.orig/libgcc/config/pa/linux-unwind.h gcc-7.1.0/libgcc/config/pa/linux-unwind.h ---- gcc-7.1.0.orig/libgcc/config/pa/linux-unwind.h 2017-08-03 17:57:35.224124437 +0200 -+++ gcc-7.1.0/libgcc/config/pa/linux-unwind.h 2017-08-03 18:00:17.384441123 +0200 -@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwin - struct sigcontext *sc; - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *frame; - - /* rt_sigreturn trampoline: -diff -rupN gcc-7.1.0.orig/libgcc/config/riscv/linux-unwind.h gcc-7.1.0/libgcc/config/riscv/linux-unwind.h ---- gcc-7.1.0.orig/libgcc/config/riscv/linux-unwind.h 2017-08-03 17:57:35.216124593 +0200 -+++ gcc-7.1.0/libgcc/config/riscv/linux-unwind.h 2017-08-03 18:00:32.665270064 +0200 -@@ -42,7 +42,7 @@ riscv_fallback_frame_state (struct _Unwi - struct rt_sigframe - { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - }; - - struct rt_sigframe *rt_; -diff -rupN gcc-7.1.0.orig/libgcc/config/sh/linux-unwind.h gcc-7.1.0/libgcc/config/sh/linux-unwind.h ---- gcc-7.1.0.orig/libgcc/config/sh/linux-unwind.h 2017-08-03 17:57:35.216124593 +0200 -+++ gcc-7.1.0/libgcc/config/sh/linux-unwind.h 2017-08-03 18:00:50.448059284 +0200 -@@ -82,7 +82,7 @@ sh_fallback_frame_state (struct _Unwind_ - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem |