[3/4] zlib: Sync with GCC

Message ID 20180616030744.12913-4-simon.marchi@polymtl.ca
State New
Headers show
Series
  • Sync a few directories with GCC
Related show

Commit Message

Simon Marchi June 16, 2018, 3:07 a.m.
From: Simon Marchi <simon.marchi@ericsson.com>


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

-- 
2.17.1

Patch

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/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 @@ 
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ 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 @@ 
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ 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 @@ 
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ 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 @@ 
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ 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 @@ 
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ 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 @@ 
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ 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 <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