OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Set GLIBCPP_BUILD_ABI_CHECK based on cross compiling, build, host variables. 

2002-08-25  Benjamin Kosnik  <bkoz@redhat.com>

	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Set
	GLIBCPP_BUILD_ABI_CHECK based on cross compiling, build, host
	variables.
	* aclocal.m4: Regenerate.
	* testsuite/Makefile.am (noinst_PROGRAMS): Make conditional on
	native compiling.

From-SVN: r56569
This commit is contained in:
Benjamin Kosnik 2002-08-25 17:44:36 +00:00 committed by Benjamin Kosnik
parent 761aece06b
commit 1eb4e3828b
6 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2002-08-25 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Set
GLIBCPP_BUILD_ABI_CHECK based on cross compiling, build, host
variables.
* aclocal.m4: Regenerate.
* testsuite/Makefile.am (noinst_PROGRAMS): Make conditional on
native compiling.
* testsuite/Makefile.in: Regenerate.
2002-08-22 Benjamin Kosnik <bkoz@redhat.com>
Phil Edwards <pme@gcc.gnu.org>
Ulrich Drepper <drepper@redhat.com>

4
libstdc++-v3/acinclude.m4
View File

@ -2028,6 +2028,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
# Export file names for ABI checking.
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt"
AC_SUBST(baseline_file)
# Don't do ABI checking unless native.
AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK,
test x"$build" == x"$host" && test -z "$with_cross_host")
])

4
libstdc++-v3/aclocal.m4 vendored
View File

@ -2040,6 +2040,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
# Export file names for ABI checking.
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt"
AC_SUBST(baseline_file)
# Don't do ABI checking unless native.
AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK,
test x"$build" == x"$host" && test -z "$with_cross_host")
])

31
libstdc++-v3/configure vendored
View File

@ -21895,6 +21895,17 @@ done
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt"
# Don't do ABI checking unless native.
if test x"$build" == x"$host" && test -z "$with_cross_host"; then
GLIBCPP_BUILD_ABI_CHECK_TRUE=
GLIBCPP_BUILD_ABI_CHECK_FALSE='#'
else
GLIBCPP_BUILD_ABI_CHECK_TRUE='#'
GLIBCPP_BUILD_ABI_CHECK_FALSE=
fi
fi
# This depends on the possibly-skipped linker test above.
@ -21923,18 +21934,18 @@ fi
# Check to see if libgcc_s exists, indicating that shared libgcc is possible.
echo $ac_n "checking for shared libgcc""... $ac_c" 1>&6
echo "configure:21927: checking for shared libgcc" >&5
echo "configure:21938: checking for shared libgcc" >&5
ac_save_CFLAGS="$CFLAGS"
CFLAGS=' -lgcc_s'
cat > conftest.$ac_ext <<EOF
#line 21931 "configure"
#line 21942 "configure"
#include "confdefs.h"
int main() {
return 0
; return 0; }
EOF
if { (eval echo configure:21938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:21949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
glibcpp_shared_libgcc=yes
else
@ -21968,14 +21979,14 @@ if test $enable_symvers = yes ; then
echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
cat > conftest.$ac_ext <<EOF
#line 21972 "configure"
#line 21983 "configure"
#include "confdefs.h"
int foo;
int main() {
; return 0; }
EOF
if { (eval echo configure:21979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:21990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
enable_symvers=gnu
else
@ -22017,7 +22028,7 @@ else
GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE=
fi
echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6
echo "configure:22021: checking versioning on shared library symbols" >&5
echo "configure:22032: checking versioning on shared library symbols" >&5
echo "$ac_t""$enable_symvers" 1>&6
@ -22105,7 +22116,7 @@ glibcpp_prefixdir=${prefix}
# Process the option --with-gxx-include-dir=<path to include-files directory>
echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
echo "configure:22109: checking for --with-gxx-include-dir" >&5
echo "configure:22120: checking for --with-gxx-include-dir" >&5
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
if test "${with_gxx_include_dir+set}" = set; then
withval="$with_gxx_include_dir"
@ -22129,7 +22140,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
# Process the option "--enable-version-specific-runtime-libs"
echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
echo "configure:22133: checking for --enable-version-specific-runtime-libs" >&5
echo "configure:22144: checking for --enable-version-specific-runtime-libs" >&5
# Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
if test "${enable_version_specific_runtime_libs+set}" = set; then
enableval="$enable_version_specific_runtime_libs"
@ -22175,7 +22186,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
fi
echo $ac_n "checking for install location""... $ac_c" 1>&6
echo "configure:22179: checking for install location" >&5
echo "configure:22190: checking for install location" >&5
echo "$ac_t""$gxx_include_dir" 1>&6
@ -22455,6 +22466,8 @@ s%@OPT_LDFLAGS@%$OPT_LDFLAGS%g
s%@LIBMATHOBJS@%$LIBMATHOBJS%g
s%@WERROR@%$WERROR%g
s%@baseline_file@%$baseline_file%g
s%@GLIBCPP_BUILD_ABI_CHECK_TRUE@%$GLIBCPP_BUILD_ABI_CHECK_TRUE%g
s%@GLIBCPP_BUILD_ABI_CHECK_FALSE@%$GLIBCPP_BUILD_ABI_CHECK_FALSE%g
s%@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE%g
s%@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE%g
s%@OS_INC_SRCDIR@%$OS_INC_SRCDIR%g

5
libstdc++-v3/testsuite/Makefile.am
View File

@ -48,5 +48,10 @@ INCLUDES = \
@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
## Build support utilities.
## Only build this as native, as need to find startup files and libc to link.
if GLIBCPP_BUILD_ABI_CHECK
noinst_PROGRAMS = abi_check
else
noinst_PROGRAMS =
endif
abi_check_SOURCES = abi_check.cc

6
libstdc++-v3/testsuite/Makefile.in
View File

@ -159,13 +159,13 @@ INCLUDES = \
-nostdinc++ \
@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
noinst_PROGRAMS = abi_check
@GLIBCPP_BUILD_ABI_CHECK_TRUE@noinst_PROGRAMS = @GLIBCPP_BUILD_ABI_CHECK_TRUE@abi_check
@GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS =
abi_check_SOURCES = abi_check.cc
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
noinst_PROGRAMS = abi_check$(EXEEXT)
@GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS =
PROGRAMS = $(noinst_PROGRAMS)