This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] 13296


Jim, is this what you had in mind?

tested x86/linux

2003-12-09  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/13296
	* acinclude.m4 (GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS): Remove.
	* aclocal.m4: Regenerate.
	* configure.ac: Remove call to GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS.
	* conigure: Regenerate.
	* src/Makefile.am (libstdc___la_LDFLAGS): Remove LIBUNWIND_FLAGS.
	* src/Makefile.in: Regenerate.
	* docs/html/17_intro/configury.html: Modify.

Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.277
diff -c -p -r1.277 acinclude.m4
*** acinclude.m4	21 Nov 2003 20:30:03 -0000	1.277
--- acinclude.m4	9 Dec 2003 21:10:56 -0000
*************** AC_DEFUN(GLIBCXX_ENABLE_HOSTED, [
*** 1348,1380 ****
  
  
  dnl
- dnl Check for libunwind exception handling support.  If enabled, then
- dnl we assume that the _Unwind_* functions that make up the Unwind ABI
- dnl (_Unwind_RaiseException, _Unwind_Resume, etc.) are defined by
- dnl libunwind instead of libgcc, and that libstdc++ has a dependency
- dnl on libunwind as well as libgcc.
- dnl
- dnl --enable-libunwind-exceptions forces the use of libunwind.
- dnl --disable-libunwind-exceptions assumes there is no libunwind.
- dnl
- dnl Substs:
- dnl  LIBUNWIND_FLAG
- dnl
- AC_DEFUN(GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS, [
-   AC_MSG_CHECKING([for use of libunwind])
-   GLIBCXX_ENABLE(libunwind-exceptions,no,,
-     [force use of libunwind for exceptions])
-   AC_MSG_RESULT($use_libunwind_exceptions)
-   if test $enable_libunwind_exceptions = yes; then
-     LIBUNWIND_FLAG="-lunwind"
-   else
-     LIBUNWIND_FLAG=""
-   fi
-   AC_SUBST(LIBUNWIND_FLAG)
- ])
- 
- 
- dnl
  dnl Check for template specializations for the 'long long' type extension.
  dnl The result determines only whether 'long long' I/O is enabled; things
  dnl like numeric_limits<> specializations are always available.
--- 1348,1353 ----
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.ac,v
retrieving revision 1.11
diff -c -p -r1.11 configure.ac
*** configure.ac	22 Oct 2003 15:51:43 -0000	1.11
--- configure.ac	9 Dec 2003 21:10:56 -0000
*************** GLIBCXX_ENABLE_HOSTED
*** 77,83 ****
  
  # Check for support bits and g++ features that don't require linking.
  GLIBCXX_ENABLE_SJLJ_EXCEPTIONS
- GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS
  GLIBCXX_ENABLE_PCH($is_hosted)
  
  # Enable all the variable C++ runtime options.  
--- 77,82 ----
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.137
diff -c -p -r1.137 Makefile.am
*** src/Makefile.am	11 Nov 2003 20:09:11 -0000	1.137
--- src/Makefile.am	9 Dec 2003 21:10:56 -0000
*************** libstdc___la_LIBADD = \
*** 141,148 ****
  libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD)
  
  libstdc___la_LDFLAGS = \
! 	-version-info $(libtool_VERSION) ${version_arg} \
! 	-lm $(LIBUNWIND_FLAG)
  
  
  # Use special rules for the deprecated source files so that they find
--- 141,147 ----
  libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD)
  
  libstdc___la_LDFLAGS = \
! 	-version-info $(libtool_VERSION) ${version_arg} -lm 
  
  
  # Use special rules for the deprecated source files so that they find
Index: docs/html/17_intro/configury.html
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/docs/html/17_intro/configury.html,v
retrieving revision 1.3
diff -c -p -r1.3 configury.html
*** docs/html/17_intro/configury.html	18 Nov 2003 20:56:07 -0000	1.3
--- docs/html/17_intro/configury.html	9 Dec 2003 21:10:56 -0000
*************** Last Question</a>, by Isaac Asimov
*** 165,171 ****
      GLIBCXX_ENABLE_C_MBCHAR
      GLIBCXX_ENABLE_DEBUG
      GLIBCXX_ENABLE_DEBUG_FLAGS
-     GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS
      GLIBCXX_ENABLE_LONG_LONG
      GLIBCXX_ENABLE_PCH
      GLIBCXX_ENABLE_SJLJ_EXCEPTIONS
--- 165,170 ----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]