mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-21 00:11:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: Check that -lzstd can be linked

Browse Source 
Recent Solaris 11.4 SRUs bundle zstd, but only the 64-bit libraries (no
idea why).  Because of this, in 32-bit builds cc1 etc. fail to link with
undefined references to various ZSTD_* functions from lto-compress.o.
This happens because currently only the presence of <zstd.h> is
necessary to enable zstd support in lto-compress.cc etc.

This patch checks for libzstd first and disables zstd support if
missing.

Tested on sparc-sun-solaris2.11 with the system installation of zstd
(64-bit only) and a locally-compiled one (specified with --with-zstd).

2023-03-28  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	gcc:
	* configure.ac (ZSTD_LIB): Move before zstd.h check.
	Unset gcc_cv_header_zstd_h without libzstd.
	* configure: Regenerate.
This commit is contained in:
Rainer Orth 2023-04-03 10:34:45 +02:00
parent 9fd6d83a4c
commit b0248580b6
2 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
gcc/configure vendored
View File

@ -10622,45 +10622,6 @@ fi
CXXFLAGS="$CXXFLAGS $ZSTD_CPPFLAGS"
LDFLAGS="$LDFLAGS $ZSTD_LDFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zstd.h" >&5
$as_echo_n "checking for zstd.h... " >&6; }
if ${gcc_cv_header_zstd_h+:} false; then :
$as_echo_n "(cached) " >&6
else
# We require version 1.3.0 or later. This is the first version that has
# ZSTD_getFrameContentSize.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <zstd.h>
#if ZSTD_VERSION_NUMBER < 10300
#error "need zstd 1.3.0 or better"
#endif
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
gcc_cv_header_zstd_h=yes
else
gcc_cv_header_zstd_h=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_zstd_h" >&5
$as_echo "$gcc_cv_header_zstd_h" >&6; }
if test $gcc_cv_header_zstd_h = yes; then
$as_echo "#define HAVE_ZSTD_H 1" >>confdefs.h
elif test "x$with_zstd" != x; then
as_fn_error $? "Unable to find zstd.h. See config.log for details." "$LINENO" 5
fi
# LTO can use zstd compression algorithm
save_LIBS="$LIBS"
LIBS=
@ -10718,11 +10679,52 @@ ac_res=$ac_cv_search_ZSTD_compress
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
else
gcc_cv_header_zstd_h=no
fi
ZSTD_LIB="$LIBS"
LIBS="$save_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zstd.h" >&5
$as_echo_n "checking for zstd.h... " >&6; }
if ${gcc_cv_header_zstd_h+:} false; then :
$as_echo_n "(cached) " >&6
else
# We require version 1.3.0 or later. This is the first version that has
# ZSTD_getFrameContentSize.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <zstd.h>
#if ZSTD_VERSION_NUMBER < 10300
#error "need zstd 1.3.0 or better"
#endif
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
gcc_cv_header_zstd_h=yes
else
gcc_cv_header_zstd_h=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_zstd_h" >&5
$as_echo "$gcc_cv_header_zstd_h" >&6; }
if test $gcc_cv_header_zstd_h = yes; then
$as_echo "#define HAVE_ZSTD_H 1" >>confdefs.h
elif test "x$with_zstd" != x; then
as_fn_error $? "Unable to find zstd.h. See config.log for details." "$LINENO" 5
fi
fi
@ -19823,7 +19825,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 19826 "configure"
#line 19828 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -19929,7 +19931,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 19932 "configure"
#line 19934 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

16
gcc/configure.ac
View File

@ -1515,6 +1515,14 @@ fi
CXXFLAGS="$CXXFLAGS $ZSTD_CPPFLAGS"
LDFLAGS="$LDFLAGS $ZSTD_LDFLAGS"
# LTO can use zstd compression algorithm
save_LIBS="$LIBS"
LIBS=
AC_SEARCH_LIBS(ZSTD_compress, zstd,, gcc_cv_header_zstd_h=no)
ZSTD_LIB="$LIBS"
LIBS="$save_LIBS"
AC_SUBST(ZSTD_LIB)
AC_MSG_CHECKING(for zstd.h)
AC_CACHE_VAL(gcc_cv_header_zstd_h,
# We require version 1.3.0 or later. This is the first version that has
@ -1533,14 +1541,6 @@ if test $gcc_cv_header_zstd_h = yes; then
elif test "x$with_zstd" != x; then
as_fn_error $? "Unable to find zstd.h. See config.log for details." "$LINENO" 5
fi
# LTO can use zstd compression algorithm
save_LIBS="$LIBS"
LIBS=
AC_SEARCH_LIBS(ZSTD_compress, zstd)
ZSTD_LIB="$LIBS"
LIBS="$save_LIBS"
AC_SUBST(ZSTD_LIB)
fi
dnl Disabled until we have a complete test for buggy enum bitfields.