mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-23 14:42:26 +00:00
Add gcc-4.2.4, with patches propagated from 4.2.3.
/trunk/config/cc/gcc.in | 5 5 0 0 +++++ 1 file changed, 5 insertions(+)
This commit is contained in:
Yann E. MORIN"
parent
709299f291
commit
907141d953
@ -78,6 +78,10 @@ config CC_V_4_2_3
|
|||||||
bool
|
bool
|
||||||
prompt "4.2.3"
|
prompt "4.2.3"
|
||||||
|
|
||||||
|
config CC_V_4_2_4
|
||||||
|
bool
|
||||||
|
prompt "4.2.4"
|
||||||
|
|
||||||
config CC_V_4_3_0
|
config CC_V_4_3_0
|
||||||
bool
|
bool
|
||||||
prompt "4.3.0 (EXPERIMENTAL)"
|
prompt "4.3.0 (EXPERIMENTAL)"
|
||||||
@ -112,6 +116,7 @@ config CC_VERSION
|
|||||||
default "4.2.1" if CC_V_4_2_1
|
default "4.2.1" if CC_V_4_2_1
|
||||||
default "4.2.2" if CC_V_4_2_2
|
default "4.2.2" if CC_V_4_2_2
|
||||||
default "4.2.3" if CC_V_4_2_3
|
default "4.2.3" if CC_V_4_2_3
|
||||||
|
default "4.2.4" if CC_V_4_2_4
|
||||||
default "4.3.0" if CC_V_4_3_0
|
default "4.3.0" if CC_V_4_3_0
|
||||||
default "4.3.1" if CC_V_4_3_1
|
default "4.3.1" if CC_V_4_3_1
|
||||||
# CT_INSERT_VERSION_STRING_ABOVE
|
# CT_INSERT_VERSION_STRING_ABOVE
|
||||||
|
|||||||
216
patches/gcc/4.2.4/100-uclibc-conf.patch
Normal file
216
patches/gcc/4.2.4/100-uclibc-conf.patch
Normal file
@ -0,0 +1,216 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/boehm-gc/configure gcc-4.2.1/boehm-gc/configure
|
||||||
|
--- gcc-4.2.1.orig/boehm-gc/configure 2007-07-19 16:33:56.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/boehm-gc/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -4323,7 +4323,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/contrib/regression/objs-gcc.sh gcc-4.2.1/contrib/regression/objs-gcc.sh
|
||||||
|
--- gcc-4.2.1.orig/contrib/regression/objs-gcc.sh 2005-08-15 02:41:31.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/contrib/regression/objs-gcc.sh 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -105,6 +105,10 @@
|
||||||
|
then
|
||||||
|
make all-gdb all-dejagnu all-ld || exit 1
|
||||||
|
make install-gdb install-dejagnu install-ld || exit 1
|
||||||
|
+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
|
||||||
|
+ then
|
||||||
|
+ make all-gdb all-dejagnu all-ld || exit 1
|
||||||
|
+ make install-gdb install-dejagnu install-ld || exit 1
|
||||||
|
elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
|
||||||
|
make bootstrap || exit 1
|
||||||
|
make install || exit 1
|
||||||
|
diff -durN gcc-4.2.1.orig/gcc/config/cris/linux.h gcc-4.2.1/gcc/config/cris/linux.h
|
||||||
|
--- gcc-4.2.1.orig/gcc/config/cris/linux.h 2006-02-18 12:12:51.000000000 +0100
|
||||||
|
+++ gcc-4.2.1/gcc/config/cris/linux.h 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -74,7 +74,11 @@
|
||||||
|
#define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
|
||||||
|
|
||||||
|
#undef CRIS_SUBTARGET_VERSION
|
||||||
|
-#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
|
||||||
|
+#if UCLIBC_DEFAULT
|
||||||
|
+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
|
||||||
|
+#else
|
||||||
|
+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libffi/configure gcc-4.2.1/libffi/configure
|
||||||
|
--- gcc-4.2.1.orig/libffi/configure 2007-07-19 16:33:56.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libffi/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -3460,7 +3460,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libgfortran/configure gcc-4.2.1/libgfortran/configure
|
||||||
|
--- gcc-4.2.1.orig/libgfortran/configure 2007-07-19 16:33:56.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libgfortran/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -3721,7 +3721,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libgomp/configure gcc-4.2.1/libgomp/configure
|
||||||
|
--- gcc-4.2.1.orig/libgomp/configure 2007-07-19 16:33:56.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libgomp/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -3893,7 +3893,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libjava/classpath/configure gcc-4.2.1/libjava/classpath/configure
|
||||||
|
--- gcc-4.2.1.orig/libjava/classpath/configure 2007-01-17 19:10:26.000000000 +0100
|
||||||
|
+++ gcc-4.2.1/libjava/classpath/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -5307,7 +5307,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libjava/classpath/ltconfig gcc-4.2.1/libjava/classpath/ltconfig
|
||||||
|
--- gcc-4.2.1.orig/libjava/classpath/ltconfig 2006-08-07 22:37:50.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libjava/classpath/ltconfig 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -603,7 +603,7 @@
|
||||||
|
|
||||||
|
# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
|
||||||
|
case $host_os in
|
||||||
|
-linux-gnu*) ;;
|
||||||
|
+linux-gnu*|linux-uclibc*) ;;
|
||||||
|
linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
|
||||||
|
esac
|
||||||
|
|
||||||
|
@@ -1251,7 +1251,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
version_type=linux
|
||||||
|
need_lib_prefix=no
|
||||||
|
need_version=no
|
||||||
|
diff -durN gcc-4.2.1.orig/libjava/configure gcc-4.2.1/libjava/configure
|
||||||
|
--- gcc-4.2.1.orig/libjava/configure 2007-07-19 16:33:56.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libjava/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -5424,7 +5424,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libmudflap/configure gcc-4.2.1/libmudflap/configure
|
||||||
|
--- gcc-4.2.1.orig/libmudflap/configure 2006-12-04 12:13:07.000000000 +0100
|
||||||
|
+++ gcc-4.2.1/libmudflap/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -5394,7 +5394,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libobjc/configure gcc-4.2.1/libobjc/configure
|
||||||
|
--- gcc-4.2.1.orig/libobjc/configure 2006-10-15 09:42:57.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libobjc/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -3314,7 +3314,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libssp/configure gcc-4.2.1/libssp/configure
|
||||||
|
--- gcc-4.2.1.orig/libssp/configure 2006-10-15 09:42:57.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libssp/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -4480,7 +4480,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/configure 2007-06-29 01:02:05.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -4283,7 +4283,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libtool.m4 gcc-4.2.1/libtool.m4
|
||||||
|
--- gcc-4.2.1.orig/libtool.m4 2005-07-16 04:30:53.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libtool.m4 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -739,7 +739,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/ltconfig gcc-4.2.1/ltconfig
|
||||||
|
--- gcc-4.2.1.orig/ltconfig 2007-02-14 18:08:35.000000000 +0100
|
||||||
|
+++ gcc-4.2.1/ltconfig 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -603,7 +603,7 @@
|
||||||
|
|
||||||
|
# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
|
||||||
|
case $host_os in
|
||||||
|
-linux-gnu*) ;;
|
||||||
|
+linux-gnu*|linux-uclibc*) ;;
|
||||||
|
linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
|
||||||
|
esac
|
||||||
|
|
||||||
|
@@ -1251,7 +1251,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
version_type=linux
|
||||||
|
need_lib_prefix=no
|
||||||
|
need_version=no
|
||||||
|
diff -durN gcc-4.2.1.orig/zlib/configure gcc-4.2.1/zlib/configure
|
||||||
|
--- gcc-4.2.1.orig/zlib/configure 2007-01-17 19:10:26.000000000 +0100
|
||||||
|
+++ gcc-4.2.1/zlib/configure 2007-08-03 20:29:22.000000000 +0200
|
||||||
|
@@ -3429,7 +3429,7 @@
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
12
patches/gcc/4.2.4/103-uclibc-conf-noupstream.patch
Normal file
12
patches/gcc/4.2.4/103-uclibc-conf-noupstream.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
|
||||||
|
--- gcc-4.2.1.orig/gcc/config.gcc 2007-02-03 06:25:20.000000000 +0100
|
||||||
|
+++ gcc-4.2.1/gcc/config.gcc 2007-08-03 20:29:52.000000000 +0200
|
||||||
|
@@ -1964,7 +1964,7 @@
|
||||||
|
;;
|
||||||
|
sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
|
||||||
|
sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
|
||||||
|
- sh-*-linux* | sh[346lbe]*-*-linux* | \
|
||||||
|
+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
|
||||||
|
sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
|
||||||
|
sh64-*-netbsd* | sh64l*-*-netbsd*)
|
||||||
|
tmake_file="${tmake_file} sh/t-sh sh/t-elf"
|
||||||
2806
patches/gcc/4.2.4/200-uclibc-locale.patch
Normal file
2806
patches/gcc/4.2.4/200-uclibc-locale.patch
Normal file
File diff suppressed because it is too large
Load Diff
223
patches/gcc/4.2.4/203-uclibc-locale-no__x.patch
Normal file
223
patches/gcc/4.2.4/203-uclibc-locale-no__x.patch
Normal file
@ -0,0 +1,223 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -39,20 +39,6 @@
|
||||||
|
#include <langinfo.h>
|
||||||
|
#include <bits/c++locale_internal.h>
|
||||||
|
|
||||||
|
-#ifndef __UCLIBC_HAS_XLOCALE__
|
||||||
|
-#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
|
||||||
|
-#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
|
||||||
|
-#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
|
||||||
|
-#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
|
||||||
|
-#define __strtof_l(S, E, L) strtof((S), (E))
|
||||||
|
-#define __strtod_l(S, E, L) strtod((S), (E))
|
||||||
|
-#define __strtold_l(S, E, L) strtold((S), (E))
|
||||||
|
-#warning should dummy __newlocale check for C|POSIX ?
|
||||||
|
-#define __newlocale(a, b, c) NULL
|
||||||
|
-#define __freelocale(a) ((void)0)
|
||||||
|
-#define __duplocale(a) __c_locale()
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
template<>
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -68,6 +68,7 @@
|
||||||
|
{
|
||||||
|
extern "C" __typeof(uselocale) __uselocale;
|
||||||
|
}
|
||||||
|
+#define __uselocale uselocale
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace std
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -60,4 +60,49 @@
|
||||||
|
extern "C" __typeof(wctype_l) __wctype_l;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+# define __nl_langinfo_l nl_langinfo_l
|
||||||
|
+# define __strcoll_l strcoll_l
|
||||||
|
+# define __strftime_l strftime_l
|
||||||
|
+# define __strtod_l strtod_l
|
||||||
|
+# define __strtof_l strtof_l
|
||||||
|
+# define __strtold_l strtold_l
|
||||||
|
+# define __strxfrm_l strxfrm_l
|
||||||
|
+# define __newlocale newlocale
|
||||||
|
+# define __freelocale freelocale
|
||||||
|
+# define __duplocale duplocale
|
||||||
|
+# define __uselocale uselocale
|
||||||
|
+
|
||||||
|
+# ifdef _GLIBCXX_USE_WCHAR_T
|
||||||
|
+# define __iswctype_l iswctype_l
|
||||||
|
+# define __towlower_l towlower_l
|
||||||
|
+# define __towupper_l towupper_l
|
||||||
|
+# define __wcscoll_l wcscoll_l
|
||||||
|
+# define __wcsftime_l wcsftime_l
|
||||||
|
+# define __wcsxfrm_l wcsxfrm_l
|
||||||
|
+# define __wctype_l wctype_l
|
||||||
|
+# endif
|
||||||
|
+
|
||||||
|
+#else
|
||||||
|
+# define __nl_langinfo_l(N, L) nl_langinfo((N))
|
||||||
|
+# define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
|
||||||
|
+# define __strtod_l(S, E, L) strtod((S), (E))
|
||||||
|
+# define __strtof_l(S, E, L) strtof((S), (E))
|
||||||
|
+# define __strtold_l(S, E, L) strtold((S), (E))
|
||||||
|
+# define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
|
||||||
|
+# warning should dummy __newlocale check for C|POSIX ?
|
||||||
|
+# define __newlocale(a, b, c) NULL
|
||||||
|
+# define __freelocale(a) ((void)0)
|
||||||
|
+# define __duplocale(a) __c_locale()
|
||||||
|
+//# define __uselocale ?
|
||||||
|
+//
|
||||||
|
+# ifdef _GLIBCXX_USE_WCHAR_T
|
||||||
|
+# define __iswctype_l(C, M, L) iswctype((C), (M))
|
||||||
|
+# define __towlower_l(C, L) towlower((C))
|
||||||
|
+# define __towupper_l(C, L) towupper((C))
|
||||||
|
+# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
|
||||||
|
+//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T))
|
||||||
|
+# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
|
||||||
|
+# define __wctype_l(S, L) wctype((S))
|
||||||
|
+# endif
|
||||||
|
+
|
||||||
|
#endif // GLIBC 2.3 and later
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -36,13 +36,6 @@
|
||||||
|
#include <locale>
|
||||||
|
#include <bits/c++locale_internal.h>
|
||||||
|
|
||||||
|
-#ifndef __UCLIBC_HAS_XLOCALE__
|
||||||
|
-#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
|
||||||
|
-#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
|
||||||
|
-#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
|
||||||
|
-#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
// These are basically extensions to char_traits, and perhaps should
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -38,13 +38,6 @@
|
||||||
|
#undef _LIBC
|
||||||
|
#include <bits/c++locale_internal.h>
|
||||||
|
|
||||||
|
-#ifndef __UCLIBC_HAS_XLOCALE__
|
||||||
|
-#define __wctype_l(S, L) wctype((S))
|
||||||
|
-#define __towupper_l(C, L) towupper((C))
|
||||||
|
-#define __towlower_l(C, L) towlower((C))
|
||||||
|
-#define __iswctype_l(C, M, L) iswctype((C), (M))
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
// NB: The other ctype<char> specializations are in src/locale.cc and
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -39,13 +39,10 @@
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
#warning fix gettext stuff
|
||||||
|
#endif
|
||||||
|
-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
|
||||||
|
-extern "C" char *__dcgettext(const char *domainname,
|
||||||
|
- const char *msgid, int category);
|
||||||
|
#undef gettext
|
||||||
|
-#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
|
||||||
|
+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
|
||||||
|
+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
|
||||||
|
#else
|
||||||
|
-#undef gettext
|
||||||
|
#define gettext(msgid) (msgid)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -36,15 +36,11 @@
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
#warning fix prototypes for *textdomain funcs
|
||||||
|
#endif
|
||||||
|
-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
|
||||||
|
-extern "C" char *__textdomain(const char *domainname);
|
||||||
|
-extern "C" char *__bindtextdomain(const char *domainname,
|
||||||
|
- const char *dirname);
|
||||||
|
-#else
|
||||||
|
-#undef __textdomain
|
||||||
|
-#undef __bindtextdomain
|
||||||
|
-#define __textdomain(D) ((void)0)
|
||||||
|
-#define __bindtextdomain(D,P) ((void)0)
|
||||||
|
+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
|
||||||
|
+#undef textdomain
|
||||||
|
+#undef bindtextdomain
|
||||||
|
+#define textdomain(D) ((void)0)
|
||||||
|
+#define bindtextdomain(D,P) ((void)0)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Non-virtual member functions.
|
||||||
|
@@ -70,7 +66,7 @@
|
||||||
|
messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
|
||||||
|
const char* __dir) const
|
||||||
|
{
|
||||||
|
- __bindtextdomain(__s.c_str(), __dir);
|
||||||
|
+ bindtextdomain(__s.c_str(), __dir);
|
||||||
|
return this->do_open(__s, __loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -90,7 +86,7 @@
|
||||||
|
{
|
||||||
|
// No error checking is done, assume the catalog exists and can
|
||||||
|
// be used.
|
||||||
|
- __textdomain(__s.c_str());
|
||||||
|
+ textdomain(__s.c_str());
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -43,10 +43,6 @@
|
||||||
|
#warning tailor for stub locale support
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#ifndef __UCLIBC_HAS_XLOCALE__
|
||||||
|
-#define __nl_langinfo_l(N, L) nl_langinfo((N))
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
// Construct and return valid pattern consisting of some combination of:
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -41,9 +41,6 @@
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
#warning tailor for stub locale support
|
||||||
|
#endif
|
||||||
|
-#ifndef __UCLIBC_HAS_XLOCALE__
|
||||||
|
-#define __nl_langinfo_l(N, L) nl_langinfo((N))
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
@@ -40,9 +40,6 @@
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
#warning tailor for stub locale support
|
||||||
|
#endif
|
||||||
|
-#ifndef __UCLIBC_HAS_XLOCALE__
|
||||||
|
-#define __nl_langinfo_l(N, L) nl_langinfo((N))
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
50
patches/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch
Normal file
50
patches/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:24.000000000 +0200
|
||||||
|
@@ -401,7 +401,7 @@
|
||||||
|
# ifdef __UCLIBC_HAS_XLOCALE__
|
||||||
|
_M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
||||||
|
_M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
|
||||||
|
-# else
|
||||||
|
+# elif defined __UCLIBC_HAS_LOCALE__
|
||||||
|
_M_data->_M_decimal_point = __global_locale->decimal_point_wc;
|
||||||
|
_M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
||||||
|
# endif
|
||||||
|
@@ -556,7 +556,7 @@
|
||||||
|
# ifdef __UCLIBC_HAS_XLOCALE__
|
||||||
|
_M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
||||||
|
_M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
|
||||||
|
-# else
|
||||||
|
+# elif defined __UCLIBC_HAS_LOCALE__
|
||||||
|
_M_data->_M_decimal_point = __global_locale->decimal_point_wc;
|
||||||
|
_M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
||||||
|
# endif
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:24.000000000 +0200
|
||||||
|
@@ -127,12 +127,25 @@
|
||||||
|
{
|
||||||
|
// Named locale.
|
||||||
|
// NB: In the GNU model wchar_t is always 32 bit wide.
|
||||||
|
+#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
+#warning fix this... should be numeric
|
||||||
|
+#endif
|
||||||
|
+#ifdef __UCLIBC__
|
||||||
|
+# ifdef __UCLIBC_HAS_XLOCALE__
|
||||||
|
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
||||||
|
+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
|
||||||
|
+# elif defined __UCLIBC_HAS_LOCALE__
|
||||||
|
+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
|
||||||
|
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
||||||
|
+# endif
|
||||||
|
+#else
|
||||||
|
union { char *__s; wchar_t __w; } __u;
|
||||||
|
__u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
|
||||||
|
_M_data->_M_decimal_point = __u.__w;
|
||||||
|
|
||||||
|
__u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
|
||||||
|
_M_data->_M_thousands_sep = __u.__w;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if (_M_data->_M_thousands_sep == L'\0')
|
||||||
|
_M_data->_M_grouping = "";
|
||||||
354
patches/gcc/4.2.4/205-uclibc-locale-update.patch
Normal file
354
patches/gcc/4.2.4/205-uclibc-locale-update.patch
Normal file
@ -0,0 +1,354 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
@@ -46,16 +46,13 @@
|
||||||
|
__convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
|
||||||
|
const __c_locale& __cloc)
|
||||||
|
{
|
||||||
|
- if (!(__err & ios_base::failbit))
|
||||||
|
- {
|
||||||
|
- char* __sanity;
|
||||||
|
- errno = 0;
|
||||||
|
- float __f = __strtof_l(__s, &__sanity, __cloc);
|
||||||
|
- if (__sanity != __s && errno != ERANGE)
|
||||||
|
- __v = __f;
|
||||||
|
- else
|
||||||
|
- __err |= ios_base::failbit;
|
||||||
|
- }
|
||||||
|
+ char* __sanity;
|
||||||
|
+ errno = 0;
|
||||||
|
+ float __f = __strtof_l(__s, &__sanity, __cloc);
|
||||||
|
+ if (__sanity != __s && errno != ERANGE)
|
||||||
|
+ __v = __f;
|
||||||
|
+ else
|
||||||
|
+ __err |= ios_base::failbit;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<>
|
||||||
|
@@ -63,16 +60,13 @@
|
||||||
|
__convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
|
||||||
|
const __c_locale& __cloc)
|
||||||
|
{
|
||||||
|
- if (!(__err & ios_base::failbit))
|
||||||
|
- {
|
||||||
|
- char* __sanity;
|
||||||
|
- errno = 0;
|
||||||
|
- double __d = __strtod_l(__s, &__sanity, __cloc);
|
||||||
|
- if (__sanity != __s && errno != ERANGE)
|
||||||
|
- __v = __d;
|
||||||
|
- else
|
||||||
|
- __err |= ios_base::failbit;
|
||||||
|
- }
|
||||||
|
+ char* __sanity;
|
||||||
|
+ errno = 0;
|
||||||
|
+ double __d = __strtod_l(__s, &__sanity, __cloc);
|
||||||
|
+ if (__sanity != __s && errno != ERANGE)
|
||||||
|
+ __v = __d;
|
||||||
|
+ else
|
||||||
|
+ __err |= ios_base::failbit;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<>
|
||||||
|
@@ -80,16 +74,13 @@
|
||||||
|
__convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
|
||||||
|
const __c_locale& __cloc)
|
||||||
|
{
|
||||||
|
- if (!(__err & ios_base::failbit))
|
||||||
|
- {
|
||||||
|
- char* __sanity;
|
||||||
|
- errno = 0;
|
||||||
|
- long double __ld = __strtold_l(__s, &__sanity, __cloc);
|
||||||
|
- if (__sanity != __s && errno != ERANGE)
|
||||||
|
- __v = __ld;
|
||||||
|
- else
|
||||||
|
- __err |= ios_base::failbit;
|
||||||
|
- }
|
||||||
|
+ char* __sanity;
|
||||||
|
+ errno = 0;
|
||||||
|
+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
|
||||||
|
+ if (__sanity != __s && errno != ERANGE)
|
||||||
|
+ __v = __ld;
|
||||||
|
+ else
|
||||||
|
+ __err |= ios_base::failbit;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -110,7 +101,7 @@
|
||||||
|
void
|
||||||
|
locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
|
||||||
|
{
|
||||||
|
- if (_S_get_c_locale() != __cloc)
|
||||||
|
+ if (__cloc && _S_get_c_locale() != __cloc)
|
||||||
|
__freelocale(__cloc);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
@@ -39,21 +39,23 @@
|
||||||
|
#pragma GCC system_header
|
||||||
|
|
||||||
|
#include <cstring> // get std::strlen
|
||||||
|
-#include <cstdio> // get std::snprintf or std::sprintf
|
||||||
|
+#include <cstdio> // get std::vsnprintf or std::vsprintf
|
||||||
|
#include <clocale>
|
||||||
|
#include <langinfo.h> // For codecvt
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
#warning fix this
|
||||||
|
#endif
|
||||||
|
-#ifdef __UCLIBC_HAS_LOCALE__
|
||||||
|
+#ifdef _GLIBCXX_USE_ICONV
|
||||||
|
#include <iconv.h> // For codecvt using iconv, iconv_t
|
||||||
|
#endif
|
||||||
|
-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
|
||||||
|
-#include <libintl.h> // For messages
|
||||||
|
+#ifdef HAVE_LIBINTL_H
|
||||||
|
+#include <libintl.h> // For messages
|
||||||
|
#endif
|
||||||
|
+#include <cstdarg>
|
||||||
|
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
#warning what is _GLIBCXX_C_LOCALE_GNU for
|
||||||
|
+// psm: used in os/gnu-linux/ctype_noninline.h
|
||||||
|
#endif
|
||||||
|
#define _GLIBCXX_C_LOCALE_GNU 1
|
||||||
|
|
||||||
|
@@ -62,7 +64,7 @@
|
||||||
|
#endif
|
||||||
|
// #define _GLIBCXX_NUM_CATEGORIES 6
|
||||||
|
#define _GLIBCXX_NUM_CATEGORIES 0
|
||||||
|
-
|
||||||
|
+
|
||||||
|
#ifdef __UCLIBC_HAS_XLOCALE__
|
||||||
|
namespace __gnu_cxx
|
||||||
|
{
|
||||||
|
@@ -79,22 +81,24 @@
|
||||||
|
typedef int* __c_locale;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- // Convert numeric value of type _Tv to string and return length of
|
||||||
|
- // string. If snprintf is available use it, otherwise fall back to
|
||||||
|
- // the unsafe sprintf which, in general, can be dangerous and should
|
||||||
|
+ // Convert numeric value of type double to string and return length of
|
||||||
|
+ // string. If vsnprintf is available use it, otherwise fall back to
|
||||||
|
+ // the unsafe vsprintf which, in general, can be dangerous and should
|
||||||
|
// be avoided.
|
||||||
|
- template<typename _Tv>
|
||||||
|
- int
|
||||||
|
- __convert_from_v(char* __out,
|
||||||
|
- const int __size __attribute__ ((__unused__)),
|
||||||
|
- const char* __fmt,
|
||||||
|
-#ifdef __UCLIBC_HAS_XCLOCALE__
|
||||||
|
- _Tv __v, const __c_locale& __cloc, int __prec)
|
||||||
|
+ inline int
|
||||||
|
+ __convert_from_v(const __c_locale&
|
||||||
|
+#ifndef __UCLIBC_HAS_XCLOCALE__
|
||||||
|
+ __cloc __attribute__ ((__unused__))
|
||||||
|
+#endif
|
||||||
|
+ ,
|
||||||
|
+ char* __out,
|
||||||
|
+ const int __size,
|
||||||
|
+ const char* __fmt, ...)
|
||||||
|
{
|
||||||
|
+ va_list __args;
|
||||||
|
+#ifdef __UCLIBC_HAS_XCLOCALE__
|
||||||
|
__c_locale __old = __gnu_cxx::__uselocale(__cloc);
|
||||||
|
#else
|
||||||
|
- _Tv __v, const __c_locale&, int __prec)
|
||||||
|
- {
|
||||||
|
# ifdef __UCLIBC_HAS_LOCALE__
|
||||||
|
char* __old = std::setlocale(LC_ALL, NULL);
|
||||||
|
char* __sav = new char[std::strlen(__old) + 1];
|
||||||
|
@@ -103,7 +107,9 @@
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
|
||||||
|
+ va_start(__args, __fmt);
|
||||||
|
+ const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
|
||||||
|
+ va_end(__args);
|
||||||
|
|
||||||
|
#ifdef __UCLIBC_HAS_XCLOCALE__
|
||||||
|
__gnu_cxx::__uselocale(__old);
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
@@ -33,9 +33,14 @@
|
||||||
|
|
||||||
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
|
||||||
|
+#include <features.h>
|
||||||
|
+#ifdef __UCLIBC_HAS_LOCALE__
|
||||||
|
#define _LIBC
|
||||||
|
#include <locale>
|
||||||
|
#undef _LIBC
|
||||||
|
+#else
|
||||||
|
+#include <locale>
|
||||||
|
+#endif
|
||||||
|
#include <bits/c++locale_internal.h>
|
||||||
|
|
||||||
|
namespace std
|
||||||
|
@@ -138,20 +143,34 @@
|
||||||
|
ctype<wchar_t>::
|
||||||
|
do_is(mask __m, wchar_t __c) const
|
||||||
|
{
|
||||||
|
- // Highest bitmask in ctype_base == 10, but extra in "C"
|
||||||
|
- // library for blank.
|
||||||
|
+ // The case of __m == ctype_base::space is particularly important,
|
||||||
|
+ // due to its use in many istream functions. Therefore we deal with
|
||||||
|
+ // it first, exploiting the knowledge that on GNU systems _M_bit[5]
|
||||||
|
+ // is the mask corresponding to ctype_base::space. NB: an encoding
|
||||||
|
+ // change would not affect correctness!
|
||||||
|
bool __ret = false;
|
||||||
|
- const size_t __bitmasksize = 11;
|
||||||
|
- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
|
||||||
|
- if (__m & _M_bit[__bitcur]
|
||||||
|
- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
|
||||||
|
- {
|
||||||
|
- __ret = true;
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
+ if (__m == _M_bit[5])
|
||||||
|
+ __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ // Highest bitmask in ctype_base == 10, but extra in "C"
|
||||||
|
+ // library for blank.
|
||||||
|
+ const size_t __bitmasksize = 11;
|
||||||
|
+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
|
||||||
|
+ if (__m & _M_bit[__bitcur])
|
||||||
|
+ {
|
||||||
|
+ if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
|
||||||
|
+ {
|
||||||
|
+ __ret = true;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ else if (__m == _M_bit[__bitcur])
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
return __ret;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
const wchar_t*
|
||||||
|
ctype<wchar_t>::
|
||||||
|
do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:53.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
@@ -47,18 +47,21 @@
|
||||||
|
template<typename _CharT>
|
||||||
|
messages<_CharT>::messages(size_t __refs)
|
||||||
|
: facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
|
||||||
|
- _M_name_messages(_S_get_c_name())
|
||||||
|
+ _M_name_messages(_S_get_c_name())
|
||||||
|
{ }
|
||||||
|
|
||||||
|
template<typename _CharT>
|
||||||
|
messages<_CharT>::messages(__c_locale __cloc, const char* __s,
|
||||||
|
size_t __refs)
|
||||||
|
- : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
|
||||||
|
- _M_name_messages(__s)
|
||||||
|
+ : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
|
||||||
|
{
|
||||||
|
- char* __tmp = new char[std::strlen(__s) + 1];
|
||||||
|
- std::strcpy(__tmp, __s);
|
||||||
|
+ const size_t __len = std::strlen(__s) + 1;
|
||||||
|
+ char* __tmp = new char[__len];
|
||||||
|
+ std::memcpy(__tmp, __s, __len);
|
||||||
|
_M_name_messages = __tmp;
|
||||||
|
+
|
||||||
|
+ // Last to avoid leaking memory if new throws.
|
||||||
|
+ _M_c_locale_messages = _S_clone_c_locale(__cloc);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename _CharT>
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:24.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
@@ -33,9 +33,14 @@
|
||||||
|
|
||||||
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
|
||||||
|
+#include <features.h>
|
||||||
|
+#ifdef __UCLIBC_HAS_LOCALE__
|
||||||
|
#define _LIBC
|
||||||
|
#include <locale>
|
||||||
|
#undef _LIBC
|
||||||
|
+#else
|
||||||
|
+#include <locale>
|
||||||
|
+#endif
|
||||||
|
#include <bits/c++locale_internal.h>
|
||||||
|
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
@@ -206,7 +211,7 @@
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
- ;
|
||||||
|
+ __ret = pattern();
|
||||||
|
}
|
||||||
|
return __ret;
|
||||||
|
}
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:24.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
@@ -33,9 +33,14 @@
|
||||||
|
|
||||||
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
|
||||||
|
+#include <features.h>
|
||||||
|
+#ifdef __UCLIBC_HAS_LOCALE__
|
||||||
|
#define _LIBC
|
||||||
|
#include <locale>
|
||||||
|
#undef _LIBC
|
||||||
|
+#else
|
||||||
|
+#include <locale>
|
||||||
|
+#endif
|
||||||
|
#include <bits/c++locale_internal.h>
|
||||||
|
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
@@ -37,25 +37,33 @@
|
||||||
|
template<typename _CharT>
|
||||||
|
__timepunct<_CharT>::__timepunct(size_t __refs)
|
||||||
|
: facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
|
||||||
|
- _M_name_timepunct(_S_get_c_name())
|
||||||
|
+ _M_name_timepunct(_S_get_c_name())
|
||||||
|
{ _M_initialize_timepunct(); }
|
||||||
|
|
||||||
|
template<typename _CharT>
|
||||||
|
__timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
|
||||||
|
: facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
|
||||||
|
- _M_name_timepunct(_S_get_c_name())
|
||||||
|
+ _M_name_timepunct(_S_get_c_name())
|
||||||
|
{ _M_initialize_timepunct(); }
|
||||||
|
|
||||||
|
template<typename _CharT>
|
||||||
|
__timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
|
||||||
|
size_t __refs)
|
||||||
|
: facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
|
||||||
|
- _M_name_timepunct(__s)
|
||||||
|
+ _M_name_timepunct(NULL)
|
||||||
|
{
|
||||||
|
- char* __tmp = new char[std::strlen(__s) + 1];
|
||||||
|
- std::strcpy(__tmp, __s);
|
||||||
|
+ const size_t __len = std::strlen(__s) + 1;
|
||||||
|
+ char* __tmp = new char[__len];
|
||||||
|
+ std::memcpy(__tmp, __s, __len);
|
||||||
|
_M_name_timepunct = __tmp;
|
||||||
|
- _M_initialize_timepunct(__cloc);
|
||||||
|
+
|
||||||
|
+ try
|
||||||
|
+ { _M_initialize_timepunct(__cloc); }
|
||||||
|
+ catch(...)
|
||||||
|
+ {
|
||||||
|
+ delete [] _M_name_timepunct;
|
||||||
|
+ __throw_exception_again;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename _CharT>
|
||||||
50
patches/gcc/4.2.4/300-libstdc++-pic.patch
Normal file
50
patches/gcc/4.2.4/300-libstdc++-pic.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am gcc-4.2.1/libstdc++-v3/src/Makefile.am
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am 2006-07-28 06:57:34.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/src/Makefile.am 2007-08-03 20:32:27.000000000 +0200
|
||||||
|
@@ -257,6 +257,12 @@
|
||||||
|
$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
|
||||||
|
|
||||||
|
|
||||||
|
+install-exec-local:
|
||||||
|
+ifeq ($(enable_shared),yes)
|
||||||
|
+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
|
||||||
|
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
# Added bits to build debug library.
|
||||||
|
if GLIBCXX_BUILD_DEBUG
|
||||||
|
all-local: build_debug
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in gcc-4.2.1/libstdc++-v3/src/Makefile.in
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in 2006-10-16 21:08:22.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/src/Makefile.in 2007-08-03 20:32:27.000000000 +0200
|
||||||
|
@@ -657,7 +657,7 @@
|
||||||
|
|
||||||
|
install-data-am: install-data-local
|
||||||
|
|
||||||
|
-install-exec-am: install-toolexeclibLTLIBRARIES
|
||||||
|
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
|
||||||
|
|
||||||
|
install-info: install-info-am
|
||||||
|
|
||||||
|
@@ -690,6 +690,7 @@
|
||||||
|
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||||
|
html-am info info-am install install-am install-data \
|
||||||
|
install-data-am install-data-local install-exec \
|
||||||
|
+ install-exec-local \
|
||||||
|
install-exec-am install-info install-info-am install-man \
|
||||||
|
install-strip install-toolexeclibLTLIBRARIES installcheck \
|
||||||
|
installcheck-am installdirs maintainer-clean \
|
||||||
|
@@ -799,6 +800,13 @@
|
||||||
|
install_debug:
|
||||||
|
(cd ${debugdir} && $(MAKE) \
|
||||||
|
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
|
||||||
|
+
|
||||||
|
+install-exec-local:
|
||||||
|
+ifeq ($(enable_shared),yes)
|
||||||
|
+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
|
||||||
|
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
.NOEXPORT:
|
||||||
12
patches/gcc/4.2.4/301-missing-execinfo_h.patch
Normal file
12
patches/gcc/4.2.4/301-missing-execinfo_h.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/boehm-gc/include/gc.h gcc-4.2.1/boehm-gc/include/gc.h
|
||||||
|
--- gcc-4.2.1.orig/boehm-gc/include/gc.h 2006-09-18 20:45:08.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/boehm-gc/include/gc.h 2007-08-03 20:33:00.000000000 +0200
|
||||||
|
@@ -502,7 +502,7 @@
|
||||||
|
#if defined(__linux__) || defined(__GLIBC__)
|
||||||
|
# include <features.h>
|
||||||
|
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
|
||||||
|
- && !defined(__ia64__)
|
||||||
|
+ && !defined(__ia64__) && !defined(__UCLIBC__)
|
||||||
|
# ifndef GC_HAVE_BUILTIN_BACKTRACE
|
||||||
|
# define GC_HAVE_BUILTIN_BACKTRACE
|
||||||
|
# endif
|
||||||
12
patches/gcc/4.2.4/302-c99-snprintf.patch
Normal file
12
patches/gcc/4.2.4/302-c99-snprintf.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h 2006-12-07 10:33:51.000000000 +0100
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h 2007-08-03 20:33:24.000000000 +0200
|
||||||
|
@@ -144,7 +144,7 @@
|
||||||
|
|
||||||
|
_GLIBCXX_END_NAMESPACE
|
||||||
|
|
||||||
|
-#if _GLIBCXX_USE_C99
|
||||||
|
+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
|
||||||
|
|
||||||
|
#undef snprintf
|
||||||
|
#undef vfscanf
|
||||||
13
patches/gcc/4.2.4/303-c99-complex-ugly-hack.patch
Normal file
13
patches/gcc/4.2.4/303-c99-complex-ugly-hack.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/configure 2007-08-03 20:30:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:33:56.000000000 +0200
|
||||||
|
@@ -7514,6 +7514,9 @@
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
#include <complex.h>
|
||||||
|
+#ifdef __UCLIBC__
|
||||||
|
+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
|
||||||
|
+#endif
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
26
patches/gcc/4.2.4/304-index_macro.patch
Normal file
26
patches/gcc/4.2.4/304-index_macro.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/rope gcc-4.2.1/libstdc++-v3/include/ext/rope
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/include/ext/rope 2006-10-17 13:56:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/include/ext/rope 2007-08-03 20:34:23.000000000 +0200
|
||||||
|
@@ -58,6 +58,9 @@
|
||||||
|
#include <bits/allocator.h>
|
||||||
|
#include <ext/hash_fun.h>
|
||||||
|
|
||||||
|
+/* cope w/ index defined as macro, SuSv3 proposal */
|
||||||
|
+#undef index
|
||||||
|
+
|
||||||
|
# ifdef __GC
|
||||||
|
# define __GC_CONST const
|
||||||
|
# else
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2006-10-17 13:56:21.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h 2007-08-03 20:34:23.000000000 +0200
|
||||||
|
@@ -54,6 +54,9 @@
|
||||||
|
#include <ext/memory> // For uninitialized_copy_n
|
||||||
|
#include <ext/numeric> // For power
|
||||||
|
|
||||||
|
+/* cope w/ index defined as macro, SuSv3 proposal */
|
||||||
|
+#undef index
|
||||||
|
+
|
||||||
|
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
||||||
|
|
||||||
|
using std::size_t;
|
||||||
48
patches/gcc/4.2.4/305-libmudflap-susv3-legacy.patch
Normal file
48
patches/gcc/4.2.4/305-libmudflap-susv3-legacy.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libmudflap/mf-hooks2.c gcc-4.2.1/libmudflap/mf-hooks2.c
|
||||||
|
--- gcc-4.2.1.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libmudflap/mf-hooks2.c 2007-08-03 20:35:09.000000000 +0200
|
||||||
|
@@ -427,7 +427,7 @@
|
||||||
|
{
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
|
||||||
|
- bzero (s, n);
|
||||||
|
+ memset (s, 0, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -437,7 +437,7 @@
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
|
||||||
|
MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
|
||||||
|
- bcopy (src, dest, n);
|
||||||
|
+ memmove (dest, src, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -447,7 +447,7 @@
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
|
||||||
|
MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
|
||||||
|
- return bcmp (s1, s2, n);
|
||||||
|
+ return n == 0 ? 0 : memcmp (s1, s2, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -456,7 +456,7 @@
|
||||||
|
size_t n = strlen (s);
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
|
||||||
|
- return index (s, c);
|
||||||
|
+ return strchr (s, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -465,7 +465,7 @@
|
||||||
|
size_t n = strlen (s);
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
|
||||||
|
- return rindex (s, c);
|
||||||
|
+ return strrchr (s, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* XXX: stpcpy, memccpy */
|
||||||
36
patches/gcc/4.2.4/306-libstdc++-namespace.patch
Normal file
36
patches/gcc/4.2.4/306-libstdc++-namespace.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:35:40.000000000 +0200
|
||||||
|
@@ -32,7 +32,8 @@
|
||||||
|
//
|
||||||
|
|
||||||
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
-
|
||||||
|
+namespace std
|
||||||
|
+{
|
||||||
|
#ifdef __UCLIBC_MJN3_ONLY__
|
||||||
|
#warning fix prototypes for *textdomain funcs
|
||||||
|
#endif
|
||||||
|
@@ -115,3 +116,4 @@
|
||||||
|
this->_S_create_c_locale(this->_M_c_locale_messages, __s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+}
|
||||||
|
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
|
||||||
|
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:31:54.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:35:40.000000000 +0200
|
||||||
|
@@ -33,7 +33,8 @@
|
||||||
|
//
|
||||||
|
|
||||||
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
-
|
||||||
|
+namespace std
|
||||||
|
+{
|
||||||
|
template<typename _CharT>
|
||||||
|
__timepunct<_CharT>::__timepunct(size_t __refs)
|
||||||
|
: facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
|
||||||
|
@@ -74,3 +75,4 @@
|
||||||
|
delete _M_data;
|
||||||
|
_S_destroy_c_locale(_M_c_locale_timepunct);
|
||||||
|
}
|
||||||
|
+}
|
||||||
12
patches/gcc/4.2.4/402-libbackend_dep_gcov-iov.h.patch
Normal file
12
patches/gcc/4.2.4/402-libbackend_dep_gcov-iov.h.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/gcc/Makefile.in gcc-4.2.1/gcc/Makefile.in
|
||||||
|
--- gcc-4.2.1.orig/gcc/Makefile.in 2007-05-31 17:37:38.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/gcc/Makefile.in 2007-08-03 20:36:14.000000000 +0200
|
||||||
|
@@ -2660,7 +2660,7 @@
|
||||||
|
# FIXME: writing proper dependencies for this is a *LOT* of work.
|
||||||
|
libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
|
||||||
|
insn-config.h insn-flags.h insn-codes.h insn-constants.h \
|
||||||
|
- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
|
||||||
|
+ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
|
||||||
|
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
|
||||||
|
-DTARGET_NAME=\"$(target_noncanonical)\" \
|
||||||
|
-DLOCALEDIR=\"$(localedir)\" \
|
||||||
64
patches/gcc/4.2.4/800-arm-bigendian.patch
Normal file
64
patches/gcc/4.2.4/800-arm-bigendian.patch
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/gcc/config/arm/linux-elf.h gcc-4.2.1/gcc/config/arm/linux-elf.h
|
||||||
|
--- gcc-4.2.1.orig/gcc/config/arm/linux-elf.h 2006-02-17 00:29:10.000000000 +0100
|
||||||
|
+++ gcc-4.2.1/gcc/config/arm/linux-elf.h 2007-08-03 20:36:43.000000000 +0200
|
||||||
|
@@ -28,19 +28,33 @@
|
||||||
|
#undef TARGET_VERSION
|
||||||
|
#define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr);
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
|
||||||
|
+ * (big endian) configurations.
|
||||||
|
+ */
|
||||||
|
+#if TARGET_BIG_ENDIAN_DEFAULT
|
||||||
|
+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
|
||||||
|
+#define TARGET_ENDIAN_OPTION "mbig-endian"
|
||||||
|
+#define TARGET_LINKER_EMULATION "armelfb_linux"
|
||||||
|
+#else
|
||||||
|
+#define TARGET_ENDIAN_DEFAULT 0
|
||||||
|
+#define TARGET_ENDIAN_OPTION "mlittle-endian"
|
||||||
|
+#define TARGET_LINKER_EMULATION "armelf_linux"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#undef TARGET_DEFAULT_FLOAT_ABI
|
||||||
|
#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
|
||||||
|
|
||||||
|
#undef TARGET_DEFAULT
|
||||||
|
-#define TARGET_DEFAULT (0)
|
||||||
|
+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
|
||||||
|
|
||||||
|
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
|
||||||
|
|
||||||
|
-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
|
||||||
|
+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
|
||||||
|
|
||||||
|
#undef MULTILIB_DEFAULTS
|
||||||
|
#define MULTILIB_DEFAULTS \
|
||||||
|
- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
|
||||||
|
+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
|
||||||
|
|
||||||
|
/* Now we define the strings used to build the spec file. */
|
||||||
|
#undef LIB_SPEC
|
||||||
|
@@ -61,7 +75,7 @@
|
||||||
|
%{rdynamic:-export-dynamic} \
|
||||||
|
%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \
|
||||||
|
-X \
|
||||||
|
- %{mbig-endian:-EB}" \
|
||||||
|
+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
|
||||||
|
SUBTARGET_EXTRA_LINK_SPEC
|
||||||
|
|
||||||
|
#undef LINK_SPEC
|
||||||
|
diff -durN gcc-4.2.1.orig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
|
||||||
|
--- gcc-4.2.1.orig/gcc/config.gcc 2007-08-03 20:29:52.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/gcc/config.gcc 2007-08-03 20:36:43.000000000 +0200
|
||||||
|
@@ -705,6 +705,11 @@
|
||||||
|
tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
|
||||||
|
tmake_file="${tmake_file} t-linux arm/t-arm"
|
||||||
|
case ${target} in
|
||||||
|
+ arm*b-*)
|
||||||
|
+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ case ${target} in
|
||||||
|
arm*-*-linux-*eabi)
|
||||||
|
tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
|
||||||
|
tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
|
||||||
58
patches/gcc/4.2.4/801-softfloat-fix.patch
Normal file
58
patches/gcc/4.2.4/801-softfloat-fix.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
This patch (C) 2007 Yann E. MORIN
|
||||||
|
Licensed under GPL v2.
|
||||||
|
|
||||||
|
First hunk of this patch solves compiling uClibc:
|
||||||
|
|
||||||
|
make[1]: Entering directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
|
||||||
|
LD libuClibc-0.9.29.so
|
||||||
|
libc/libc_so.a(difftime.os): In function `difftime':
|
||||||
|
difftime.c:(.text+0x8): undefined reference to `__floatsidf'
|
||||||
|
difftime.c:(.text+0x2c): undefined reference to `__subdf3'
|
||||||
|
libc/libc_so.a(_fpmaxtostr.os): In function `_fpmaxtostr':
|
||||||
|
_fpmaxtostr.c:(.text+0xd4): undefined reference to `__nedf2'
|
||||||
|
_fpmaxtostr.c:(.text+0xf8): undefined reference to `__eqdf2'
|
||||||
|
_fpmaxtostr.c:(.text+0x114): undefined reference to `__divdf3'
|
||||||
|
_fpmaxtostr.c:(.text+0x120): undefined reference to `__ltdf2'
|
||||||
|
_fpmaxtostr.c:(.text+0x1c4): undefined reference to `__muldf3'
|
||||||
|
_fpmaxtostr.c:(.text+0x388): undefined reference to `__gedf2'
|
||||||
|
_fpmaxtostr.c:(.text+0x430): undefined reference to `__adddf3'
|
||||||
|
libc/libc_so.a(__psfs_do_numeric.os): In function `__psfs_do_numeric':
|
||||||
|
__psfs_do_numeric.c:(.text+0x520): undefined reference to `__truncdfsf2'
|
||||||
|
libc/libc_so.a(strtof.os): In function `strtof':
|
||||||
|
strtof.c:(.text+0x1c): undefined reference to `__extendsfdf2'
|
||||||
|
/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/cc_core_prefix/lib/gcc/arm-linux-uclibc/4.1.1/libgcc.a(_fixunsdfsi.o):
|
||||||
|
In function `__fixunsdfsi':
|
||||||
|
libgcc2.c:(.text+0x34): undefined reference to `__fixdfsi'
|
||||||
|
make[2]: *** [lib/libc.so] Error 1
|
||||||
|
make[1]: *** [lib/libc.so.0] Error 2
|
||||||
|
make[1]: Leaving directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
|
||||||
|
make: *** [/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc/lib/libc.a]
|
||||||
|
Error 2
|
||||||
|
|
||||||
|
The second hunk fixes building final gcc because soft-float implies using -lfloat (which we don't have).
|
||||||
|
|
||||||
|
|
||||||
|
diff -dur gcc-4.2.0.orig/gcc/config.gcc gcc-4.2.0/gcc/config.gcc
|
||||||
|
--- gcc-4.2.0.orig/gcc/config.gcc 2007-07-15 11:24:18.000000000 +0200
|
||||||
|
+++ gcc-4.2.0/gcc/config.gcc 2007-07-15 11:26:02.000000000 +0200
|
||||||
|
@@ -721,7 +721,7 @@
|
||||||
|
default_use_cxa_atexit=yes
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
- tmake_file="$tmake_file arm/t-linux"
|
||||||
|
+ tmake_file="$tmake_file arm/t-linux arm/t-arm-elf"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
tm_file="$tm_file arm/aout.h arm/arm.h"
|
||||||
|
diff -dur gcc-4.2.0.orig/gcc/config/arm/linux-elf.h gcc-4.2.0/gcc/config/arm/linux-elf.h
|
||||||
|
--- gcc-4.2.0.orig/gcc/config/arm/linux-elf.h 2007-07-15 11:24:18.000000000 +0200
|
||||||
|
+++ gcc-4.2.0/gcc/config/arm/linux-elf.h 2007-07-15 11:26:02.000000000 +0200
|
||||||
|
@@ -63,7 +63,7 @@
|
||||||
|
%{shared:-lc} \
|
||||||
|
%{!shared:%{profile:-lc_p}%{!profile:-lc}}"
|
||||||
|
|
||||||
|
-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
|
||||||
|
+#define LIBGCC_SPEC "-lgcc"
|
||||||
|
|
||||||
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
||||||
|
|
||||||
24
patches/gcc/4.2.4/904-flatten-switch-stmt-00.patch
Normal file
24
patches/gcc/4.2.4/904-flatten-switch-stmt-00.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -durN gcc-4.2.1.orig/gcc/stmt.c gcc-4.2.1/gcc/stmt.c
|
||||||
|
--- gcc-4.2.1.orig/gcc/stmt.c 2007-07-19 05:25:32.000000000 +0200
|
||||||
|
+++ gcc-4.2.1/gcc/stmt.c 2007-08-03 20:37:19.000000000 +0200
|
||||||
|
@@ -2512,7 +2512,11 @@
|
||||||
|
use_cost_table
|
||||||
|
= (TREE_CODE (orig_type) != ENUMERAL_TYPE
|
||||||
|
&& estimate_case_costs (case_list));
|
||||||
|
- balance_case_nodes (&case_list, NULL);
|
||||||
|
+ /* When optimizing for size, we want a straight list to avoid
|
||||||
|
+ jumps as much as possible. This basically creates an if-else
|
||||||
|
+ chain. */
|
||||||
|
+ if (!optimize_size)
|
||||||
|
+ balance_case_nodes (&case_list, NULL);
|
||||||
|
emit_case_nodes (index, case_list, default_label, index_type);
|
||||||
|
emit_jump (default_label);
|
||||||
|
}
|
||||||
|
@@ -3070,6 +3074,7 @@
|
||||||
|
{
|
||||||
|
if (!node_has_low_bound (node, index_type))
|
||||||
|
{
|
||||||
|
+ if (!optimize_size) /* don't jl to the .default_label. */
|
||||||
|
emit_cmp_and_jump_insns (index,
|
||||||
|
convert_modes
|
||||||
|
(mode, imode,
|
||||||
21
patches/gcc/4.2.4/920-soft-float.patch
Normal file
21
patches/gcc/4.2.4/920-soft-float.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff -uNpr gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c
|
||||||
|
--- gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c 2007-03-05 11:54:00.000000000 -0500
|
||||||
|
+++ gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c 2008-01-31 17:51:24.000000000 -0500
|
||||||
|
@@ -70,6 +70,8 @@ Software Foundation, 51 Franklin Street,
|
||||||
|
but GCC currently generates poor code when a union is used to turn
|
||||||
|
a long double into a pair of doubles. */
|
||||||
|
|
||||||
|
+#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
|
||||||
|
+
|
||||||
|
long double __gcc_qadd (double, double, double, double);
|
||||||
|
long double __gcc_qsub (double, double, double, double);
|
||||||
|
long double __gcc_qmul (double, double, double, double);
|
||||||
|
@@ -219,8 +221,6 @@ __gcc_qdiv (double a, double b, double c
|
||||||
|
return z.ldval;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
|
||||||
|
-
|
||||||
|
long double __gcc_qneg (double, double);
|
||||||
|
int __gcc_qeq (double, double, double, double);
|
||||||
|
int __gcc_qne (double, double, double, double);
|
||||||
13
patches/gcc/4.2.4/930-eabi_fixes.patch
Normal file
13
patches/gcc/4.2.4/930-eabi_fixes.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -durN gcc-4.2.3.orig/gcc/config/arm/linux-eabi.h gcc-4.2.3/gcc/config/arm/linux-eabi.h
|
||||||
|
--- gcc-4.2.3.orig/gcc/config/arm/linux-eabi.h 2007-09-01 17:28:30.000000000 +0200
|
||||||
|
+++ gcc-4.2.3/gcc/config/arm/linux-eabi.h 2008-05-25 23:47:36.000000000 +0200
|
||||||
|
@@ -47,7 +47,8 @@
|
||||||
|
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
|
||||||
|
|
||||||
|
#undef SUBTARGET_EXTRA_LINK_SPEC
|
||||||
|
-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
|
||||||
|
+#define SUBTARGET_EXTRA_LINK_SPEC \
|
||||||
|
+ " %{mlittle-endian:-m armelf_linux_eabi} %{mbig-endian:-m armelfb_linux_eabi}"
|
||||||
|
|
||||||
|
/* Use ld-linux.so.3 so that it will be possible to run "classic"
|
||||||
|
GNU/Linux binaries on an EABI system. */
|
||||||
17
patches/gcc/4.2.4/940-gcc-alpha-signal_h.patch
Normal file
17
patches/gcc/4.2.4/940-gcc-alpha-signal_h.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
--- gcc-4.2.1-stock/gcc/config/alpha/linux-unwind.h 2005-06-24 20:22:41.000000000 -0500
|
||||||
|
+++ gcc-4.2.1/gcc/config/alpha/linux-unwind.h 2007-09-01 20:21:34.000000000 -0500
|
||||||
|
@@ -29,6 +29,9 @@ Boston, MA 02110-1301, USA. */
|
||||||
|
/* Do code reading to identify a signal frame, and set the frame
|
||||||
|
state data appropriately. See unwind-dw2.c for the structs. */
|
||||||
|
|
||||||
|
+/* Don't use this if inhibit_libc is set
|
||||||
|
+ The build for this target will fail trying to include missing headers */
|
||||||
|
+#ifndef inhibit_libc
|
||||||
|
#include <signal.h>
|
||||||
|
#include <sys/ucontext.h>
|
||||||
|
|
||||||
|
@@ -80,3 +83,4 @@ alpha_fallback_frame_state (struct _Unwi
|
||||||
|
fs->retaddr_column = 64;
|
||||||
|
return _URC_NO_REASON;
|
||||||
|
}
|
||||||
|
+#endif /* inhibit_libc */
|
||||||
43
patches/gcc/4.2.4/950-fortran-signed-TImode.patch
Normal file
43
patches/gcc/4.2.4/950-fortran-signed-TImode.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
Fix building gfortran for ARM.
|
||||||
|
http://gcc.gnu.org/ml/gcc-patches/2007-05/msg01010.html
|
||||||
|
----
|
||||||
|
|
||||||
|
The patch below fixes a crash building libgfortran on arm-linux-gnueabi.
|
||||||
|
|
||||||
|
This target doesn't really have a 128-bit integer type, however it does use
|
||||||
|
TImode to represent the return value of certain special ABI defined library
|
||||||
|
functions. This results in type_for_size(TImode) being called.
|
||||||
|
|
||||||
|
Because TImode deosn't correspond to any gfortran integer kind
|
||||||
|
gfc_type_for_size returns NULL and we segfault shortly after.
|
||||||
|
|
||||||
|
The patch below fixes this by making gfc_type_for_size handle TImode in the
|
||||||
|
same way as the C frontend.
|
||||||
|
|
||||||
|
Tested on x86_64-linux and arm-linux-gnueabi.
|
||||||
|
Applied to trunk.
|
||||||
|
|
||||||
|
Paul
|
||||||
|
|
||||||
|
2007-05-15 Paul Brook <paul@codesourcery.com>
|
||||||
|
|
||||||
|
gcc/fortran/
|
||||||
|
* trans-types.c (gfc_type_for_size): Handle signed TImode.
|
||||||
|
|
||||||
|
diff -durN gcc-4.2.3.old/gcc/fortran/trans-types.c gcc-4.2.3/gcc/fortran/trans-types.c
|
||||||
|
--- gcc-4.2.3.old/gcc/fortran/trans-types.c 2007-08-31 10:27:50.000000000 +0200
|
||||||
|
+++ gcc-4.2.3/gcc/fortran/trans-types.c 2008-07-17 09:54:20.000000000 +0200
|
||||||
|
@@ -1799,6 +1799,13 @@
|
||||||
|
if (type && bits == TYPE_PRECISION (type))
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /* Handle TImode as a special case because it is used by some backends
|
||||||
|
+ (eg. ARM) even though it is not available for normal use. */
|
||||||
|
+#if HOST_BITS_PER_WIDE_INT >= 64
|
||||||
|
+ if (bits == TYPE_PRECISION (intTI_type_node))
|
||||||
|
+ return intTI_type_node;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
Loading…
Reference in New Issue
Block a user