[3/4] zlib: Sync with GCC
Commit Message
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
Comments
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.
Andreas.
@@ -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.
@@ -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
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
@@ -39,7 +39,7 @@
# include <io.h>
#endif
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
# define WIDECHAR
#endif
@@ -91,4 +91,3 @@ EXPORTS
inflateCodesUsed
inflateResetKeep
deflateResetKeep
- gzopen_w
@@ -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