From patchwork Thu Feb 16 20:57:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Tobler X-Patchwork-Id: 728907 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vPT5L1KhLz9ryj for ; Fri, 17 Feb 2017 07:58:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Bpvu8XKt"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=XAT6CjeoHy4MzDoStmI86rWzt2/kaKlfK+JQD86QFm9jwt8vK8 FeZ41VTMNOsuQ10SCoD5qdItIDvAujH/XXWXyqKP53mf3/zhaA80SW3IBRn0HD0l LTbedf1j/pRCHJdVTJMn+IxOmWxKomlw+SchHrVzZC39uKITZSbrf587o= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=1IkcoxufWosBjUrJ6NwmKTF8+aY=; b=Bpvu8XKtcye22MYZ7Yxy /RGZMFySaWUDitOM+LaMiVJLzMYRBelzng9gxa1eIGG4HlMJVW3GeOzY44nlHou1 PZoKUHxHNqKvjnUdmsG52YGgjLWuR9T7nQ40VuQfXYaRUpYi7d41fhW4+b2F/pBb dE6gJSB1o25fXlDu5kOkgfY= Received: (qmail 6160 invoked by alias); 16 Feb 2017 20:58:02 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 6098 invoked by uid 89); 16 Feb 2017 20:58:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:andreas, U*andreast, Hx-languages-length:1731, andreastgccgnuorg X-HELO: smtp.fgznet.ch Received: from smtp.fgznet.ch (HELO smtp.fgznet.ch) (157.161.14.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 16 Feb 2017 20:57:51 +0000 Received: from [192.168.225.14] (dhclient-91-190-14-19.flashcable.ch [91.190.14.19]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by fgznet.ch (Postfix) with ESMTPSA id 718EDC6CC1 for ; Thu, 16 Feb 2017 21:57:48 +0100 (CET) To: GCC Patches From: Andreas Tobler Subject: [PATCH PR79562] fix bootstrap on FreeBSD Message-ID: <4a2c8871-bd00-6f23-683d-9c8843ceca4b@fgznet.ch> Date: Thu, 16 Feb 2017 21:57:48 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 X-IsSubscribed: yes Hi all, is this patch ok for trunk? Fixes bootstrap for x86_64-*-freebsd12 where the internal struct rtentry has gone from userland. TIA, Andreas 2017-02-16 Andreas Tobler PR sanitizer/79562 * sanitizer_common/sanitizer_platform_limits_posix.cc: Cherry-pick upstream r294806. Index: libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc =================================================================== --- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc (revision 245506) +++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc (working copy) @@ -21,11 +21,6 @@ #ifdef _FILE_OFFSET_BITS #undef _FILE_OFFSET_BITS #endif -#if SANITIZER_FREEBSD -#define _WANT_RTENTRY -#include -#include -#endif #include #include #include @@ -420,6 +415,7 @@ unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo); unsigned struct_input_id_sz = sizeof(struct input_id); unsigned struct_mtpos_sz = sizeof(struct mtpos); + unsigned struct_rtentry_sz = sizeof(struct rtentry); unsigned struct_termio_sz = sizeof(struct termio); unsigned struct_vt_consize_sz = sizeof(struct vt_consize); unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); @@ -439,7 +435,6 @@ unsigned struct_midi_info_sz = sizeof(struct midi_info); unsigned struct_mtget_sz = sizeof(struct mtget); unsigned struct_mtop_sz = sizeof(struct mtop); - unsigned struct_rtentry_sz = sizeof(struct rtentry); unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument); unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec); unsigned struct_synth_info_sz = sizeof(struct synth_info);