diff options
| -rw-r--r-- | gas/ChangeLog | 7 | ||||
| -rw-r--r-- | gas/Makefile.in | 10 | ||||
| -rw-r--r-- | gas/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | gas/configure | 17 | ||||
| -rw-r--r-- | gas/configure.ac | 9 | ||||
| -rw-r--r-- | gas/doc/Makefile.in | 10 |
6 files changed, 34 insertions, 20 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 4c2a20d..e5b1cd5 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,12 @@ 2015-03-31 H.J. Lu <hongjiu.lu@intel.com> + * configure.ac: Revert the AM_ZLIB change. + * Makefile.in: Regenerated. + * aclocal.m4: Likewise. + * configure: Likewise. + +2015-03-31 H.J. Lu <hongjiu.lu@intel.com> + * Makefile.am (ZLIBINC): New. (AM_CFLAGS): Add $(ZLIBINC). * as.c: (show_usage): Don't check HAVE_ZLIB_H. diff --git a/gas/Makefile.in b/gas/Makefile.in index 240d7d9..1efdb5c 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -77,10 +77,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/../bfd/version.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ + $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/../bfd/version.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -297,6 +298,7 @@ te_file = @te_file@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +zlibdir = @zlibdir@ zlibinc = @zlibinc@ AUTOMAKE_OPTIONS = 1.11 dejagnu foreign no-dist ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd diff --git a/gas/aclocal.m4 b/gas/aclocal.m4 index ea731ac..53da7c7 100644 --- a/gas/aclocal.m4 +++ b/gas/aclocal.m4 @@ -1002,6 +1002,7 @@ m4_include([../config/override.m4]) m4_include([../config/plugins.m4]) m4_include([../config/po.m4]) m4_include([../config/progtest.m4]) +m4_include([../config/zlib.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) diff --git a/gas/configure b/gas/configure index 07bcee0..002891d 100755 --- a/gas/configure +++ b/gas/configure @@ -603,6 +603,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS zlibinc +zlibdir LIBM ALLOCA GENINSRC_NEVER_FALSE @@ -10968,7 +10969,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10971 "configure" +#line 10972 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11074,7 +11075,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11077 "configure" +#line 11078 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14320,17 +14321,23 @@ $as_echo "#define USE_BINARY_FOPEN 1" >>confdefs.h ;; esac -# Use the system's zlib library. -zlibinc="-I\$(srcdir)/../zlib" +# Link in zlib if we can. This allows us to write compressed debug sections. + + # Use the system's zlib library. + zlibdir=-L../zlib + zlibinc="-I\$(srcdir)/../zlib" # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibinc= + withval=$with_system_zlib; zlibdir= + zlibinc= fi + + # Support for VMS timestamps via cross compile if test "$ac_cv_header_time_h" = yes; then diff --git a/gas/configure.ac b/gas/configure.ac index fbe8c0b..8e05fb8 100644 --- a/gas/configure.ac +++ b/gas/configure.ac @@ -816,13 +816,8 @@ AC_CHECK_DECLS([free, getenv, malloc, mempcpy, realloc, stpcpy, strstr, vsnprint BFD_BINARY_FOPEN -# Use the system's zlib library. -zlibinc="-I\$(srcdir)/../zlib" -AC_ARG_WITH(system-zlib, -[AS_HELP_STRING([--with-system-zlib], [use installed libz])], -zlibinc= -) -AC_SUBST(zlibinc) +# Link in zlib if we can. This allows us to write compressed debug sections. +AM_ZLIB # Support for VMS timestamps via cross compile diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 49ddf94..3018dcc 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -68,10 +68,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/../bfd/version.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ + $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/../bfd/version.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs @@ -266,6 +267,7 @@ te_file = @te_file@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +zlibdir = @zlibdir@ zlibinc = @zlibinc@ AUTOMAKE_OPTIONS = 1.8 cygnus |