Patchwork [v3] libsupc++ bad_array_* build fixes

login
register
mail settings
Submitter Benjamin Kosnik
Date May 13, 2013, 9:55 p.m.
Message ID <20130513145555.0ef1a2bf@oakwood>
Download mbox | patch
Permalink /patch/243543/
State New
Headers show

Comments

Benjamin Kosnik - May 13, 2013, 9:55 p.m.
Some cleanup, no Makefile.am was checked in on the bad_array_*
additions. The exports make the intent very clear, so this just fills
in the blanks.

tested x86/linux

-benjamin

Patch

2013-05-13  Benjamin Kosnik  <bkoz@redhat.com>

	    * libsupc++/Makefile.am (sources): Add bad_array_length.cc,
	    bad_array_new.cc.
	    * libsupc++/Makefile.in: Regenerate.
	    * libsupc++/bad_array_length.cc: Tweak.
	    * libsupc++/bad_array_new.cc: Tweak.

diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index 25c58fb..b4e86f5 100644
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -48,6 +48,8 @@  sources = \
 	atexit_arm.cc \
 	atexit_thread.cc \
 	bad_alloc.cc \
+	bad_array_length.cc \
+	bad_array_new.cc \
 	bad_cast.cc \
 	bad_typeid.cc \
 	class_type_info.cc \
@@ -107,6 +109,21 @@  cp-demangle.o: cp-demangle.c
 
 
 # Use special rules for the C++11 sources so that the proper flags are passed.
+bad_array_length.lo: bad_array_length.cc
+	$(LTCXXCOMPILE) -std=gnu++11 -c $<
+bad_array_length.o: bad_array_length.cc
+	$(CXXCOMPILE) -std=gnu++11 -c $<
+
+bad_array_new.lo: bad_array_new.cc
+	$(LTCXXCOMPILE) -std=gnu++11 -c $<
+bad_array_new.o: bad_array_new.cc
+	$(CXXCOMPILE) -std=gnu++11 -c $<
+
+eh_aux_runtime.lo: eh_aux_runtime.cc
+	$(LTCXXCOMPILE) -std=gnu++11 -c $<
+eh_aux_runtime.o: eh_aux_runtime.cc
+	$(CXXCOMPILE) -std=gnu++11 -c $<
+
 eh_ptr.lo: eh_ptr.cc
 	$(LTCXXCOMPILE) -std=gnu++11 -c $<
 eh_ptr.o: eh_ptr.cc
diff --git a/libstdc++-v3/libsupc++/bad_array_length.cc b/libstdc++-v3/libsupc++/bad_array_length.cc
index a63d660..76afd30 100644
--- a/libstdc++-v3/libsupc++/bad_array_length.cc
+++ b/libstdc++-v3/libsupc++/bad_array_length.cc
@@ -23,14 +23,13 @@ 
 
 #include <new>
 
-namespace std {
+namespace std 
+{
 
 bad_array_length::~bad_array_length() _GLIBCXX_USE_NOEXCEPT { }
 
 const char*
 bad_array_length::what() const _GLIBCXX_USE_NOEXCEPT
-{
-  return "std::bad_array_length";
-}
+{ return "std::bad_array_length"; }
 
 } // namespace std
diff --git a/libstdc++-v3/libsupc++/bad_array_new.cc b/libstdc++-v3/libsupc++/bad_array_new.cc
index 5282f52..224e4f7 100644
--- a/libstdc++-v3/libsupc++/bad_array_new.cc
+++ b/libstdc++-v3/libsupc++/bad_array_new.cc
@@ -23,14 +23,13 @@ 
 
 #include <new>
 
-namespace std {
+namespace std 
+{
 
 bad_array_new_length::~bad_array_new_length() _GLIBCXX_USE_NOEXCEPT { }
 
 const char*
 bad_array_new_length::what() const _GLIBCXX_USE_NOEXCEPT
-{
-  return "std::bad_array_new_length";
-}
+{ return "std::bad_array_new_length"; }
 
 } // namespace std