diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.am | 17 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 34 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/bad_array_length.cc | 7 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/bad_array_new.cc | 7 |
5 files changed, 47 insertions, 26 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9d46e12066c..dc7d410e7bd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +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. + 2013-05-10 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/54577 diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 25c58fb8b0d..b4e86f53144 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++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 6ff4d0ce886..0f2c1ee2637 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -93,18 +93,17 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) libsupc___la_LIBADD = am__objects_1 = array_type_info.lo atexit_arm.lo atexit_thread.lo \ bad_alloc.lo bad_array_length.lo bad_array_new.lo bad_cast.lo \ - bad_typeid.lo class_type_info.lo \ - del_op.lo del_opnt.lo del_opv.lo del_opvnt.lo dyncast.lo \ - eh_alloc.lo eh_arm.lo eh_aux_runtime.lo eh_call.lo eh_catch.lo \ - eh_exception.lo eh_globals.lo eh_personality.lo eh_ptr.lo \ - eh_term_handler.lo eh_terminate.lo eh_tm.lo eh_throw.lo \ - eh_type.lo eh_unex_handler.lo enum_type_info.lo \ - function_type_info.lo fundamental_type_info.lo guard.lo \ - guard_error.lo hash_bytes.lo nested_exception.lo \ - new_handler.lo new_op.lo new_opnt.lo new_opv.lo new_opvnt.lo \ - pbase_type_info.lo pmem_type_info.lo pointer_type_info.lo \ - pure.lo si_class_type_info.lo tinfo.lo tinfo2.lo vec.lo \ - vmi_class_type_info.lo vterminate.lo + bad_typeid.lo class_type_info.lo del_op.lo del_opnt.lo \ + del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo eh_arm.lo \ + eh_aux_runtime.lo eh_call.lo eh_catch.lo eh_exception.lo \ + eh_globals.lo eh_personality.lo eh_ptr.lo eh_term_handler.lo \ + eh_terminate.lo eh_tm.lo eh_throw.lo eh_type.lo \ + eh_unex_handler.lo enum_type_info.lo function_type_info.lo \ + fundamental_type_info.lo guard.lo guard_error.lo hash_bytes.lo \ + nested_exception.lo new_handler.lo new_op.lo new_opnt.lo \ + new_opv.lo new_opvnt.lo pbase_type_info.lo pmem_type_info.lo \ + pointer_type_info.lo pure.lo si_class_type_info.lo tinfo.lo \ + tinfo2.lo vec.lo vmi_class_type_info.lo vterminate.lo @GLIBCXX_HOSTED_TRUE@am__objects_2 = cp-demangle.lo am_libsupc___la_OBJECTS = $(am__objects_1) $(am__objects_2) libsupc___la_OBJECTS = $(am_libsupc___la_OBJECTS) @@ -790,12 +789,11 @@ cp-demangle.lo: cp-demangle.c cp-demangle.o: cp-demangle.c $(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $< -# Use special rules for the C++11 and C++1y sources so that the proper -# flags are passed. +# 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++1y -c $< + $(LTCXXCOMPILE) -std=gnu++11 -c $< bad_array_length.o: bad_array_length.cc - $(CXXCOMPILE) -std=gnu++1y -c $< + $(CXXCOMPILE) -std=gnu++11 -c $< bad_array_new.lo: bad_array_new.cc $(LTCXXCOMPILE) -std=gnu++11 -c $< @@ -803,9 +801,9 @@ bad_array_new.o: bad_array_new.cc $(CXXCOMPILE) -std=gnu++11 -c $< eh_aux_runtime.lo: eh_aux_runtime.cc - $(LTCXXCOMPILE) -std=gnu++1y -c $< + $(LTCXXCOMPILE) -std=gnu++11 -c $< eh_aux_runtime.o: eh_aux_runtime.cc - $(CXXCOMPILE) -std=gnu++1y -c $< + $(CXXCOMPILE) -std=gnu++11 -c $< eh_ptr.lo: eh_ptr.cc $(LTCXXCOMPILE) -std=gnu++11 -c $< diff --git a/libstdc++-v3/libsupc++/bad_array_length.cc b/libstdc++-v3/libsupc++/bad_array_length.cc index a63d660f20b..76afd30a797 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 5282f525abf..224e4f78d67 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 |
