Re: [PATCH 3/4] zlib: Sync with GCC

[Simon Marchi <simon.marchi@polymtl.ca>]

On 2018-06-16 03:28 AM, Andreas Schwab wrote:
> On Jun 15 2018, Simon Marchi <simon.marchi@polymtl.ca> 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 <simon.marchi@polymtl.ca>
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 <yselkowitz@redhat.com>
+
+	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  <doko@ubuntu.com>

 	* 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 <io.h>
 #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