From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 94644 invoked by alias); 16 Jun 2018 11:34:58 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 94589 invoked by uid 89); 16 Jun 2018 11:34:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-User: qpsmtpd, 2 recipients X-HELO: smtp.polymtl.ca Received: from smtp.polymtl.ca (HELO smtp.polymtl.ca) (132.207.4.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 16 Jun 2018 11:34:52 +0000 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id w5GBYX2D005850 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 16 Jun 2018 07:34:39 -0400 Received: from [10.0.0.11] (unknown [192.222.164.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 1D3491E481; Sat, 16 Jun 2018 07:34:33 -0400 (EDT) Subject: Re: [PATCH 3/4] zlib: Sync with GCC To: Andreas Schwab Cc: gdb-patches@sourceware.org, binutils@sourceware.org, Nick Clifton , Alan Modra , Joseph Myers , Simon Marchi References: <20180616030744.12913-1-simon.marchi@polymtl.ca> <20180616030744.12913-4-simon.marchi@polymtl.ca> From: Simon Marchi Message-ID: <31f1ea31-17e7-0734-cbff-4b369b5201b5@polymtl.ca> Date: Sat, 16 Jun 2018 11:34:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Sat, 16 Jun 2018 11:34:34 +0000 X-IsSubscribed: yes X-SW-Source: 2018-06/txt/msg00425.txt.bz2 On 2018-06-16 03:28 AM, Andreas Schwab wrote: > On Jun 15 2018, Simon Marchi wrote: > >> diff --git a/zlib/configure.ac b/zlib/configure.ac >> index 57d6fa56b69b..fb8d943905e2 100644 >> --- a/zlib/configure.ac >> +++ b/zlib/configure.ac >> @@ -4,9 +4,7 @@ AC_PREREQ(2.64) >> AC_INIT >> AC_CONFIG_SRCDIR([zlib.h]) >> >> -if test -n "${with_target_subdir}"; then >> - AM_ENABLE_MULTILIB(, ..) >> -fi >> +AM_ENABLE_MULTILIB(, ..) >> >> AC_CANONICAL_SYSTEM >> > > Looks like commit 93df7317ee has never been copied to gcc. Ah I see, so my patch is partly going in the wrong direction then. Can somebody from gcc copy that change over there? Here's the patch without that change. >From 4a80cd317a1453f303395787214cae5cf1a72474 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 16 Jun 2018 07:31:40 -0400 Subject: [PATCH] zlib: Sync with GCC zlib/ChangeLog.bin-gdb: Sync with FSF GCC sources. --- zlib/ChangeLog.gcj | 7 +++++++ zlib/gzguts.h | 2 +- zlib/win32/zlib.def | 1 - zlib/zlib.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 47928119dfd8..09bc9c26104c 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,10 @@ +2017-03-15 Yaakov Selkowitz + + PR bootstrap/79771 + * gzguts.h (WIDECHAR): Do not define for __CYGWIN__. + * zlib.h (gzopen_w): Do not declare for __CYGWIN__. + * win32/zlib.def: Remove gzopen_w. + 2017-01-22 Matthias Klose * Import zlib 1.2.11. diff --git a/zlib/gzguts.h b/zlib/gzguts.h index 990a4d251493..6378d468a258 100644 --- a/zlib/gzguts.h +++ b/zlib/gzguts.h @@ -39,7 +39,7 @@ # include #endif -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) # define WIDECHAR #endif diff --git a/zlib/win32/zlib.def b/zlib/win32/zlib.def index 784b13869138..0cb3f5d48b9f 100644 --- a/zlib/win32/zlib.def +++ b/zlib/win32/zlib.def @@ -91,4 +91,3 @@ EXPORTS inflateCodesUsed inflateResetKeep deflateResetKeep - gzopen_w diff --git a/zlib/zlib.h b/zlib/zlib.h index f09cdaf1e054..49dfcece0e1f 100644 --- a/zlib/zlib.h +++ b/zlib/zlib.h @@ -1893,7 +1893,7 @@ ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int)); ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp)); ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); -#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO) +#if defined(_WIN32) && !defined(Z_SOLO) ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, const char *mode)); #endif -- 2.17.1