[llvm-commits] CVS: gcc-3.4/libstdc++-v3/libsupc++/Makefile.in eh_term_handler.cc

[John Criswell]

Changes in directory gcc-3.4/libstdc++-v3/libsupc++:

Makefile.in updated: 1.2 -> 1.3
eh_term_handler.cc updated: 1.2 -> 1.3

---
Log message:

Commit of merge from September 24, 2003 of mainline GCC.  This merge now
works reasonably on Linux/x86 and probably works on Solaris/Sparc.



---
Diffs of the changes:  (+12 -12)

Index: gcc-3.4/libstdc++-v3/libsupc++/Makefile.in
diff -u gcc-3.4/libstdc++-v3/libsupc++/Makefile.in:1.2 gcc-3.4/libstdc++-v3/libsupc++/Makefile.in:1.3
--- gcc-3.4/libstdc++-v3/libsupc++/Makefile.in:1.2	Fri Jan  9 10:54:35 2004
+++ gcc-3.4/libstdc++-v3/libsupc++/Makefile.in	Thu Feb  5 10:05:49 2004
@@ -221,13 +221,13 @@
 
 # Need this library to both be part of libstdc++.a, and installed
 # separately too.
-# 1) separate libsupc++.la 
+# 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 exception_defines.h 
+	exception new typeinfo cxxabi.h exception_defines.h
 
 
 sources = \
@@ -259,8 +259,8 @@
 	vterminate.cc
 
 
-libsupc___la_SOURCES = $(sources) 
-libsupc__convenience_la_SOURCES = $(sources) 
+libsupc___la_SOURCES = $(sources)
+libsupc__convenience_la_SOURCES = $(sources)
 
 glibcxxinstalldir = $(gxx_include_dir)
 glibcxxinstall_HEADERS = $(headers)
@@ -269,13 +269,13 @@
 # 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. 
+# as the occasion call for it.
 AM_CXXFLAGS = \
 	-fno-implicit-templates \
 	$(LIBSUPCXX_PICFLAGS) \
 	$(WARN_CXXFLAGS) \
 	$(OPTIMIZE_CXXFLAGS) \
-	$(CONFIG_CXXFLAGS) 
+	$(CONFIG_CXXFLAGS)
 
 
 AM_MAKEFLAGS = \
@@ -304,8 +304,8 @@
 # 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) $(CXXFLAGS) $(AM_CXXFLAGS) 
+	       --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
+	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
 
 
 # 3) We'd have a problem when building the shared libstdc++ object if
@@ -315,8 +315,8 @@
 # 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) $(LDFLAGS) -o $@
+	  --mode=link $(CXX) \
+	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 subdir = libsupc++
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4


Index: gcc-3.4/libstdc++-v3/libsupc++/eh_term_handler.cc
diff -u gcc-3.4/libstdc++-v3/libsupc++/eh_term_handler.cc:1.2 gcc-3.4/libstdc++-v3/libsupc++/eh_term_handler.cc:1.3
--- gcc-3.4/libstdc++-v3/libsupc++/eh_term_handler.cc:1.2	Fri Jan  9 10:54:35 2004
+++ gcc-3.4/libstdc++-v3/libsupc++/eh_term_handler.cc	Thu Feb  5 10:05:49 2004
@@ -37,13 +37,13 @@
    to "std::abort", and rebuilding the library.  In a freestanding mode, we
    default to this latter approach.  */
 
-#if ! _GLIBCXX_HOSTED || defined(__llvm__)
+#if ! _GLIBCXX_HOSTED
 # include <cstdlib>
 #endif
 
 /* The current installed user handler.  */
 std::terminate_handler __cxxabiv1::__terminate_handler =
-#if _GLIBCXX_HOSTED && !defined(__llvm__)
+#if _GLIBCXX_HOSTED
 	__gnu_cxx::__verbose_terminate_handler;
 #else
 	std::abort;