Skip to content

R
riscv-gcc-1
Commit 747d0967 by Benjamin Kosnik Committed by Benjamin Kosnik
Options

Makefile.am (check-abi): New rule. 


2002-08-22  Benjamin Kosnik  <bkoz@redhat.com>
	    Phil Edwards  <pme@gcc.gnu.org>
	    Ulrich Drepper  <drepper@redhat.com>

	* Makefile.am (check-abi): New rule.
	* Makefile.in: Regenerate.
	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Export baseline_file.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* testsuite/Makefile.am (noinst_PROGRAMS): Add abi_check.
	(abi_check_SOURCES): Add.
	* testsuite/Makefile.in: Regenerate.
	* testsuite/abi_check.cc: New file.
	* config/abi: Add.
	* config/abi/i686-pc-linux-gnu: Add.
	* config/abi/i686-pc-linux-gnu/baseline_symbols.txt: New file.

Co-Authored-By: Phil Edwards <pme@gcc.gnu.org>
Co-Authored-By: Ulrich Drepper <drepper@redhat.com>

From-SVN: r56515
parent a976230b
Showing with 504 additions and 48 deletions
libstdc++-v3/ChangeLog
2002-08-22 Benjamin Kosnik <bkoz@redhat.com>
Phil Edwards <pme@gcc.gnu.org>
Ulrich Drepper <drepper@redhat.com>
* Makefile.am (check-abi): New rule.
* Makefile.in: Regenerate.
* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Export baseline_file.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* testsuite/Makefile.am (noinst_PROGRAMS): Add abi_check.
(abi_check_SOURCES): Add.
* testsuite/Makefile.in: Regenerate.
* testsuite/abi_check.cc: New file.
* config/abi: Add.
* config/abi/i686-pc-linux-gnu: Add.
* config/abi/i686-pc-linux-gnu/baseline_symbols.txt: New file.
2002-08-19 Benjamin Kosnik <bkoz@redhat.com> 2002-08-19 Benjamin Kosnik <bkoz@redhat.com>
* configure.in (libtool_VERSION): Update to 5:1:0. * configure.in (libtool_VERSION): Update to 5:1:0.
......
libstdc++-v3/Makefile.am
...@@ -46,6 +46,11 @@ check-script-install: $(top_builddir)/mkcheck ...@@ -46,6 +46,11 @@ check-script-install: $(top_builddir)/mkcheck
cd testsuite; \ cd testsuite; \
@glibcpp_builddir@/mkcheck 1) @glibcpp_builddir@/mkcheck 1)
baseline_file = @baseline_file@
check-abi: $(top_builddir)/testsuite/abi_check
-(cd testsuite; \
abi_check @baseline_file@)
# These rules are messy, but are hella worth it. # These rules are messy, but are hella worth it.
doxygen: doxygen:
-(srcdir=`cd ${top_srcdir}; ${PWD}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD}`; \
......
libstdc++-v3/Makefile.in
...@@ -141,6 +141,8 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs ...@@ -141,6 +141,8 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD = $${PWDCMD-pwd} PWD = $${PWDCMD-pwd}
baseline_file = @baseline_file@
# Multilib support. # Multilib support.
MAKEOVERRIDES = MAKEOVERRIDES =
...@@ -482,6 +484,9 @@ check-script-install: $(top_builddir)/mkcheck ...@@ -482,6 +484,9 @@ check-script-install: $(top_builddir)/mkcheck
-(chmod + $(top_builddir)/mkcheck; \ -(chmod + $(top_builddir)/mkcheck; \
cd testsuite; \ cd testsuite; \
@glibcpp_builddir@/mkcheck 1) @glibcpp_builddir@/mkcheck 1)
check-abi: $(top_builddir)/testsuite/abi_check
-(cd testsuite; \
abi_check @baseline_file@)
# These rules are messy, but are hella worth it. # These rules are messy, but are hella worth it.
doxygen: doxygen:
......
libstdc++-v3/acinclude.m4
...@@ -2026,6 +2026,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [ ...@@ -2026,6 +2026,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
# Look for setenv, so that extended locale tests can be performed. # Look for setenv, so that extended locale tests can be performed.
GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv) GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
# Export file names for ABI checking.
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt"
AC_SUBST(baseline_file)
]) ])
......
libstdc++-v3/aclocal.m4
...@@ -2038,6 +2038,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [ ...@@ -2038,6 +2038,10 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
# Look for setenv, so that extended locale tests can be performed. # Look for setenv, so that extended locale tests can be performed.
GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv) GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
# Export file names for ABI checking.
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt"
AC_SUBST(baseline_file)
]) ])
......
libstdc++-v3/config/abi/i686-pc-linux-gnu/baseline_symbols.txt 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/configure
...@@ -22080,6 +22080,10 @@ done ...@@ -22080,6 +22080,10 @@ done
fi fi
# Export file names for ABI checking.
baseline_file="${glibcpp_srcdir}/config/abi/${target_alias}/baseline_symbols.txt"
fi fi
# This depends on the possibly-skipped linker test above. # This depends on the possibly-skipped linker test above.
...@@ -22109,18 +22113,18 @@ fi ...@@ -22109,18 +22113,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:22113: checking for shared libgcc" >&5 echo "configure:22117: 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 22117 "configure" #line 22121 "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:22124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:22128: \"$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
...@@ -22155,14 +22159,14 @@ if test $enable_symvers = yes ; then ...@@ -22155,14 +22159,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 22159 "configure" #line 22163 "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:22166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:22170: \"$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
...@@ -22204,7 +22208,7 @@ else ...@@ -22204,7 +22208,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:22208: checking versioning on shared library symbols" >&5 echo "configure:22212: checking versioning on shared library symbols" >&5
echo "$ac_t""$enable_symvers" 1>&6 echo "$ac_t""$enable_symvers" 1>&6
...@@ -22293,7 +22297,7 @@ glibcpp_prefixdir=${prefix} ...@@ -22293,7 +22297,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:22297: checking for --with-gxx-include-dir" >&5 echo "configure:22301: 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"
...@@ -22317,7 +22321,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6 ...@@ -22317,7 +22321,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:22321: checking for --enable-version-specific-runtime-libs" >&5 echo "configure:22325: 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"
...@@ -22363,7 +22367,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then ...@@ -22363,7 +22367,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:22367: checking for install location" >&5 echo "configure:22371: checking for install location" >&5
echo "$ac_t""$gxx_include_dir" 1>&6 echo "$ac_t""$gxx_include_dir" 1>&6
...@@ -22642,6 +22646,7 @@ s%@SECTION_LDFLAGS@%$SECTION_LDFLAGS%g ...@@ -22642,6 +22646,7 @@ s%@SECTION_LDFLAGS@%$SECTION_LDFLAGS%g
s%@OPT_LDFLAGS@%$OPT_LDFLAGS%g 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%@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/include/Makefile.in
...@@ -111,6 +111,7 @@ USE_NLS = @USE_NLS@ ...@@ -111,6 +111,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
baseline_file = @baseline_file@
check_msgfmt = @check_msgfmt@ check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
......
libstdc++-v3/libio/Makefile.in
...@@ -109,6 +109,7 @@ USE_NLS = @USE_NLS@ ...@@ -109,6 +109,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
baseline_file = @baseline_file@
check_msgfmt = @check_msgfmt@ check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
......
libstdc++-v3/libmath/Makefile.in
...@@ -111,6 +111,7 @@ USE_NLS = @USE_NLS@ ...@@ -111,6 +111,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
baseline_file = @baseline_file@
check_msgfmt = @check_msgfmt@ check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -107,6 +107,7 @@ USE_NLS = @USE_NLS@ ...@@ -107,6 +107,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
baseline_file = @baseline_file@
check_msgfmt = @check_msgfmt@ check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
...@@ -152,11 +153,13 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ ...@@ -152,11 +153,13 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
# These bits are all figured out from configure. Look in acinclude.m4 # These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@ CONFIG_CXXFLAGS = \
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@
# Warning flags to use. # Warning flags to use.
WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once WARN_CXXFLAGS = \
@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
...@@ -164,16 +167,42 @@ GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@ ...@@ -164,16 +167,42 @@ GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include
INCLUDES = $(GCC_INCLUDES) $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES) INCLUDES = \
$(GCC_INCLUDES) $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
headers = exception new typeinfo cxxabi.h exception_defines.h headers = \
exception new typeinfo cxxabi.h exception_defines.h
c_sources = cxa_demangle.c dyn-string.c c_sources = \
cxa_demangle.c \
dyn-string.c
sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc eh_personality.cc eh_terminate.cc eh_throw.cc eh_type.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc vec.cc sources = \
del_op.cc \
del_opnt.cc \
del_opv.cc \
del_opvnt.cc \
eh_alloc.cc \
eh_aux_runtime.cc \
eh_catch.cc \
eh_exception.cc \
eh_globals.cc \
eh_personality.cc \
eh_terminate.cc \
eh_throw.cc \
eh_type.cc \
new_handler.cc \
new_op.cc \
new_opnt.cc \
new_opv.cc \
new_opvnt.cc \
pure.cc \
tinfo.cc \
tinfo2.cc \
vec.cc
libsupc___la_SOURCES = $(sources) $(c_sources) libsupc___la_SOURCES = $(sources) $(c_sources)
...@@ -187,11 +216,15 @@ LIBSUPCXX_CXXFLAGS = $(LIBSUPCXX_PICFLAGS) ...@@ -187,11 +216,15 @@ LIBSUPCXX_CXXFLAGS = $(LIBSUPCXX_PICFLAGS)
# Use special rules for pulling things out of libiberty. These # Use special rules for pulling things out of libiberty. These
# objects should be compiled with the "C" compiler, not the C++ # objects should be compiled with the "C" compiler, not the C++
# compiler, and also should not use the C++ includes. # compiler, and also should not use the C++ includes.
C_COMPILE = $(CC) $(DEFS) $(GCC_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) C_COMPILE = \
$(CC) $(DEFS) $(GCC_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
# LTCOMPILE is copied from LTCXXCOMPILE below. # LTCOMPILE is copied from LTCXXCOMPILE below.
LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) $(DEFS) $(GCC_INCLUDES) $(LIBSUPCXX_PICFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \
$(DEFS) $(GCC_INCLUDES) $(LIBSUPCXX_PICFLAGS) \
$(AM_CPPFLAGS) $(CPPFLAGS)
# AM_CXXFLAGS needs to be in each subdirectory so that it can be # AM_CXXFLAGS needs to be in each subdirectory so that it can be
...@@ -199,7 +232,12 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) $ ...@@ -199,7 +232,12 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) $
# set this option because CONFIG_CXXFLAGS has to be after # set this option because CONFIG_CXXFLAGS has to be after
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
# as the occasion call for it. (ie, --enable-debug) # as the occasion call for it. (ie, --enable-debug)
AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) AM_CXXFLAGS = \
-fno-implicit-templates \
$(LIBSUPCXX_CXXFLAGS) \
$(WARN_CXXFLAGS) \
$(OPTIMIZE_CXXFLAGS) \
$(CONFIG_CXXFLAGS)
# libstdc++ libtool notes # libstdc++ libtool notes
...@@ -223,7 +261,9 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) ...@@ -223,7 +261,9 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS)
# #
# We have to put --tag disable-shared after --tag CXX lest things # We have to put --tag disable-shared after --tag CXX lest things
# CXX undo the affect of disable-shared. # CXX undo the affect of disable-shared.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
--mode=compile $(CXX) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
# 3) We'd have a problem when building the shared libstdc++ object if # 3) We'd have a problem when building the shared libstdc++ object if
...@@ -232,7 +272,9 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared --mode=c ...@@ -232,7 +272,9 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared --mode=c
# course is problematic at this point. So, we get the top-level # course is problematic at this point. So, we get the top-level
# directory to configure libstdc++-v3 to use gcc as the C++ # directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver. # compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared --mode=link $(CXX) @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
--mode=link $(CXX) \
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
CONFIG_HEADER = ../config.h CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
...@@ -271,7 +313,7 @@ DIST_COMMON = Makefile.am Makefile.in ...@@ -271,7 +313,7 @@ DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar TAR = gtar
GZIP_ENV = --best GZIP_ENV = --best
SOURCES = $(libsupc__convenience_la_SOURCES) $(libsupc___la_SOURCES) SOURCES = $(libsupc__convenience_la_SOURCES) $(libsupc___la_SOURCES)
OBJECTS = $(libsupc__convenience_la_OBJECTS) $(libsupc___la_OBJECTS) OBJECTS = $(libsupc__convenience_la_OBJECTS) $(libsupc___la_OBJECTS)
......
libstdc++-v3/po/Makefile.in
...@@ -111,6 +111,7 @@ USE_NLS = @USE_NLS@ ...@@ -111,6 +111,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
baseline_file = @baseline_file@
check_msgfmt = @check_msgfmt@ check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
......
libstdc++-v3/src/Makefile.in
...@@ -104,6 +104,7 @@ USE_NLS = @USE_NLS@ ...@@ -104,6 +104,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
baseline_file = @baseline_file@
check_msgfmt = @check_msgfmt@ check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
......
libstdc++-v3/testsuite/Makefile.am
...@@ -36,14 +36,22 @@ RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \ ...@@ -36,14 +36,22 @@ RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
AM_RUNTESTFLAGS = AM_RUNTESTFLAGS =
RUNTESTFLAGS = RUNTESTFLAGS =
CXX = @glibcpp_CXX@ ## CXX is actually a "C" compiler. These are real C++ programs.
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES ## Do the same thing as `testsuite_hooks --build-cxx`
CXX_fake = @glibcpp_CXX@
CXX=`echo $(CXX_fake) | sed 's/xgcc/g++/g'`
CXXLINK = \
$(LIBTOOL) --tag=CXX --mode=link $(CXX) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
INCLUDES = \ INCLUDES = \
-nostdinc++ \ -nostdinc++ \
@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ @GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
## Build support library.
noinst_LIBRARIES = libv3test.a noinst_LIBRARIES = libv3test.a
libv3test_a_SOURCES = testsuite_hooks.cc libv3test_a_SOURCES = testsuite_hooks.cc
## Build support utilities.
noinst_PROGRAMS = abi_check
abi_check_SOURCES = abi_check.cc
libstdc++-v3/testsuite/Makefile.in
...@@ -111,6 +111,7 @@ USE_NLS = @USE_NLS@ ...@@ -111,6 +111,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
baseline_file = @baseline_file@
check_msgfmt = @check_msgfmt@ check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
...@@ -148,16 +149,23 @@ RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \ ...@@ -148,16 +149,23 @@ RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
AM_RUNTESTFLAGS = AM_RUNTESTFLAGS =
RUNTESTFLAGS = RUNTESTFLAGS =
CXX = @glibcpp_CXX@ CXX_fake = @glibcpp_CXX@
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES CXX = `echo $(CXX_fake) | sed 's/xgcc/g++/g'`
CXXLINK = \
$(LIBTOOL) --tag=CXX --mode=link $(CXX) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
INCLUDES = \ INCLUDES = \
-nostdinc++ \ -nostdinc++ \
@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ @GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
noinst_LIBRARIES = libv3test.a noinst_LIBRARIES = libv3test.a
libv3test_a_SOURCES = testsuite_hooks.cc libv3test_a_SOURCES = testsuite_hooks.cc
noinst_PROGRAMS = abi_check
abi_check_SOURCES = abi_check.cc
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
...@@ -170,11 +178,17 @@ LDFLAGS = @LDFLAGS@ ...@@ -170,11 +178,17 @@ 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)
PROGRAMS = $(noinst_PROGRAMS)
abi_check_OBJECTS = abi_check.$(OBJEXT)
abi_check_LDADD = $(LDADD)
abi_check_DEPENDENCIES =
abi_check_LDFLAGS =
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX) CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
DIST_COMMON = README Makefile.am Makefile.in DIST_COMMON = README Makefile.am Makefile.in
...@@ -182,8 +196,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ...@@ -182,8 +196,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = gtar
GZIP_ENV = --best GZIP_ENV = --best
SOURCES = $(libv3test_a_SOURCES) SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES)
OBJECTS = $(libv3test_a_OBJECTS) OBJECTS = $(libv3test_a_OBJECTS) $(abi_check_OBJECTS)
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
...@@ -253,6 +267,19 @@ libv3test.a: $(libv3test_a_OBJECTS) $(libv3test_a_DEPENDENCIES) ...@@ -253,6 +267,19 @@ libv3test.a: $(libv3test_a_OBJECTS) $(libv3test_a_DEPENDENCIES)
-rm -f libv3test.a -rm -f libv3test.a
$(AR) cru libv3test.a $(libv3test_a_OBJECTS) $(libv3test_a_LIBADD) $(AR) cru libv3test.a $(libv3test_a_OBJECTS) $(libv3test_a_LIBADD)
$(RANLIB) libv3test.a $(RANLIB) libv3test.a
mostlyclean-noinstPROGRAMS:
clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
distclean-noinstPROGRAMS:
maintainer-clean-noinstPROGRAMS:
abi_check$(EXEEXT): $(abi_check_OBJECTS) $(abi_check_DEPENDENCIES)
@rm -f abi_check$(EXEEXT)
$(CXXLINK) $(abi_check_LDFLAGS) $(abi_check_OBJECTS) $(abi_check_LDADD) $(LIBS)
.cc.o: .cc.o:
$(CXXCOMPILE) -c $< $(CXXCOMPILE) -c $<
.cc.obj: .cc.obj:
...@@ -360,7 +387,7 @@ install-am: all-am ...@@ -360,7 +387,7 @@ install-am: all-am
install: install-am install: install-am
uninstall-am: uninstall-am:
uninstall: uninstall-am uninstall: uninstall-am
all-am: Makefile $(LIBRARIES) all-am: Makefile $(LIBRARIES) $(PROGRAMS)
all-redirect: all-am all-redirect: all-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
...@@ -377,27 +404,28 @@ distclean-generic: ...@@ -377,27 +404,28 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
mostlyclean-libtool mostlyclean-tags \ mostlyclean-libtool mostlyclean-noinstPROGRAMS \
mostlyclean-generic mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-am mostlyclean: mostlyclean-am
clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ clean-am: clean-noinstLIBRARIES clean-compile clean-libtool \
clean-generic mostlyclean-am clean-noinstPROGRAMS clean-tags clean-generic \
mostlyclean-am
clean: clean-am clean: clean-am
distclean-am: distclean-noinstLIBRARIES distclean-compile \ distclean-am: distclean-noinstLIBRARIES distclean-compile \
distclean-libtool distclean-tags distclean-generic \ distclean-libtool distclean-noinstPROGRAMS \
clean-am distclean-tags distclean-generic clean-am
-rm -f libtool -rm -f libtool
distclean: distclean-am distclean: distclean-am
maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-tags maintainer-clean-generic \ maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
distclean-am maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
...@@ -407,14 +435,15 @@ maintainer-clean: maintainer-clean-am ...@@ -407,14 +435,15 @@ maintainer-clean: maintainer-clean-am
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \ mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile mostlyclean-libtool distclean-libtool \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ clean-libtool maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
distclean-tags clean-tags maintainer-clean-tags distdir check-DEJAGNU \ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
info-am info dvi-am dvi check check-am installcheck-am installcheck \ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \
install-info-am install-info install-exec-am install-exec \ clean-tags maintainer-clean-tags distdir check-DEJAGNU info-am info \
install-data-am install-data install-am install uninstall-am uninstall \ dvi-am dvi check check-am installcheck-am installcheck install-info-am \
all-redirect all-am all installdirs mostlyclean-generic \ install-info install-exec-am install-exec install-data-am install-data \
distclean-generic clean-generic maintainer-clean-generic clean \ install-am install uninstall-am uninstall all-redirect all-am all \
mostlyclean distclean maintainer-clean installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
......
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