{"id":809141,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809141/?format=json","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/1.0/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170902205423.21288-3-romain.naour@gmail.com>","date":"2017-09-02T20:54:14","name":"[v2,02/11] package/gcc: fix build issue with glibc 2.26","commit_ref":null,"pull_url":null,"state":"awaiting-upstream","archived":false,"hash":"2e4c5d549cc841721f33498480c8f793c8f7c10a","submitter":{"id":67942,"url":"http://patchwork.ozlabs.org/api/1.0/people/67942/?format=json","name":"Romain Naour","email":"romain.naour@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170902205423.21288-3-romain.naour@gmail.com/mbox/","series":[{"id":1178,"url":"http://patchwork.ozlabs.org/api/1.0/series/1178/?format=json","date":"2017-09-02T20:54:12","name":"glibc: bump to 2.26","version":2,"mbox":"http://patchwork.ozlabs.org/series/1178/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809141/checks/","tags":{},"headers":{"Return-Path":"","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.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","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=\"Addde1wG\"; dkim-atps=neutral"],"Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3xl7ds3Z1Xz9t2W\n\tfor ;\n\tSun, 3 Sep 2017 06:54:40 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 65F8D820A0;\n\tSat, 2 Sep 2017 20:54:38 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id KVFQRGglo4gr; Sat, 2 Sep 2017 20:54:35 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B0AF381E48;\n\tSat, 2 Sep 2017 20:54:35 +0000 (UTC)","from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6058B1BF238\n\tfor ;\n\tSat, 2 Sep 2017 20:54:33 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 57D9C86E55\n\tfor ;\n\tSat, 2 Sep 2017 20:54:33 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 4XCqm5oQ5Pv4 for ;\n\tSat, 2 Sep 2017 20:54:32 +0000 (UTC)","from mail-wm0-f67.google.com (mail-wm0-f67.google.com\n\t[74.125.82.67])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 0571D86E82\n\tfor ; Sat, 2 Sep 2017 20:54:32 +0000 (UTC)","by mail-wm0-f67.google.com with SMTP id p17so3092438wmd.3\n\tfor ; Sat, 02 Sep 2017 13:54:31 -0700 (PDT)","from localhost.localdomain\n\t([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf])\n\tby smtp.gmail.com with ESMTPSA id\n\t52sm2295647wru.59.2017.09.02.13.54.28\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 02 Sep 2017 13:54:29 -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=/8FqXV1iGHnkTTHMDROGV32uyShabfeoGUuj4qxovC4=;\n\tb=Addde1wGyphPu3mI9cO/cJO5v5JLIH5GJWLsQ1cIVkNI/AWkf15z2Y1FJ4oUAkBntP\n\t886tIQqcqfL1TkkynKu9dFa8B1JjOPZBRE6MuS+LON0Tp5XGMTDrmLC6QJLbvkvmTLVI\n\tGOKC1VCMZQwaw7CH0uisOkTH2lXe7sA988jy9in/rZylZc2TCy93l3vUuZmMTf8b3aWM\n\t6ANRUcSjS1Yk019mdxhlBsJHcrnVx5Yzf95208Mo1mv51I4hPJF0eHkfE3jx4qF4euXX\n\tHfoahyDGFf+j2K+Ea9KcmJHTm7o3bOtgsKdIWHJH/oqRB1H/XlZh/8kRj0mspajO6nhe\n\tKHAQ==","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=/8FqXV1iGHnkTTHMDROGV32uyShabfeoGUuj4qxovC4=;\n\tb=cDW0EbSqIToyOoE369wpgPPfOPCQQsMtuFxZAoBwmxEWMJBkT58BDhP3PMDUK/Mh+e\n\t8yiBytT97XCUIB1nQoMMYY7Quk+Ohuv+qSmP/h2I6CGwtPCQ0i1GKkaJ8GU2xMb8E6e3\n\tdV8z/t8izC1ZI8QvR/qjEQXd08AHoKkAixYlSZUdYvcdC/ACJ6IbzKyO9ynmASRGuV99\n\tJzaTWdxj0p1CRalfOkU3CEiAKydQ+CsZJ5MQS+0acLlJ55Zl6LetPuHlqWwZN50A5DEe\n\toxoCyjkS+H3xdIOAvtyjpFUc7u2S7T1rhvmwgS3WM2Ku6CFcn/WoI/4gcHSLcJk7PB/4\n\tNQIg==","X-Gm-Message-State":"AHPjjUj9uzvqPqO5JCVmgzSKEWiPSeRhnUzWj1jNeKdN9oqb5/qxP83i\n\tHC6/4pjNCfAEg0bVatM=","X-Google-Smtp-Source":"ADKCNb5Tzcl60EolgrXhQkH6Nk5x4D5bzRapVFFkepXAgasvr6AeNaAfo97StRHoBJvefGiEWQkBLA==","X-Received":"by 10.28.138.194 with SMTP id m185mr1153019wmd.2.1504385670107; \n\tSat, 02 Sep 2017 13:54:30 -0700 (PDT)","From":"Romain Naour ","To":"buildroot@buildroot.org","Date":"Sat, 2 Sep 2017 22:54:14 +0200","Message-Id":"<20170902205423.21288-3-romain.naour@gmail.com>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20170902205423.21288-1-romain.naour@gmail.com>","References":"<20170902205423.21288-1-romain.naour@gmail.com>","MIME-Version":"1.0","Cc":"Thomas Petazzoni ,\n\tRomain Naour ","Subject":"[Buildroot] [PATCH v2 02/11] package/gcc: fix build issue with\n\tglibc 2.26","X-BeenThere":"buildroot@busybox.net","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Discussion and development of buildroot ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"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 \nCc: Thomas Petazzoni \n---\n package/gcc/4.9.4/944-sanitizer-linux.patch | 88 +++++++++++++++++++++++++++++\n package/gcc/5.4.0/944-sanitizer-linux.patch | 87 ++++++++++++++++++++++++++++\n package/gcc/6.4.0/943-sanitizer-linux.patch | 87 ++++++++++++++++++++++++++++\n 3 files changed, 262 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 \n+Date: Mon, 17 Jul 2017 19:41:08 +0000\n+Subject: [PATCH] \tBackported from mainline \t2017-07-14 Jakub\n+ Jelinek \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 \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 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..bbeb3c7\n--- /dev/null\n+++ b/package/gcc/5.4.0/944-sanitizer-linux.patch\n@@ -0,0 +1,87 @@\n+From 659b130df028d6e580c9e7f87ff61f67cfb3e0a3 Mon Sep 17 00:00:00 2001\n+From: jakub \n+Date: Mon, 17 Jul 2017 19:41:08 +0000\n+Subject: [PATCH] \tBackported from mainline \t2017-07-14 Jakub\n+ Jelinek \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+[Romain cherry-pick on gcc-6-branch from gcc-7-branch]\n+Signed-off-by: Romain Naour \n+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4\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 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..8c83f7e\n--- /dev/null\n+++ b/package/gcc/6.4.0/943-sanitizer-linux.patch\n@@ -0,0 +1,87 @@\n+From 0fa7102d76376b27ae4bbc10848600aac6ed71d2 Mon Sep 17 00:00:00 2001\n+From: jakub \n+Date: Mon, 17 Jul 2017 19:41:08 +0000\n+Subject: [PATCH] \tBackported from mainline \t2017-07-14 Jakub\n+ Jelinek \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+[Romain cherry-pick on gcc-6-branch from gcc-7-branch]\n+Signed-off-by: Romain Naour \n+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4\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 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.4\n+\n","prefixes":["v2","02/11"]}