mirror of
https://develop.openfoam.com/Development/ThirdParty-common.git
synced 2025-12-08 06:57:50 +00:00
7aee88cf92
- gcc-4.8.5 : oldest currently supported - gcc-4.9.4 : possibly usable C++11 regex - gcc-6.3.0 : one generation older than gcc-7
83 lines
4.1 KiB
Plaintext
83 lines
4.1 KiB
Plaintext
#
|
|
# Patch for building older gcc versions with gcc-7
|
|
#
|
|
diff -u gcc-6.3.0/libgcc/config/i386/linux-unwind.h.orig gcc-6.3.0/libgcc/config/i386/linux-unwind.h
|
|
--- gcc-6.3.0/libgcc/config/i386/linux-unwind.h.orig 2016-01-04 23:30:50.000000000 +0900
|
|
+++ gcc-6.3.0/libgcc/config/i386/linux-unwind.h 2017-10-29 23:01:21.717240052 +0900
|
|
@@ -58,7 +58,7 @@
|
|
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 @@
|
|
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
|
|
diff -u gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_linux.cc.orig gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_linux.cc
|
|
--- gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_linux.cc.orig 2015-11-23 18:07:18.000000000 +0900
|
|
+++ gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_linux.cc 2017-10-29 23:09:00.490577558 +0900
|
|
@@ -546,8 +546,7 @@
|
|
}
|
|
#endif
|
|
|
|
-uptr internal_sigaltstack(const struct sigaltstack *ss,
|
|
- struct sigaltstack *oss) {
|
|
+uptr internal_sigaltstack(const void *ss, void *oss) {
|
|
return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
|
|
}
|
|
|
|
diff -u gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_linux.h.orig gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_linux.h
|
|
--- gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_linux.h.orig 2015-10-21 16:32:45.000000000 +0900
|
|
+++ gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_linux.h 2017-10-29 23:09:43.907244619 +0900
|
|
@@ -19,7 +19,6 @@
|
|
#include "sanitizer_platform_limits_posix.h"
|
|
|
|
struct link_map; // Opaque type returned by dlopen().
|
|
-struct sigaltstack;
|
|
|
|
namespace __sanitizer {
|
|
// Dirent structure for getdents(). Note that this structure is different from
|
|
@@ -28,8 +27,7 @@
|
|
|
|
// 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 void* ss, void* oss);
|
|
uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
|
|
__sanitizer_sigset_t *oldset);
|
|
void internal_sigfillset(__sanitizer_sigset_t *set);
|
|
diff -u gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc.orig gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
|
--- gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc.orig 2015-10-21 16:32:45.000000000 +0900
|
|
+++ gcc-6.3.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc 2017-10-29 23:08:07.260577074 +0900
|
|
@@ -267,7 +267,7 @@
|
|
|
|
// 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;
|
|
diff -u gcc-6.3.0/libsanitizer/tsan/tsan_platform_linux.cc.orig gcc-6.3.0/libsanitizer/tsan/tsan_platform_linux.cc
|
|
--- gcc-6.3.0/libsanitizer/tsan/tsan_platform_linux.cc.orig 2016-08-12 17:53:46.000000000 +0900
|
|
+++ gcc-6.3.0/libsanitizer/tsan/tsan_platform_linux.cc 2017-10-29 23:10:38.817245120 +0900
|
|
@@ -291,7 +291,7 @@
|
|
int ExtractResolvFDs(void *state, int *fds, int nfd) {
|
|
#if SANITIZER_LINUX
|
|
int cnt = 0;
|
|
- __res_state *statp = (__res_state*)state;
|
|
+ struct __res_state *statp = (struct __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];
|