Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/817837/?format=api
{ "id": 817837, "url": "http://patchwork.ozlabs.org/api/patches/817837/?format=api", "web_url": "http://patchwork.ozlabs.org/project/buildroot/patch/20170923212414.16744-3-romain.naour@gmail.com/", "project": { "id": 27, "url": "http://patchwork.ozlabs.org/api/projects/27/?format=api", "name": "Buildroot development", "link_name": "buildroot", "list_id": "buildroot.buildroot.org", "list_email": "buildroot@buildroot.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170923212414.16744-3-romain.naour@gmail.com>", "list_archive_url": null, "date": "2017-09-23T21:24:01", "name": "[v3,2/7] package/gcc: fix build issue with glibc 2.26", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c4a242f098d62e13fc8524e4fa84dd2104571f4b", "submitter": { "id": 67942, "url": "http://patchwork.ozlabs.org/api/people/67942/?format=api", "name": "Romain Naour", "email": "romain.naour@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/buildroot/patch/20170923212414.16744-3-romain.naour@gmail.com/mbox/", "series": [ { "id": 4786, "url": "http://patchwork.ozlabs.org/api/series/4786/?format=api", "web_url": "http://patchwork.ozlabs.org/project/buildroot/list/?series=4786", "date": "2017-09-23T21:23:59", "name": "glibc: bump to 2.26", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/4786/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/817837/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/817837/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<buildroot-bounces@busybox.net>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "buildroot@lists.busybox.net" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "buildroot@osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.136; helo=silver.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"k7obbJzx\"; dkim-atps=neutral" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y03Jq56xtz9t4P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSun, 24 Sep 2017 07:24:43 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 125AB2C9EF;\n\tSat, 23 Sep 2017 21:24:41 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ahjIXnq8Idlv; Sat, 23 Sep 2017 21:24:30 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 83AAD25DAD;\n\tSat, 23 Sep 2017 21:24:27 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id B31221C0060\n\tfor <buildroot@lists.busybox.net>;\n\tSat, 23 Sep 2017 21:24:24 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id ADF0B88ABB\n\tfor <buildroot@lists.busybox.net>;\n\tSat, 23 Sep 2017 21:24:24 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id TVOzI1CCSHhz for <buildroot@lists.busybox.net>;\n\tSat, 23 Sep 2017 21:24:23 +0000 (UTC)", "from mail-wr0-f195.google.com (mail-wr0-f195.google.com\n\t[209.85.128.195])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 5EC2A88AD6\n\tfor <buildroot@buildroot.org>; Sat, 23 Sep 2017 21:24:23 +0000 (UTC)", "by mail-wr0-f195.google.com with SMTP id n64so2264044wrb.2\n\tfor <buildroot@buildroot.org>; Sat, 23 Sep 2017 14:24:23 -0700 (PDT)", "from localhost.localdomain\n\t([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf])\n\tby smtp.gmail.com with ESMTPSA id\n\tf89sm1253848wmh.18.2017.09.23.14.24.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 23 Sep 2017 14:24:21 -0700 (PDT)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=sUZilDN2cBgb6s5GvxyiKLnsNJ3QLyv5GtCoxiqmNQc=;\n\tb=k7obbJzxHPTR8RC5oowuSkdwx9jBzU/0cj7CuukrEUkc8NrGH8kn/znbsPQQtWS6Sj\n\tGoy7FYmteYd1tX2vRJgzygNLdlHkZqoSr+Gor5xaoBMZG9ssyqE5FgERIEMpDz2QqMZx\n\tpvX29jwCPjp2j1D1KqNPwxYHCo0Z8JlRTust4MADSsKEgRiW6cyKDzZzgNIiro+4KDVa\n\topzeIX/EhQPXSB2aTONfi168Ui4FuLYgwt+jH/xdc9IMt0wYqNCDidIEy2Lus0geioTf\n\tuf0LNGNpZcDqaPV39hjyRMXhW56g7/ByHn25Rj45cqyX50eWN9hpW8Ub7kovm/KfhU/9\n\tOk5A==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=sUZilDN2cBgb6s5GvxyiKLnsNJ3QLyv5GtCoxiqmNQc=;\n\tb=ACgWEWtXEDsmooqx8mQgJCREJ6mtotTbZUyJhws7xCIOfEjv8VfbjK+z0/wYrTChZ5\n\tn90B6XZRknTVztM8/JzkDfsUe2ZLtvpFUuAsQVuEUGjt+UnMktGf5y1j7PQuU80H7S5V\n\tPaunRaZ6P00sGdBxDR320K8mxk1Hppc7vdP5OzGnID2/r94qS49oVzBXjQJjnTJZv5Is\n\t0NSy77oAeRI0oWDCV+WFtahduAIzhBZK1VfP36GIlzvXqWADf/qZxZH3jEJ1318porTn\n\tz0XH12x1tPWBp8POFk9ZcXhdfJdDOYIdk4S7r7QIpWb3MsZdbZX0R3FKdIG43lUZfaT3\n\tAhOQ==", "X-Gm-Message-State": "AHPjjUibdGEGirHh/DwLXojSuXNJne/TZHyFtKfhc0KgISlByFF/F0PW\n\t9jVGXgox5Dr0T+LlqmYerllcKzJ+", "X-Google-Smtp-Source": "AOwi7QCTITmuBxmqb7OQ8ZqxcfOJLUlpIqQ7Wkwd9T7D8y8TnqpwY9k3z2WOIXEp2YMsQIxLUEwmhQ==", "X-Received": "by 10.223.135.155 with SMTP id b27mr2555041wrb.10.1506201861452; \n\tSat, 23 Sep 2017 14:24:21 -0700 (PDT)", "From": "Romain Naour <romain.naour@gmail.com>", "To": "buildroot@buildroot.org", "Date": "Sat, 23 Sep 2017 23:24:01 +0200", "Message-Id": "<20170923212414.16744-3-romain.naour@gmail.com>", "X-Mailer": "git-send-email 2.9.5", "In-Reply-To": "<20170923212414.16744-1-romain.naour@gmail.com>", "References": "<20170923212414.16744-1-romain.naour@gmail.com>", "MIME-Version": "1.0", "Cc": "Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,\n\tRomain Naour <romain.naour@gmail.com>,\n\t\"Yann E. MORIN\" <yann.morin.1998@free.fr>", "Subject": "[Buildroot] [PATCH v3 2/7] package/gcc: fix build issue with glibc\n\t2.26", "X-BeenThere": "buildroot@busybox.net", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Discussion and development of buildroot <buildroot.busybox.net>", "List-Unsubscribe": "<http://lists.busybox.net/mailman/options/buildroot>,\n\t<mailto:buildroot-request@busybox.net?subject=unsubscribe>", "List-Archive": "<http://lists.busybox.net/pipermail/buildroot/>", "List-Post": "<mailto:buildroot@busybox.net>", "List-Help": "<mailto:buildroot-request@busybox.net?subject=help>", "List-Subscribe": "<http://lists.busybox.net/mailman/listinfo/buildroot>,\n\t<mailto:buildroot-request@busybox.net?subject=subscribe>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "buildroot-bounces@busybox.net", "Sender": "\"buildroot\" <buildroot-bounces@busybox.net>" }, "content": "../../../../libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: In function ‘int __sanitizer::TracerThread(void*)’:\n../../../../libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:241:22: error: aggregate ‘sigaltstack handler_stack’ has incomplete type and cannot be defined\n struct sigaltstack handler_stack;\n\n../../../../libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: In function ‘int __sanitizer::TracerThread(void*)’:\n../../../../libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:276:22: error: aggregate ‘sigaltstack handler_stack’ has incomplete type and cannot be defined\n struct sigaltstack handler_stack;\n ^~~~~~~~~~~~~\n\nThe fix is already included in gcc 7.2 release [1]. We have to backport it to\nall older gcc release since it's not included in any stable release yet.\n\n[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=72edc2c02f8b4768ad660f46a1c7e2400c0a8e06\n\nSigned-off-by: Romain Naour <romain.naour@gmail.com>\nCc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>\nCc: \"Yann E. MORIN\" <yann.morin.1998@free.fr>\n---\nv3: use upstream commit for gcc 5 and 6. (Yann)\n---\n package/gcc/4.9.4/944-sanitizer-linux.patch | 88 ++++++++++++++++++++++++++++\n package/gcc/5.4.0/944-sanitizer-linux.patch | 91 +++++++++++++++++++++++++++++\n package/gcc/6.4.0/943-sanitizer-linux.patch | 91 +++++++++++++++++++++++++++++\n 3 files changed, 270 insertions(+)\n create mode 100644 package/gcc/4.9.4/944-sanitizer-linux.patch\n create mode 100644 package/gcc/5.4.0/944-sanitizer-linux.patch\n create mode 100644 package/gcc/6.4.0/943-sanitizer-linux.patch", "diff": "diff --git a/package/gcc/4.9.4/944-sanitizer-linux.patch b/package/gcc/4.9.4/944-sanitizer-linux.patch\nnew file mode 100644\nindex 0000000..caadf2d\n--- /dev/null\n+++ b/package/gcc/4.9.4/944-sanitizer-linux.patch\n@@ -0,0 +1,88 @@\n+From f9a35ba5c150da2e381c4cab01f8f12bcd6af5d2 Mon Sep 17 00:00:00 2001\n+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>\n+Date: Mon, 17 Jul 2017 19:41:08 +0000\n+Subject: [PATCH] \tBackported from mainline \t2017-07-14 Jakub\n+ Jelinek <jakub@redhat.com>\n+\n+\tPR sanitizer/81066\n+\t* sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969.\n+\t* sanitizer_common/sanitizer_linux.cc: Likewise.\n+\t* sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise.\n+\t* tsan/tsan_platform_linux.cc: Likewise.\n+\n+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4\n+(cherry picked from commit 72edc2c02f8b4768ad660f46a1c7e2400c0a8e06)\n+[Romain backport to 4.9.4]\n+Signed-off-by: Romain Naour <romain.naour@gmail.com>\n+---\n+ libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +--\n+ libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +---\n+ libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +-\n+ libsanitizer/tsan/tsan_platform_linux.cc | 2 +-\n+ 4 files changed, 4 insertions(+), 7 deletions(-)\n+\n+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc\n+index 69c9c10..8e53673 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc\n++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc\n+@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {\n+ return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5);\n+ }\n+ \n+-uptr internal_sigaltstack(const struct sigaltstack *ss,\n+- struct sigaltstack *oss) {\n++uptr internal_sigaltstack(const void *ss, void *oss) {\n+ return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss);\n+ }\n+ \n+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h\n+index 6422df1..8e111d1 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_linux.h\n++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h\n+@@ -18,7 +18,6 @@\n+ #include \"sanitizer_platform_limits_posix.h\"\n+ \n+ struct link_map; // Opaque type returned by dlopen().\n+-struct sigaltstack;\n+ \n+ namespace __sanitizer {\n+ // Dirent structure for getdents(). Note that this structure is different from\n+@@ -28,8 +27,7 @@ struct linux_dirent;\n+ // Syscall wrappers.\n+ uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);\n+ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5);\n+-uptr internal_sigaltstack(const struct sigaltstack* ss,\n+- struct sigaltstack* oss);\n++uptr internal_sigaltstack(const void* ss, void* oss);\n+ uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act,\n+ __sanitizer_kernel_sigaction_t *oldact);\n+ uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set,\n+diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n+index 6ee63ec..50c21a3 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n+@@ -238,7 +238,7 @@ static int TracerThread(void* argument) {\n+ \n+ // Alternate stack for signal handling.\n+ InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);\n+- struct sigaltstack handler_stack;\n++ stack_t handler_stack;\n+ internal_memset(&handler_stack, 0, sizeof(handler_stack));\n+ handler_stack.ss_sp = handler_stack_memory.data();\n+ handler_stack.ss_size = kHandlerStackSize;\n+diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc\n+index fe69430..49f5270 100644\n+--- a/libsanitizer/tsan/tsan_platform_linux.cc\n++++ b/libsanitizer/tsan/tsan_platform_linux.cc\n+@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) {\n+ // closes within glibc. The code is a pure hack.\n+ int ExtractResolvFDs(void *state, int *fds, int nfd) {\n+ int cnt = 0;\n+- __res_state *statp = (__res_state*)state;\n++ struct __res_state *statp = (struct __res_state*)state;\n+ for (int i = 0; i < MAXNS && cnt < nfd; i++) {\n+ if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)\n+ fds[cnt++] = statp->_u._ext.nssocks[i];\n+-- \n+2.9.5\n+\ndiff --git a/package/gcc/5.4.0/944-sanitizer-linux.patch b/package/gcc/5.4.0/944-sanitizer-linux.patch\nnew file mode 100644\nindex 0000000..a2602b7\n--- /dev/null\n+++ b/package/gcc/5.4.0/944-sanitizer-linux.patch\n@@ -0,0 +1,91 @@\n+From cf796eadff0f2ff0f6e4565373d54d10dff276e1 Mon Sep 17 00:00:00 2001\n+From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>\n+Date: Thu, 7 Sep 2017 07:17:17 +0000\n+Subject: [PATCH] 2017-09-07 Matthias Klose <doko@ubuntu.com>\n+\n+ Backported from mainline\n+ 2017-07-14 Jakub Jelinek <jakub@redhat.com>\n+\n+ PR sanitizer/81066\n+ * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969.\n+ * sanitizer_common/sanitizer_linux.cc: Likewise.\n+ * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise.\n+ * tsan/tsan_platform_linux.cc: Likewise.\n+\n+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251829 138bc75d-0d04-0410-961f-82ee72b054a4\n+\n+(cherry picked from commit 833e00c01e96f61e24cd7ec97b93fad212dc914b)\n+[Romain rebase on gcc 5.4]\n+Signed-off-by: Romain Naour <romain.naour@gmail.com>\n+---\n+ libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +--\n+ libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +---\n+ libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +-\n+ libsanitizer/tsan/tsan_platform_linux.cc | 2 +-\n+ 4 files changed, 4 insertions(+), 7 deletions(-)\n+\n+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc\n+index 9feb307..821b26d 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc\n++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc\n+@@ -514,8 +514,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {\n+ }\n+ #endif\n+ \n+-uptr internal_sigaltstack(const struct sigaltstack *ss,\n+- struct sigaltstack *oss) {\n++uptr internal_sigaltstack(const void *ss, void *oss) {\n+ return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);\n+ }\n+ \n+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h\n+index 086834c..3a6f4cd 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_linux.h\n++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h\n+@@ -18,7 +18,6 @@\n+ #include \"sanitizer_platform_limits_posix.h\"\n+ \n+ struct link_map; // Opaque type returned by dlopen().\n+-struct sigaltstack;\n+ \n+ namespace __sanitizer {\n+ // Dirent structure for getdents(). Note that this structure is different from\n+@@ -27,8 +26,7 @@ struct linux_dirent;\n+ \n+ // Syscall wrappers.\n+ uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);\n+-uptr internal_sigaltstack(const struct sigaltstack* ss,\n+- struct sigaltstack* oss);\n++uptr internal_sigaltstack(const void* ss, void* oss);\n+ uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,\n+ __sanitizer_sigset_t *oldset);\n+ void internal_sigfillset(__sanitizer_sigset_t *set);\n+diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n+index 5881202..c54894d 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n+@@ -234,7 +234,7 @@ static int TracerThread(void* argument) {\n+ \n+ // Alternate stack for signal handling.\n+ InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);\n+- struct sigaltstack handler_stack;\n++ stack_t handler_stack;\n+ internal_memset(&handler_stack, 0, sizeof(handler_stack));\n+ handler_stack.ss_sp = handler_stack_memory.data();\n+ handler_stack.ss_size = kHandlerStackSize;\n+diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc\n+index 3259131..b8e9078 100644\n+--- a/libsanitizer/tsan/tsan_platform_linux.cc\n++++ b/libsanitizer/tsan/tsan_platform_linux.cc\n+@@ -377,7 +377,7 @@ bool IsGlobalVar(uptr addr) {\n+ int ExtractResolvFDs(void *state, int *fds, int nfd) {\n+ #if SANITIZER_LINUX\n+ int cnt = 0;\n+- __res_state *statp = (__res_state*)state;\n++ struct __res_state *statp = (struct __res_state*)state;\n+ for (int i = 0; i < MAXNS && cnt < nfd; i++) {\n+ if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)\n+ fds[cnt++] = statp->_u._ext.nssocks[i];\n+-- \n+2.9.5\n+\ndiff --git a/package/gcc/6.4.0/943-sanitizer-linux.patch b/package/gcc/6.4.0/943-sanitizer-linux.patch\nnew file mode 100644\nindex 0000000..640d68c\n--- /dev/null\n+++ b/package/gcc/6.4.0/943-sanitizer-linux.patch\n@@ -0,0 +1,91 @@\n+From a3e3d1b5f73380a99126c4937a95225ba3bd214b Mon Sep 17 00:00:00 2001\n+From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>\n+Date: Thu, 7 Sep 2017 07:15:24 +0000\n+Subject: [PATCH] 2017-09-07 Matthias Klose <doko@ubuntu.com>\n+\n+ Backported from mainline\n+ 2017-07-14 Jakub Jelinek <jakub@redhat.com>\n+\n+ PR sanitizer/81066\n+ * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969.\n+ * sanitizer_common/sanitizer_linux.cc: Likewise.\n+ * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise.\n+ * tsan/tsan_platform_linux.cc: Likewise.\n+\n+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@251828 138bc75d-0d04-0410-961f-82ee72b054a4\n+\n+(cherry picked from commit 8937b94d1a643fd9760714642296d034a45254a8)\n+[Romain rebase on gcc 6.4]\n+Signed-off-by: Romain Naour <romain.naour@gmail.com>\n+---\n+ libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +--\n+ libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +---\n+ libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +-\n+ libsanitizer/tsan/tsan_platform_linux.cc | 2 +-\n+ 4 files changed, 4 insertions(+), 7 deletions(-)\n+\n+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc\n+index 2cefa20..223d9c6 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc\n++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc\n+@@ -546,8 +546,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {\n+ }\n+ #endif\n+ \n+-uptr internal_sigaltstack(const struct sigaltstack *ss,\n+- struct sigaltstack *oss) {\n++uptr internal_sigaltstack(const void *ss, void *oss) {\n+ return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);\n+ }\n+ \n+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h\n+index 4497702..1594058 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_linux.h\n++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h\n+@@ -19,7 +19,6 @@\n+ #include \"sanitizer_platform_limits_posix.h\"\n+ \n+ struct link_map; // Opaque type returned by dlopen().\n+-struct sigaltstack;\n+ \n+ namespace __sanitizer {\n+ // Dirent structure for getdents(). Note that this structure is different from\n+@@ -28,8 +27,7 @@ struct linux_dirent;\n+ \n+ // Syscall wrappers.\n+ uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);\n+-uptr internal_sigaltstack(const struct sigaltstack* ss,\n+- struct sigaltstack* oss);\n++uptr internal_sigaltstack(const void* ss, void* oss);\n+ uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,\n+ __sanitizer_sigset_t *oldset);\n+ void internal_sigfillset(__sanitizer_sigset_t *set);\n+diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n+index c919e4f..014162af 100644\n+--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc\n+@@ -267,7 +267,7 @@ static int TracerThread(void* argument) {\n+ \n+ // Alternate stack for signal handling.\n+ InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);\n+- struct sigaltstack handler_stack;\n++ stack_t handler_stack;\n+ internal_memset(&handler_stack, 0, sizeof(handler_stack));\n+ handler_stack.ss_sp = handler_stack_memory.data();\n+ handler_stack.ss_size = kHandlerStackSize;\n+diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc\n+index 09cec5f..908f4fe 100644\n+--- a/libsanitizer/tsan/tsan_platform_linux.cc\n++++ b/libsanitizer/tsan/tsan_platform_linux.cc\n+@@ -291,7 +291,7 @@ bool IsGlobalVar(uptr addr) {\n+ int ExtractResolvFDs(void *state, int *fds, int nfd) {\n+ #if SANITIZER_LINUX\n+ int cnt = 0;\n+- __res_state *statp = (__res_state*)state;\n++ struct __res_state *statp = (struct __res_state*)state;\n+ for (int i = 0; i < MAXNS && cnt < nfd; i++) {\n+ if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)\n+ fds[cnt++] = statp->_u._ext.nssocks[i];\n+-- \n+2.9.5\n+\n", "prefixes": [ "v3", "2/7" ] }