Skip to content

R
riscv-gcc-1
Commit e21c2e1c by Benjamin Kosnik Committed by Benjamin Kosnik
Options

acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Set GLIBCPP_BUILD_ABI_CHECK based on… 

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


2002-08-22  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.

From-SVN: r56531
parent 809abaff
Showing with 48 additions and 12 deletions
libstdc++-v3/ChangeLog
2002-08-22 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 Loren J. Rittle <ljrittle@acm.org> 2002-08-22 Loren J. Rittle <ljrittle@acm.org>
* testsuite/abi_check.cc: Enhance shell portability. * testsuite/abi_check.cc: Enhance shell portability.
......
libstdc++-v3/acinclude.m4
...@@ -2030,6 +2030,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [ ...@@ -2030,6 +2030,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
# Export file names for ABI checking. # Export file names for ABI checking.
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt" baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt"
AC_SUBST(baseline_file) 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")
]) ])
......
libstdc++-v3/aclocal.m4
...@@ -2042,6 +2042,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [ ...@@ -2042,6 +2042,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
# Export file names for ABI checking. # Export file names for ABI checking.
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt" baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt"
AC_SUBST(baseline_file) 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")
]) ])
......
libstdc++-v3/configure
...@@ -22084,6 +22084,17 @@ done ...@@ -22084,6 +22084,17 @@ done
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt" 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 fi
# This depends on the possibly-skipped linker test above. # This depends on the possibly-skipped linker test above.
...@@ -22113,18 +22124,18 @@ fi ...@@ -22113,18 +22124,18 @@ fi
# Check to see if libgcc_s exists, indicating that shared libgcc is possible. # Check to see if libgcc_s exists, indicating that shared libgcc is possible.
if test $enable_symvers != no; then if test $enable_symvers != no; then
echo $ac_n "checking for shared libgcc""... $ac_c" 1>&6 echo $ac_n "checking for shared libgcc""... $ac_c" 1>&6
echo "configure:22117: checking for shared libgcc" >&5 echo "configure:22128: checking for shared libgcc" >&5
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS=' -lgcc_s' CFLAGS=' -lgcc_s'
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 22121 "configure" #line 22132 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
return 0 return 0
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:22128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:22139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
glibcpp_shared_libgcc=yes glibcpp_shared_libgcc=yes
else else
...@@ -22159,14 +22170,14 @@ if test $enable_symvers = yes ; then ...@@ -22159,14 +22170,14 @@ if test $enable_symvers = yes ; then
echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 22163 "configure" #line 22174 "configure"
#include "confdefs.h" #include "confdefs.h"
int foo; int foo;
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:22170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:22181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
enable_symvers=gnu enable_symvers=gnu
else else
...@@ -22208,7 +22219,7 @@ else ...@@ -22208,7 +22219,7 @@ else
GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE= GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE=
fi fi
echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6 echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6
echo "configure:22212: checking versioning on shared library symbols" >&5 echo "configure:22223: checking versioning on shared library symbols" >&5
echo "$ac_t""$enable_symvers" 1>&6 echo "$ac_t""$enable_symvers" 1>&6
...@@ -22297,7 +22308,7 @@ glibcpp_prefixdir=${prefix} ...@@ -22297,7 +22308,7 @@ glibcpp_prefixdir=${prefix}
# Process the option --with-gxx-include-dir=<path to include-files directory> # 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 $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
echo "configure:22301: checking for --with-gxx-include-dir" >&5 echo "configure:22312: checking for --with-gxx-include-dir" >&5
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
if test "${with_gxx_include_dir+set}" = set; then if test "${with_gxx_include_dir+set}" = set; then
withval="$with_gxx_include_dir" withval="$with_gxx_include_dir"
...@@ -22321,7 +22332,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6 ...@@ -22321,7 +22332,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
# Process the option "--enable-version-specific-runtime-libs" # Process the option "--enable-version-specific-runtime-libs"
echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
echo "configure:22325: checking for --enable-version-specific-runtime-libs" >&5 echo "configure:22336: checking for --enable-version-specific-runtime-libs" >&5
# Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. # 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 if test "${enable_version_specific_runtime_libs+set}" = set; then
enableval="$enable_version_specific_runtime_libs" enableval="$enable_version_specific_runtime_libs"
...@@ -22367,7 +22378,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then ...@@ -22367,7 +22378,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
fi fi
echo $ac_n "checking for install location""... $ac_c" 1>&6 echo $ac_n "checking for install location""... $ac_c" 1>&6
echo "configure:22371: checking for install location" >&5 echo "configure:22382: checking for install location" >&5
echo "$ac_t""$gxx_include_dir" 1>&6 echo "$ac_t""$gxx_include_dir" 1>&6
...@@ -22647,6 +22658,8 @@ s%@OPT_LDFLAGS@%$OPT_LDFLAGS%g ...@@ -22647,6 +22658,8 @@ s%@OPT_LDFLAGS@%$OPT_LDFLAGS%g
s%@LIBMATHOBJS@%$LIBMATHOBJS%g s%@LIBMATHOBJS@%$LIBMATHOBJS%g
s%@WERROR@%$WERROR%g s%@WERROR@%$WERROR%g
s%@baseline_file@%$baseline_file%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_TRUE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE%g
s%@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE%g s%@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE%g
s%@OS_INC_SRCDIR@%$OS_INC_SRCDIR%g s%@OS_INC_SRCDIR@%$OS_INC_SRCDIR%g
......
libstdc++-v3/testsuite/Makefile.am
...@@ -53,5 +53,10 @@ noinst_LIBRARIES = libv3test.a ...@@ -53,5 +53,10 @@ noinst_LIBRARIES = libv3test.a
libv3test_a_SOURCES = testsuite_hooks.cc libv3test_a_SOURCES = testsuite_hooks.cc
## Build support utilities. ## 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 noinst_PROGRAMS = abi_check
else
noinst_PROGRAMS =
endif
abi_check_SOURCES = abi_check.cc abi_check_SOURCES = abi_check.cc
libstdc++-v3/testsuite/Makefile.in
...@@ -163,8 +163,8 @@ INCLUDES = \ ...@@ -163,8 +163,8 @@ INCLUDES = \
noinst_LIBRARIES = libv3test.a noinst_LIBRARIES = libv3test.a
libv3test_a_SOURCES = testsuite_hooks.cc libv3test_a_SOURCES = testsuite_hooks.cc
@GLIBCPP_BUILD_ABI_CHECK_TRUE@noinst_PROGRAMS = @GLIBCPP_BUILD_ABI_CHECK_TRUE@abi_check
noinst_PROGRAMS = abi_check @GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS =
abi_check_SOURCES = abi_check.cc abi_check_SOURCES = abi_check.cc
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h CONFIG_HEADER = ../config.h
...@@ -178,7 +178,7 @@ LDFLAGS = @LDFLAGS@ ...@@ -178,7 +178,7 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
libv3test_a_LIBADD = libv3test_a_LIBADD =
libv3test_a_OBJECTS = testsuite_hooks.$(OBJEXT) libv3test_a_OBJECTS = testsuite_hooks.$(OBJEXT)
noinst_PROGRAMS = abi_check$(EXEEXT) @GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS =
PROGRAMS = $(noinst_PROGRAMS) PROGRAMS = $(noinst_PROGRAMS)
abi_check_OBJECTS = abi_check.$(OBJEXT) abi_check_OBJECTS = abi_check.$(OBJEXT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment