diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-25 16:44:07 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-25 16:44:07 +0200 |
| commit | 839167ff9d74fc490b32f6a197591964f73b65e5 (patch) | |
| tree | d193bfad7c9ef5597c5cd7d2ea25fd007d01f88a /gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch | |
| parent | 27c1df05a866b639a61e16d48b3f2da8fa5eb767 (diff) | |
| parent | 030c912616c8ee1595218e304460041bcb4f1ceb (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch')
| -rw-r--r-- | gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch b/gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch new file mode 100644 index 0000000000..86a3ee912d --- /dev/null +++ b/gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch @@ -0,0 +1,15 @@ +This is a backport of part of this patch from 6.5 to 4.8: + + https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=8937b94d1a643fd9760714642296d034a45254a8 + +--- a/libsanitizer/tsan/tsan_platform_linux.cc ++++ b/libsanitizer/tsan/tsan_platform_linux.cc +@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) { + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { + 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]; |