Commit 93997404 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

scrub patch

parent e7460e04

toolchain/gcc/4.1.1/200-uclibc-locale.patch

+44 −66
Original line number Diff line number Diff line 
diff -urN gcc-4.1.0-dist/libstdc++-v3/acinclude.m4 gcc-4.1.0/libstdc++-v3/acinclude.m4

--- gcc-4.1.0-dist/libstdc++-v3/acinclude.m4	2006-03-26 12:08:28.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/acinclude.m4	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/acinclude.m4

+++ gcc-4.1.0/libstdc++-v3/acinclude.m4

@@ -1071,7 +1071,7 @@

   AC_MSG_CHECKING([for C locale to use])

   GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
@@ -61,9 +60,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/acinclude.m4 gcc-4.1.0/libstdc++-v3/acincl 
   esac

 

   # This is where the testsuite looks for locale catalogs, using the

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h

@@ -0,0 +1,63 @@

+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-

+
@@ -128,9 +126,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 
+#endif 

+

+#endif // GLIBC 2.3 and later

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c_locale.cc

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c_locale.cc	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c_locale.cc

@@ -0,0 +1,152 @@

+// Wrapper for underlying C-language localization -*- C++ -*-

+
@@ -284,9 +281,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.1.0 
+{

+  const char* const* const locale::_S_categories = __gnu_cxx::category_names;

+}  // namespace std

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c_locale.h

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c_locale.h	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c_locale.h	2006-03-26 13:03:42.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c_locale.h

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/c_locale.h

@@ -0,0 +1,117 @@

+// Wrapper for underlying C-language localization -*- C++ -*-

+
@@ -405,9 +401,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.1.0/ 
+}

+

+#endif

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-4.1.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc

@@ -0,0 +1,306 @@

+// std::codecvt implementation details, GNU version -*- C++ -*-

+
@@ -715,9 +710,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gc 
+  }

+#endif

+}

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.1.0/libstdc++-v3/config/locale/uclibc/collate_members.cc

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/collate_members.cc	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/collate_members.cc

@@ -0,0 +1,80 @@

+// std::collate implementation details, GNU version -*- C++ -*-

+
@@ -799,9 +793,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc gc 
+    { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }

+#endif

+}

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.1.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc

@@ -0,0 +1,314 @@

+// std::ctype implementation details, GNU version -*- C++ -*-

+
@@ -1117,9 +1110,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc- 
+  }

+#endif //  _GLIBCXX_USE_WCHAR_T

+}

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.1.0/libstdc++-v3/config/locale/uclibc/messages_members.cc

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/messages_members.cc	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/messages_members.cc

@@ -0,0 +1,100 @@

+// std::messages implementation details, GNU version -*- C++ -*-

+
@@ -1221,9 +1213,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc g 
+    }

+#endif

+}

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.1.0/libstdc++-v3/config/locale/uclibc/messages_members.h

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/messages_members.h	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/messages_members.h

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/messages_members.h

@@ -0,0 +1,121 @@

+// std::messages implementation details, GNU version -*- C++ -*-

+
@@ -1346,9 +1337,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/messages_members.h gc 
+	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 

+	 }

+     }

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.1.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc

@@ -0,0 +1,692 @@

+// std::moneypunct implementation details, GNU version -*- C++ -*-

+
@@ -2042,9 +2032,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc g 
+    }

+#endif

+}

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.1.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc

@@ -0,0 +1,173 @@

+// std::numpunct implementation details, GNU version -*- C++ -*-

+
@@ -2219,9 +2208,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc gc 
+    { delete _M_data; }

+ #endif

+}

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.1.0/libstdc++-v3/config/locale/uclibc/time_members.cc

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/time_members.cc	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/time_members.cc	2006-03-25 22:18:37.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/time_members.cc

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/time_members.cc

@@ -0,0 +1,406 @@

+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-

+
@@ -2629,9 +2617,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4 
+    }

+#endif

+}

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.1.0/libstdc++-v3/config/locale/uclibc/time_members.h

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/time_members.h	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/time_members.h	2005-10-21 02:34:06.000000000 -0600

--- gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/time_members.h

+++ gcc-4.1.0/libstdc++-v3/config/locale/uclibc/time_members.h

@@ -0,0 +1,76 @@

+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-

+
@@ -2709,9 +2696,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4. 
+      delete _M_data; 

+      _S_destroy_c_locale(_M_c_locale_timepunct); 

+    }

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_base.h

--- gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_base.h	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_base.h	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_base.h

+++ gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_base.h

@@ -0,0 +1,64 @@

+// Locale support -*- C++ -*-

+
@@ -2777,9 +2763,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-4.1.0/li 
+    static const mask punct 	= _ISpunct;

+    static const mask alnum 	= _ISalpha | _ISdigit;

+  };

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_inline.h

--- gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_inline.h	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h

+++ gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_inline.h

@@ -0,0 +1,69 @@

+// Locale support -*- C++ -*-

+
@@ -2850,9 +2835,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-4.1.0/ 
+      ++__low;

+    return __low;

+  }

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_noninline.h

--- gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_noninline.h	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h

+++ gcc-4.1.0/libstdc++-v3/config/os/uclibc/ctype_noninline.h

@@ -0,0 +1,92 @@

+// Locale support -*- C++ -*-

+
@@ -2946,9 +2930,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-4.1 
+      }

+    return __high;

+  }

diff -urN gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/os_defines.h gcc-4.1.0/libstdc++-v3/config/os/uclibc/os_defines.h

--- gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/os_defines.h	1969-12-31 17:00:00.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/config/os/uclibc/os_defines.h	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/os_defines.h

+++ gcc-4.1.0/libstdc++-v3/config/os/uclibc/os_defines.h

@@ -0,0 +1,44 @@

+// Specific definitions for GNU/Linux  -*- C++ -*-

+
@@ -2994,9 +2977,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/config/os/uclibc/os_defines.h gcc-4.1.0/li 
+#define __NO_STRING_INLINES

+

+#endif

diff -urN gcc-4.1.0-dist/libstdc++-v3/configure gcc-4.1.0/libstdc++-v3/configure

--- gcc-4.1.0-dist/libstdc++-v3/configure	2006-03-26 12:08:28.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/configure	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/configure

+++ gcc-4.1.0/libstdc++-v3/configure

@@ -4005,6 +4005,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;
@@ -3105,9 +3087,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/configure gcc-4.1.0/libstdc++-v3/configure 
   esac

 

   # This is where the testsuite looks for locale catalogs, using the

diff -urN gcc-4.1.0-dist/libstdc++-v3/configure.host gcc-4.1.0/libstdc++-v3/configure.host

--- gcc-4.1.0-dist/libstdc++-v3/configure.host	2006-03-26 12:08:28.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/configure.host	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/configure.host

+++ gcc-4.1.0/libstdc++-v3/configure.host

@@ -261,6 +261,12 @@

     ;;

 esac
@@ -3121,9 +3102,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/configure.host gcc-4.1.0/libstdc++-v3/conf 
 

 # Set any OS-dependent and CPU-dependent bits.

 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.

diff -urN gcc-4.1.0-dist/libstdc++-v3/crossconfig.m4 gcc-4.1.0/libstdc++-v3/crossconfig.m4

--- gcc-4.1.0-dist/libstdc++-v3/crossconfig.m4	2006-03-26 12:08:28.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/crossconfig.m4	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/crossconfig.m4

+++ gcc-4.1.0/libstdc++-v3/crossconfig.m4

@@ -143,6 +143,99 @@

 	;;

     esac
@@ -3233,9 +3213,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/crossconfig.m4 gcc-4.1.0/libstdc++-v3/cros 
         ;;

       *)

         AC_DEFINE(_GLIBCXX_USE_LFS)

diff -urN gcc-4.1.0-dist/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.1.0/libstdc++-v3/include/c_compatibility/wchar.h

--- gcc-4.1.0-dist/libstdc++-v3/include/c_compatibility/wchar.h	2006-03-26 12:08:28.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/include/c_compatibility/wchar.h	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/include/c_compatibility/wchar.h

+++ gcc-4.1.0/libstdc++-v3/include/c_compatibility/wchar.h

@@ -101,7 +101,9 @@

 using std::wmemcpy;

 using std::wmemmove;
@@ -3246,9 +3225,8 @@ diff -urN gcc-4.1.0-dist/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.1.0/ 
 

 #if _GLIBCXX_USE_C99

 using std::wcstold;

diff -urN gcc-4.1.0-dist/libstdc++-v3/include/c_std/std_cwchar.h gcc-4.1.0/libstdc++-v3/include/c_std/std_cwchar.h

--- gcc-4.1.0-dist/libstdc++-v3/include/c_std/std_cwchar.h	2006-03-26 12:08:28.000000000 -0700

+++ gcc-4.1.0/libstdc++-v3/include/c_std/std_cwchar.h	2006-03-25 22:06:30.000000000 -0700

--- gcc-4.1.0-dist/libstdc++-v3/include/c_std/std_cwchar.h

+++ gcc-4.1.0/libstdc++-v3/include/c_std/std_cwchar.h

@@ -180,7 +180,9 @@

   using ::wcscoll;

   using ::wcscpy;