mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

71 lines
2.3 KiB

  1. ? the following error when building with gcc-4.0.0:
  2. ../string/strcoll.c:39: error: '__EI_strcoll' aliased to undefined symbol '__GI_strcoll'
  3. make[2]: *** [/home/dank/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/build-glibc/wcsmbs/wcscoll.os] Error 1
  4. make[2]: Leaving directory `/home/dank/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/glibc-2.3.4/wcsmbs'
  5. taken from Dan Kegel's glibc patches
  6. ===================================================================
  7. RCS file: /cvs/glibc/libc/string/strcoll.c,v
  8. retrieving revision 1.33
  9. retrieving revision 1.34
  10. diff -u -r1.33 -r1.34
  11. --- libc/string/strcoll.c 2004/03/14 20:51:30 1.33
  12. +++ libc/string/strcoll.c 2005/03/17 21:06:24 1.34
  13. @@ -23,6 +23,7 @@
  14. # define STRING_TYPE char
  15. # define STRCOLL strcoll
  16. # define STRCOLL_L __strcoll_l
  17. +# define USE_HIDDEN_DEF
  18. #endif
  19. #include "../locale/localeinfo.h"
  20. @@ -35,6 +36,7 @@
  21. {
  22. return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE);
  23. }
  24. -#if !defined WIDE_CHAR_VERSION
  25. -libc_hidden_def (strcoll)
  26. +
  27. +#ifdef USE_HIDDEN_DEF
  28. +libc_hidden_def (STRCOLL)
  29. #endif
  30. ===================================================================
  31. RCS file: /cvs/glibc/libc/include/wchar.h,v
  32. retrieving revision 1.26
  33. retrieving revision 1.27
  34. diff -u -r1.26 -r1.27
  35. --- libc/include/wchar.h 2004/03/14 20:45:10 1.26
  36. +++ libc/include/wchar.h 2005/03/17 21:06:24 1.27
  37. @@ -56,7 +56,6 @@
  38. extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
  39. size_t __n)
  40. __attribute_pure__;
  41. -extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);
  42. extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;
  43. extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)
  44. __attribute_pure__;
  45. ===================================================================
  46. RCS file: /cvs/glibc/libc/wcsmbs/wcscoll.c,v
  47. retrieving revision 1.13
  48. retrieving revision 1.14
  49. diff -u -r1.13 -r1.14
  50. --- libc/wcsmbs/wcscoll.c 2004/03/14 21:05:48 1.13
  51. +++ libc/wcsmbs/wcscoll.c 2005/03/17 21:06:24 1.14
  52. @@ -22,12 +22,11 @@
  53. #define STRING_TYPE wchar_t
  54. #define USTRING_TYPE wint_t
  55. -#define STRCOLL __wcscoll
  56. +#define STRCOLL wcscoll
  57. #define STRCOLL_L __wcscoll_l
  58. #include "../string/strcoll.c"
  59. #ifndef USE_IN_EXTENDED_LOCALE_MODEL
  60. -weak_alias (__wcscoll, wcscoll)
  61. libc_hidden_weak (wcscoll)
  62. #endif