0003-cilk-fix-build-without-wchar.patch 3.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. From a605662776a3bd50ebbb84509958cb42f44ec998 Mon Sep 17 00:00:00 2001
  2. From: Peter Korsgaard <peter@korsgaard.com>
  3. Date: Tue, 2 May 2017 23:21:46 +0200
  4. Subject: [PATCH] cilk: fix build without wchar
  5. When building against uClibc with wchar support disabled, WCHAR_MIN and
  6. WCHAR_MAX are not defined leading to compilation errors.
  7. Fix it by only including the wchar code if available.
  8. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  9. [Romain: convert to git patch]
  10. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  11. ---
  12. libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++
  13. 1 file changed, 8 insertions(+)
  14. diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h
  15. index 641aa823901..4f8e0102b90 100644
  16. --- a/libcilkrts/include/cilk/reducer_min_max.h
  17. +++ b/libcilkrts/include/cilk/reducer_min_max.h
  18. @@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C
  19. CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN)
  20. CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0)
  21. CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN)
  22. +#ifdef WCHAR_MIN
  23. CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN)
  24. +#endif
  25. CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN)
  26. CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0)
  27. CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN)
  28. @@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C
  29. CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN)
  30. CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0)
  31. CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN)
  32. +#ifdef WCHAR_MIN
  33. CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN)
  34. +#endif
  35. CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN)
  36. CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0)
  37. CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN)
  38. @@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C
  39. CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX)
  40. CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX)
  41. CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX)
  42. +#ifdef WCHAR_MAX
  43. CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX)
  44. +#endif
  45. CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX)
  46. CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX)
  47. CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX)
  48. @@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C
  49. CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX)
  50. CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX)
  51. CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX)
  52. +#ifdef WCHAR_MAX
  53. CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX)
  54. +#endif
  55. CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX)
  56. CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX)
  57. CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX)
  58. --
  59. 2.21.0