30a333ceeb
2008-08-23 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/lib/libstdc++.exp (check_v3_target_atomic_builtins): Add.
* testsuite/lib/dg-options.exp (dg-require-atomic-builtins): Likewise.
* testsuite/18_support/exception_ptr/current_exception.cc: Use it.
* testsuite/18_support/exception_ptr/rethrow_exception.cc: Likewise.
* testsuite/18_support/exception_ptr/lifespan.cc: Likewise.
2008-08-23 Sebastian Redl <sebastian.redl@getdesigned.at>
Add (again) exception propagation support as per N2179. Feature is
available only when _GLIBCXX_ATOMIC_BUILTINS_4 is defined.
* libsupc++/exception_ptr.h (exception_ptr, current_exception,
copy_exception, rethrow_exception): New file, implement exception
propagation.
* libsupc++/eh_ptr.cc (exception_ptr, current_exception,
rethrow_exception, __gxx_dependent_exception_cleanup): Likewise.
* libsupc++/unwind-cxx.h (__cxa_exception): Add reference count.
(__cxa_dependent_exception, __cxa_allocate_dependent_exception,
__cxa_free_dependent_exception, __get_dependent_exception_from_ue,
__GXX_INIT_DEPENDENT_EXCEPTION_CLASS, __is_dependent_exception,
__gxx_dependent_exception_class, __get_object_from_ue,
__get_object_from_ambiguous_exception): Add.
(__GXX_INIT_EXCEPTION_CLASS, __gxx_exception_class): Rename.
(__is_gxx_exception_class): Handle dependent exceptions.
* libsupc++/eh_arm.cc (__cxa_type_match): Likewise.
* libsupc++/eh_call.cc (__cxa_call_unexpected): Likewise.
* libsupc++/eh_personality.cc (__gxx_personality_*): Likewise.
* libsupc++/eh_type.cc (__cxa_current_exception_type): Likewise.
* libsupc++/eh_alloc.cc (__cxa_allocate_dependent_exception,
__cxa_free_dependent_exception): Add.
* libsupc++/eh_throw.cc (__gxx_exception_cleanup): Handle reference
counting.
* libsupc++/exception: Conditionally include exception_ptr.h.
* libsupc++/Makefile.am: Register new files.
* libsupc++/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Add new symbols.
* testsuite/18_support/exception_ptr/current_exception.cc: Test the
core functionality of current_exception().
* testsuite/18_support/exception_ptr/rethrow_exception.cc: Test the
core functionality of rethrow_exception().
* testsuite/18_support/exception_ptr/lifespan.cc: Test the life span of
exception objects during exception propagation.
From-SVN: r139509
188 lines
6.1 KiB
Makefile
188 lines
6.1 KiB
Makefile
## Makefile for the GNU C++ Support library.
|
|
##
|
|
## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
|
## Free Software Foundation, Inc.
|
|
##
|
|
## Process this file with automake to produce Makefile.in.
|
|
##
|
|
## This file is part of GCC.
|
|
##
|
|
## GCC is free software; you can redistribute it and/or modify
|
|
## it under the terms of the GNU General Public License as published by
|
|
## the Free Software Foundation; either version 2, or (at your option)
|
|
## any later version.
|
|
##
|
|
## GCC is distributed in the hope that it will be useful,
|
|
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
## GNU General Public License for more details.
|
|
##
|
|
## You should have received a copy of the GNU General Public License
|
|
## along with GCC; see the file COPYING. If not, write to
|
|
## the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
## Boston, MA 02110-1301, USA.
|
|
|
|
include $(top_srcdir)/fragment.am
|
|
|
|
# Need this library to both be part of libstdc++.a, and installed
|
|
# separately too.
|
|
# 1) separate libsupc++.la
|
|
toolexeclib_LTLIBRARIES = libsupc++.la
|
|
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
|
|
noinst_LTLIBRARIES = libsupc++convenience.la
|
|
|
|
|
|
headers = \
|
|
exception new typeinfo cxxabi.h cxxabi-forced.h exception_defines.h \
|
|
initializer_list exception_ptr.h
|
|
|
|
if GLIBCXX_HOSTED
|
|
c_sources = \
|
|
cp-demangle.c
|
|
endif
|
|
|
|
sources = \
|
|
array_type_info.cc \
|
|
atexit_arm.cc \
|
|
bad_cast.cc \
|
|
bad_typeid.cc \
|
|
class_type_info.cc \
|
|
del_op.cc \
|
|
del_opnt.cc \
|
|
del_opv.cc \
|
|
del_opvnt.cc \
|
|
dyncast.cc \
|
|
eh_alloc.cc \
|
|
eh_arm.cc \
|
|
eh_aux_runtime.cc \
|
|
eh_call.cc \
|
|
eh_catch.cc \
|
|
eh_exception.cc \
|
|
eh_globals.cc \
|
|
eh_personality.cc \
|
|
eh_ptr.cc \
|
|
eh_term_handler.cc \
|
|
eh_terminate.cc \
|
|
eh_throw.cc \
|
|
eh_type.cc \
|
|
eh_unex_handler.cc \
|
|
enum_type_info.cc \
|
|
function_type_info.cc \
|
|
fundamental_type_info.cc \
|
|
guard.cc \
|
|
new_handler.cc \
|
|
new_op.cc \
|
|
new_opnt.cc \
|
|
new_opv.cc \
|
|
new_opvnt.cc \
|
|
pbase_type_info.cc \
|
|
pmem_type_info.cc \
|
|
pointer_type_info.cc \
|
|
pure.cc \
|
|
si_class_type_info.cc \
|
|
tinfo.cc \
|
|
tinfo2.cc \
|
|
vec.cc \
|
|
vmi_class_type_info.cc \
|
|
vterminate.cc
|
|
|
|
libsupc___la_SOURCES = $(sources) $(c_sources)
|
|
libsupc__convenience_la_SOURCES = $(sources) $(c_sources)
|
|
|
|
glibcxxinstalldir = $(gxx_include_dir)
|
|
glibcxxinstall_HEADERS = $(headers)
|
|
|
|
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
|
|
# modified in a per-library or per-sub-library way. Need to manually
|
|
# set this option because CONFIG_CXXFLAGS has to be after
|
|
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
|
|
# as the occasion call for it.
|
|
AM_CXXFLAGS = \
|
|
-fno-implicit-templates \
|
|
$(LIBSUPCXX_PICFLAGS) \
|
|
$(WARN_CXXFLAGS) \
|
|
$(OPTIMIZE_CXXFLAGS) \
|
|
$(CONFIG_CXXFLAGS)
|
|
|
|
AM_MAKEFLAGS = \
|
|
"gxx_include_dir=$(gxx_include_dir)"
|
|
|
|
|
|
# Use special rules for pulling things out of libiberty. These
|
|
# objects should be compiled with the "C" compiler, not the C++
|
|
# compiler, and also should not use the C++ includes.
|
|
C_INCLUDES = -I.. -I$(toplevel_srcdir)/libiberty -I$(toplevel_srcdir)/include
|
|
C_COMPILE = \
|
|
$(CC) $(DEFS) $(C_INCLUDES) \
|
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
|
|
# LTCOMPILE is copied from LTCXXCOMPILE below.
|
|
LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \
|
|
$(DEFS) $(C_INCLUDES) $(LIBSUPCXX_PICFLAGS) \
|
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
|
|
cp-demangle.c:
|
|
rm -f $@
|
|
$(LN_S) $(toplevel_srcdir)/libiberty/cp-demangle.c $@
|
|
cp-demangle.lo: cp-demangle.c
|
|
$(LTCOMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
|
|
cp-demangle.o: cp-demangle.c
|
|
$(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
|
|
|
|
|
|
# libstdc++ libtool notes
|
|
|
|
# 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
|
|
# last. (That way, things like -O2 passed down from the toplevel can
|
|
# be overridden by --enable-debug.)
|
|
|
|
# 2) In general, libtool expects an argument such as `--tag=CXX' when
|
|
# using the C++ compiler, because that will enable the settings
|
|
# detected when C++ support was being configured. However, when no
|
|
# such flag is given in the command line, libtool attempts to figure
|
|
# it out by matching the compiler name in each configuration section
|
|
# against a prefix of the command line. The problem is that, if the
|
|
# compiler name and its initial flags stored in the libtool
|
|
# configuration file don't match those in the command line, libtool
|
|
# can't decide which configuration to use, and it gives up. The
|
|
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
|
|
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
|
|
# attempt to infer which configuration to use.
|
|
#
|
|
# We have to put --tag disable-shared after --tag CXX lest things
|
|
# CXX undo the affect of disable-shared.
|
|
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
|
|
--mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
|
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
|
|
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
|
|
|
|
# 3) We'd have a problem when building the shared libstdc++ object if
|
|
# the rules automake generates would be used. We cannot allow g++ to
|
|
# be used since this would add -lstdc++ to the link line which of
|
|
# course is problematic at this point. So, we get the top-level
|
|
# directory to configure libstdc++-v3 to use gcc as the C++
|
|
# compilation driver.
|
|
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
|
|
--mode=link $(CXX) \
|
|
$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
|
|
|
|
# We have to have rules modified from the default to counteract SUN make
|
|
# prepending each of $(glibcxxinstall_HEADERS) with VPATH below.
|
|
install-glibcxxinstallHEADERS: $(glibcxxinstall_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
$(mkinstalldirs) $(DESTDIR)$(glibcxxinstalldir)
|
|
@list='$(glibcxxinstall_HEADERS)'; for p in $$list; do \
|
|
q=`echo $$p | sed -e 's,.*/,,'`; \
|
|
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
|
|
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcxxinstalldir)/$$q"; \
|
|
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcxxinstalldir)/$$q; \
|
|
done
|
|
|
|
uninstall-glibcxxinstallHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
list='$(glibcxxinstall_HEADERS)'; for p in $$list; do \
|
|
q=`echo $$p | sed -e 's,.*/,,'`; \
|
|
rm -f $(DESTDIR)$(glibcxxinstalldir)/$$q; \
|
|
done
|