From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 95473 invoked by alias); 16 Jun 2018 03:08:05 -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 95274 invoked by uid 89); 16 Jun 2018 03:08:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: =?ISO-8859-1?Q?No, score=-26.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy=sk:schemas, =ef=bb=bf, H*Ad:U*amodra, 2003?= X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 16 Jun 2018 03:07:56 +0000 X-ASG-Debug-ID: 1529118471-0c856e7f58384b00001-fS2M51 Received: from smtp.ebox.ca (smtp.electronicbox.net [96.127.255.82]) by barracuda.ebox.ca with ESMTP id ROkRt3fKubpgq3P9 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 15 Jun 2018 23:07:51 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from localhost.localdomain (unknown [192.222.164.54]) by smtp.ebox.ca (Postfix) with ESMTP id E9B66441D66; Fri, 15 Jun 2018 23:07:50 -0400 (EDT) From: Simon Marchi X-Barracuda-Effective-Source-IP: 192-222-164-54.qc.cable.ebox.net[192.222.164.54] X-Barracuda-Apparent-Source-IP: 192.222.164.54 X-Barracuda-RBL-IP: 192.222.164.54 To: gdb-patches@sourceware.org, binutils@sourceware.org Cc: Nick Clifton , Alan Modra , Joseph Myers , Simon Marchi Subject: [PATCH 3/4] zlib: Sync with GCC Date: Sat, 16 Jun 2018 03:08:00 -0000 X-ASG-Orig-Subj: [PATCH 3/4] zlib: Sync with GCC Message-Id: <20180616030744.12913-4-simon.marchi@polymtl.ca> In-Reply-To: <20180616030744.12913-1-simon.marchi@polymtl.ca> References: <20180616030744.12913-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.electronicbox.net[96.127.255.82] X-Barracuda-Start-Time: 1529118471 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 6742 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.52001 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-IsSubscribed: yes X-SW-Source: 2018-06/txt/msg00418.txt.bz2 From: Simon Marchi zlib/ChangeLog.bin-gdb: Sync with FSF GCC sources. --- zlib/ChangeLog.gcj | 7 +++++++ zlib/configure | 4 +--- zlib/configure.ac | 4 +--- zlib/contrib/vstudio/vc14/miniunz.vcxproj.user | 4 ---- zlib/contrib/vstudio/vc14/minizip.vcxproj.user | 4 ---- zlib/contrib/vstudio/vc14/testzlib.vcxproj.user | 4 ---- zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user | 4 ---- zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user | 4 ---- zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user | 4 ---- zlib/gzguts.h | 2 +- zlib/win32/zlib.def | 1 - zlib/zlib.h | 2 +- 12 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 zlib/contrib/vstudio/vc14/miniunz.vcxproj.user delete mode 100644 zlib/contrib/vstudio/vc14/minizip.vcxproj.user delete mode 100644 zlib/contrib/vstudio/vc14/testzlib.vcxproj.user delete mode 100644 zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user delete mode 100644 zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user delete mode 100644 zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user 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/configure b/zlib/configure index bed9e3ea2bf5..7649c6ab1f92 100755 --- a/zlib/configure +++ b/zlib/configure @@ -2182,8 +2182,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "${with_target_subdir}"; then - # Default to --enable-multilib +# Default to --enable-multilib # Check whether --enable-multilib was given. if test "${enable_multilib+set}" = set; then : enableval=$enable_multilib; case "$enableval" in @@ -2220,7 +2219,6 @@ fi ac_config_commands="$ac_config_commands default-1" -fi ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 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 diff --git a/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user b/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user deleted file mode 100644 index abe8dd8961e3..000000000000 --- a/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/zlib/contrib/vstudio/vc14/minizip.vcxproj.user b/zlib/contrib/vstudio/vc14/minizip.vcxproj.user deleted file mode 100644 index abe8dd8961e3..000000000000 --- a/zlib/contrib/vstudio/vc14/minizip.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user b/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user deleted file mode 100644 index abe8dd8961e3..000000000000 --- a/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user b/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user deleted file mode 100644 index abe8dd8961e3..000000000000 --- a/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user b/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user deleted file mode 100644 index abe8dd8961e3..000000000000 --- a/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user b/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user deleted file mode 100644 index abe8dd8961e3..000000000000 --- a/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file 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