Add --with-system-zlib in gdb
This patch adds --with-system-zlib and removes --with-zlib in gdb. * Makefile.in (ZLIB): New. (ZLIBINC): Likewise. (INTERNAL_CFLAGS_BASE): Add $(ZLIBINC). (CLIBS): Add $(ZLIB). * acinclude.m4: (GDB_AC_CHECK_BFD): Add $zlibdir to LDFLAGS. Add -lz to LIBS. * gdb_bfd.c: Don't check HAVE_ZLIB_H to include <zlib.h>. * top.c (print_gdb_configuration): Remove --with-zlib and --without-zlib. * config.in: Regenerated. * configure: Likewise.
This commit is contained in:
H.J. Lu
parent
518a69099c
commit
711a72d3d6
|
|
@ -1,3 +1,17 @@
|
|||
2015-03-31 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* Makefile.in (ZLIB): New.
|
||||
(ZLIBINC): Likewise.
|
||||
(INTERNAL_CFLAGS_BASE): Add $(ZLIBINC).
|
||||
(CLIBS): Add $(ZLIB).
|
||||
* acinclude.m4: (GDB_AC_CHECK_BFD): Add $zlibdir to LDFLAGS.
|
||||
Add -lz to LIBS.
|
||||
* gdb_bfd.c: Don't check HAVE_ZLIB_H to include <zlib.h>.
|
||||
* top.c (print_gdb_configuration): Remove --with-zlib and
|
||||
--without-zlib.
|
||||
* config.in: Regenerated.
|
||||
* configure: Likewise.
|
||||
|
||||
2015-03-31 Antoine Tremblay <antoine.tremblay@ericsson.com>
|
||||
|
||||
* NEWS: Mention info os cpus support.
|
||||
|
|
|
|||
|
|
@ -144,6 +144,12 @@ BFD = $(BFD_DIR)/libbfd.a
|
|||
BFD_SRC = $(srcdir)/$(BFD_DIR)
|
||||
BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
|
||||
|
||||
# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is
|
||||
# -I../zlib, unless we were configured with --with-system-zlib, in which
|
||||
# case both are empty.
|
||||
ZLIB = @zlibdir@ -lz
|
||||
ZLIBINC = @zlibinc@
|
||||
|
||||
# Where is the decnumber library? Typically in ../libdecnumber.
|
||||
LIBDECNUMBER_DIR = ../libdecnumber
|
||||
LIBDECNUMBER = $(LIBDECNUMBER_DIR)/libdecnumber.a
|
||||
|
|
@ -556,7 +562,7 @@ CXXFLAGS = -g -O
|
|||
# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
|
||||
INTERNAL_CFLAGS_BASE = \
|
||||
$(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
|
||||
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
|
||||
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) $(ZLIBINC) \
|
||||
$(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \
|
||||
$(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS)
|
||||
INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
|
||||
|
|
@ -578,7 +584,7 @@ INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(MH_LDFLAGS) $(LDFLAGS) $(CONFIG_
|
|||
# Libraries and corresponding dependencies for compiling gdb.
|
||||
# XM_CLIBS, defined in *config files, have host-dependent libs.
|
||||
# LIBIBERTY appears twice on purpose.
|
||||
CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
|
||||
CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(ZLIB) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
|
||||
$(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) \
|
||||
@LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \
|
||||
$(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) \
|
||||
|
|
|
|||
|
|
@ -465,9 +465,9 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [
|
|||
# points somewhere with bfd, with -I/foo/lib and -L/foo/lib. We
|
||||
# always want our bfd.
|
||||
CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
|
||||
LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
|
||||
LDFLAGS="-L../bfd -L../libiberty $zlibdir $LDFLAGS"
|
||||
intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
|
||||
LIBS="-lbfd -liberty $intl $LIBS"
|
||||
LIBS="-lbfd -liberty -lz $intl $LIBS"
|
||||
AC_CACHE_CHECK([$1], [$2],
|
||||
[AC_TRY_LINK(
|
||||
[#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -582,9 +582,6 @@
|
|||
/* Define to 1 if you have the `XML_StopParser' function. */
|
||||
#undef HAVE_XML_STOPPARSER
|
||||
|
||||
/* Define to 1 if you have the <zlib.h> header file. */
|
||||
#undef HAVE_ZLIB_H
|
||||
|
||||
/* Define to 1 if your system has the _etext variable. */
|
||||
#undef HAVE__ETEXT
|
||||
|
||||
|
|
|
|||
|
|
@ -680,6 +680,8 @@ READLINE_TEXI_INCFLAG
|
|||
READLINE_CFLAGS
|
||||
READLINE_DEPS
|
||||
READLINE
|
||||
zlibinc
|
||||
zlibdir
|
||||
MIG
|
||||
WINDRES
|
||||
DLLTOOL
|
||||
|
|
@ -817,7 +819,7 @@ with_curses
|
|||
enable_profiling
|
||||
with_pkgversion
|
||||
with_bugurl
|
||||
with_zlib
|
||||
with_system_zlib
|
||||
with_libiconv_prefix
|
||||
with_iconv_bin
|
||||
with_system_readline
|
||||
|
|
@ -1536,7 +1538,7 @@ Optional Packages:
|
|||
library
|
||||
--with-pkgversion=PKG Use PKG in the version string in place of "GDB"
|
||||
--with-bugurl=URL Direct users to URL to report a bug
|
||||
--with-zlib include zlib support (auto/yes/no) default=auto
|
||||
--with-system-zlib use installed libz
|
||||
--with-libiconv-prefix=DIR
|
||||
search for libiconv in DIR/include and DIR/lib
|
||||
--with-iconv-bin=PATH specify where to find the iconv program
|
||||
|
|
@ -7017,88 +7019,19 @@ fi
|
|||
|
||||
# Link in zlib if we can. This allows us to read compressed debug sections.
|
||||
|
||||
# See if the user specified whether he wants zlib support or not.
|
||||
# Use the system's zlib library.
|
||||
zlibdir=-L../zlib
|
||||
zlibinc="-I\$(srcdir)/../zlib"
|
||||
|
||||
# Check whether --with-zlib was given.
|
||||
if test "${with_zlib+set}" = set; then :
|
||||
withval=$with_zlib;
|
||||
else
|
||||
with_zlib=auto
|
||||
fi
|
||||
|
||||
|
||||
if test "$with_zlib" != "no"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
|
||||
$as_echo_n "checking for library containing zlibVersion... " >&6; }
|
||||
if test "${ac_cv_search_zlibVersion+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_func_search_save_LIBS=$LIBS
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char zlibVersion ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return zlibVersion ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
for ac_lib in '' z; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
ac_res=-l$ac_lib
|
||||
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
||||
fi
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_search_zlibVersion=$ac_res
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext
|
||||
if test "${ac_cv_search_zlibVersion+set}" = set; then :
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test "${ac_cv_search_zlibVersion+set}" = set; then :
|
||||
|
||||
else
|
||||
ac_cv_search_zlibVersion=no
|
||||
fi
|
||||
rm conftest.$ac_ext
|
||||
LIBS=$ac_func_search_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_zlibVersion" >&5
|
||||
$as_echo "$ac_cv_search_zlibVersion" >&6; }
|
||||
ac_res=$ac_cv_search_zlibVersion
|
||||
if test "$ac_res" != no; then :
|
||||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||||
for ac_header in zlib.h
|
||||
do :
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_zlib_h" = x""yes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_ZLIB_H 1
|
||||
_ACEOF
|
||||
# Check whether --with-system-zlib was given.
|
||||
if test "${with_system_zlib+set}" = set; then :
|
||||
withval=$with_system_zlib; zlibdir=
|
||||
zlibinc=
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
fi
|
||||
|
||||
if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
|
||||
as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# On FreeBSD we may need libutil for kinfo_getvmmap (used by fbsd-nat.c).
|
||||
|
|
@ -13596,9 +13529,9 @@ esac
|
|||
# points somewhere with bfd, with -I/foo/lib and -L/foo/lib. We
|
||||
# always want our bfd.
|
||||
CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
|
||||
LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
|
||||
LDFLAGS="-L../bfd -L../libiberty $zlibdir $LDFLAGS"
|
||||
intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
|
||||
LIBS="-lbfd -liberty $intl $LIBS"
|
||||
LIBS="-lbfd -liberty -lz $intl $LIBS"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF support in BFD" >&5
|
||||
$as_echo_n "checking for ELF support in BFD... " >&6; }
|
||||
if test "${gdb_cv_var_elf+set}" = set; then :
|
||||
|
|
@ -13706,9 +13639,9 @@ fi
|
|||
# points somewhere with bfd, with -I/foo/lib and -L/foo/lib. We
|
||||
# always want our bfd.
|
||||
CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
|
||||
LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
|
||||
LDFLAGS="-L../bfd -L../libiberty $zlibdir $LDFLAGS"
|
||||
intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
|
||||
LIBS="-lbfd -liberty $intl $LIBS"
|
||||
LIBS="-lbfd -liberty -lz $intl $LIBS"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mach-O support in BFD" >&5
|
||||
$as_echo_n "checking for Mach-O support in BFD... " >&6; }
|
||||
if test "${gdb_cv_var_macho+set}" = set; then :
|
||||
|
|
|
|||
|
|
@ -24,9 +24,6 @@
|
|||
#include "hashtab.h"
|
||||
#include "filestuff.h"
|
||||
#include "vec.h"
|
||||
#ifdef HAVE_ZLIB_H
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_MMAP
|
||||
#include <sys/mman.h>
|
||||
#ifndef MAP_FAILED
|
||||
|
|
|
|||
|
|
@ -1316,15 +1316,6 @@ This GDB was configured as follows:\n\
|
|||
fprintf_filtered (stream, _("\
|
||||
--with-system-gdbinit=%s%s\n\
|
||||
"), SYSTEM_GDBINIT, SYSTEM_GDBINIT_RELOCATABLE ? " (relocatable)" : "");
|
||||
#if HAVE_ZLIB_H
|
||||
fprintf_filtered (stream, _("\
|
||||
--with-zlib\n\
|
||||
"));
|
||||
#else
|
||||
fprintf_filtered (stream, _("\
|
||||
--without-zlib\n\
|
||||
"));
|
||||
#endif
|
||||
#if HAVE_LIBBABELTRACE
|
||||
fprintf_filtered (stream, _("\
|
||||
--with-babeltrace\n\
|
||||
|
|
|
|||
Loading…
Reference in New Issue