darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove --with-zlib from ld

Browse source 
This patch removes --with-zlib from ld.

ld/

	* configure.ac (AM_ZLIB): Removed.
	* Makefile.in: Regenerated.
	* config.in: Likewise.
	* configure: Likewise.

ld/testsuite/

	* ld-bootstrap/bootstrap.exp (extralibs): Add -lz.
This commit is contained in:
H.J. Lu 2015-03-31 03:58:15 -07:00
parent 0138187e9f
commit f24173ebf7
7 changed files with 20 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ld/ChangeLog
View file

@ -1,3 +1,10 @@
2015-03-31 H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (AM_ZLIB): Removed.
* Makefile.in: Regenerated.
* config.in: Likewise.
* configure: Likewise.
2015-03-24 Marcus Shawcroft <marcus.shawcroft@arm.com>
* emultempl/aarch64elf.em (_aarch64_add_stub_section): Set section

1
ld/Makefile.in
View file

@ -68,7 +68,6 @@ DIST_COMMON = NEWS README ChangeLog $(srcdir)/Makefile.in \
$(srcdir)/../ylwrap $(ld_TEXINFOS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \
$(top_srcdir)/../config/zlib.m4 \
$(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/gettext-sister.m4 \

3
ld/config.in
View file

@ -148,9 +148,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 the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR

93
ld/configure vendored
View file

@ -789,7 +789,6 @@ enable_werror
enable_build_warnings
enable_nls
enable_initfini_array
with_zlib
'
ac_precious_vars='build_alias
host_alias
@ -1455,7 +1454,6 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-lib-path=dir1:dir2... set default LIB_PATH
--with-sysroot=DIR Search for usr/lib et al within DIR.
--with-zlib include zlib support (auto/yes/no) default=auto
Some influential environment variables:
CC C compiler command
@ -11712,7 +11710,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11715 "configure"
#line 11713 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11818,7 +11816,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11821 "configure"
#line 11819 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -16936,93 +16934,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
# Link in zlib if we can. This is needed only for the bootstrap tests
# right now, since those tests use libbfd, which depends on zlib.
# See if the user specified whether he wants zlib support or not.
# 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
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
# When converting linker scripts into strings for use in emulation
# files, use astring.sed if the compiler supports ANSI string
# concatenation, or ostring.sed otherwise. This is to support the

4
ld/configure.ac
View file

@ -239,10 +239,6 @@ BFD_BINARY_FOPEN
AC_CHECK_DECLS([strstr, free, sbrk, getenv, environ])
# Link in zlib if we can. This is needed only for the bootstrap tests
# right now, since those tests use libbfd, which depends on zlib.
AM_ZLIB
# When converting linker scripts into strings for use in emulation
# files, use astring.sed if the compiler supports ANSI string
# concatenation, or ostring.sed otherwise. This is to support the

4
ld/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
2015-03-31 H.J. Lu <hongjiu.lu@intel.com>
* ld-bootstrap/bootstrap.exp (extralibs): Add -lz.
2015-03-30 H.J. Lu <hongjiu.lu@intel.com>
PR ld/18169

7
ld/testsuite/ld-bootstrap/bootstrap.exp
View file

@ -120,6 +120,13 @@ foreach flags $test_flags {
}
}
# Check if the system's zlib library is used.
if {[file exists ../zlib/Makefile ]} then {
set extralibs "$extralibs -L../zlib -lz"
} else {
set extralibs "$extralibs -lz"
}
# Plugin support requires linking with libdl.
if { $plugins == "yes" } {
if { ![istarget "*-*-freebsd*"]} {