aboutsummaryrefslogtreecommitdiff
path: root/sim/common
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-03-31 23:32:49 -0400
committerMike Frysinger <vapier@gentoo.org>2015-04-01 01:07:57 -0400
commitaadc9410ba24ecf777fcc515afda69ef94d74248 (patch)
tree63668585495fda69814b48924081f131469f57a6 /sim/common
parent4a0bc59ef6e01733bb70950ad546c66e4c3317ea (diff)
downloadgdb-aadc9410ba24ecf777fcc515afda69ef94d74248.zip
gdb-aadc9410ba24ecf777fcc515afda69ef94d74248.tar.gz
gdb-aadc9410ba24ecf777fcc515afda69ef94d74248.tar.bz2
sim: update zlib handling
With zlib being mandatory, and the updated m4 configs, we need to regen and use the new settings w/bfd to avoid linkage errors.
Diffstat (limited to 'sim/common')
-rw-r--r--sim/common/ChangeLog7
-rw-r--r--sim/common/Make-common.in6
-rw-r--r--sim/common/config.in3
-rwxr-xr-xsim/common/configure93
4 files changed, 24 insertions, 85 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index f4ca558..55a3d37 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,12 @@
2015-03-31 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+ * Make-common.in (CSEARCH): Add $(ZLIBINC).
+ (ZLIB, ZLIBINC): Define.
+ (BFD_LIB): Add $(ZLIB).
+
+2015-03-31 Mike Frysinger <vapier@gentoo.org>
+
* cgen-mem.h (MEMOPS_INLINE): Change to EXTERN_INLINE.
* cgen-ops.h (SEMOPS_INLINE): Likewise.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 734461a..345d1db 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -248,14 +248,16 @@ CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \
-I../../include -I$(srcroot)/include \
-I../../bfd -I$(srcroot)/bfd \
-I../../opcodes -I$(srcroot)/opcodes \
- @INCINTL@
+ @INCINTL@ $(ZLIBINC)
ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS)
BUILD_CFLAGS = -g -O $(CSEARCH)
COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH)
+ZLIB = @zlibdir@ -lz
+ZLIBINC = @zlibinc@
LIBIBERTY_LIB = ../../libiberty/libiberty.a
-BFD_LIB = ../../bfd/libbfd.a
+BFD_LIB = ../../bfd/libbfd.a $(ZLIB)
@PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@
OPCODES_LIB = ../../opcodes/libopcodes.a
LIBINTL = @LIBINTL@
diff --git a/sim/common/config.in b/sim/common/config.in
index e0ca8ae..1904046 100644
--- a/sim/common/config.in
+++ b/sim/common/config.in
@@ -136,9 +136,6 @@
/* Define to 1 if you have the <windows.h> header file. */
#undef HAVE_WINDOWS_H
-/* Define to 1 if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
-
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
diff --git a/sim/common/configure b/sim/common/configure
index db5f661..ce79060 100755
--- a/sim/common/configure
+++ b/sim/common/configure
@@ -633,6 +633,8 @@ SED
LIBTOOL
PLUGINS_FALSE
PLUGINS_TRUE
+zlibinc
+zlibdir
CATOBJEXT
GENCAT
INSTOBJEXT
@@ -743,7 +745,7 @@ sim_environment'
ac_subst_files=''
ac_user_opts='
enable_option_checking
-with_zlib
+with_system_zlib
enable_plugins
enable_shared
enable_static
@@ -1406,7 +1408,7 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-zlib include zlib support (auto/yes/no) default=auto
+ --with-system-zlib use installed libz
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -6953,88 +6955,19 @@ fi
# BFD conditionally uses zlib, so we must link it in if libbfd does, by
# using the same condition.
- # 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
+# Check whether --with-system-zlib was given.
+if test "${with_system_zlib+set}" = set; then :
+ withval=$with_system_zlib; zlibdir=
+ zlibinc=
-
- 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
-
-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
# BFD uses libdl when when plugins enabled.
@@ -10625,7 +10558,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10628 "configure"
+#line 10561 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10731,7 +10664,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10734 "configure"
+#line 10667 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H