Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Tree: c786ca2fcb
Branches Tags
buildroot
/
package
/
gcc
/
5.5.0
/
905-add-musl-support-to-gcc.patch

905-add-musl-support-to-gcc.patch 5.2 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130 
  1. From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
    2. 

  2. Date: Fri, 8 May 2015 08:30:40 +0000 (+0000)
    3. 

  3. Subject: [PATCH 0/13] Add musl support to GCC
    4. 

  4. X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=f2d678afa5b8385d763b93772d73d6bf80a9739e
    5. 

  5. 

  6. [PATCH 0/13] Add musl support to GCC
    7. 

  7. 

  8. 2015-05-08  Szabolcs Nagy  <szabolcs.nagy@arm.com>
    9. 

  9. 

  10. 	* config/glibc-stdint.h (OPTION_MUSL): Define.
    11. 

  11. 	(INT_FAST16_TYPE, INT_FAST32_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE):
    12. 

  12. 	Change the definition based on OPTION_MUSL for 64 bit targets.
    13. 

  13. 	* config/linux.h (OPTION_MUSL): Redefine.
    14. 

  14. 	* config/alpha/linux.h (OPTION_MUSL): Redefine.
    15. 

  15. 	* config/rs6000/linux.h (OPTION_MUSL): Redefine.
    16. 

  16. 	* config/rs6000/linux64.h (OPTION_MUSL): Redefine.
    17. 

  17. 

  18. 

  19. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222905 138bc75d-0d04-0410-961f-82ee72b054a4
    20. 

  20. ---
    21. 

  21. 

  22. Index: b/gcc/config/alpha/linux.h
    23. 

  23. ===================================================================
    24. 

  24. --- a/gcc/config/alpha/linux.h
    25. 

  25. +++ b/gcc/config/alpha/linux.h
    26. 

  26. @@ -61,10 +61,14 @@
    27. 

  27.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
    28. 

  28.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
    29. 

  29.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
    30. 

  30. +#undef OPTION_MUSL
    31. 

  31. +#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
    32. 

  32.  #else
    33. 

  33.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
    34. 

  34.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
    35. 

  35.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
    36. 

  36. +#undef OPTION_MUSL
    37. 

  37. +#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
    38. 

  38.  #endif
    39. 

  39.  
    40. 

  40.  /* Determine what functions are present at the runtime;
    41. 

  41. Index: b/gcc/config/glibc-stdint.h
    42. 

  42. ===================================================================
    43. 

  43. --- a/gcc/config/glibc-stdint.h
    44. 

  44. +++ b/gcc/config/glibc-stdint.h
    45. 

  45. @@ -22,6 +22,12 @@
    46. 

  46.  see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    47. 

  47.  <http://www.gnu.org/licenses/>.  */
    48. 

  48.  
    49. 

  49. +/* Systems using musl libc should use this header and make sure
    50. 

  50. +   OPTION_MUSL is defined correctly before using the TYPE macros. */
    51. 

  51. +#ifndef OPTION_MUSL
    52. 

  52. +#define OPTION_MUSL 0
    53. 

  53. +#endif
    54. 

  54. +
    55. 

  55.  #define SIG_ATOMIC_TYPE "int"
    56. 

  56.  
    57. 

  57.  #define INT8_TYPE "signed char"
    58. 

  58. @@ -43,12 +49,12 @@
    59. 

  59.  #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
    60. 

  60.  
    61. 

  61.  #define INT_FAST8_TYPE "signed char"
    62. 

  62. -#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
    63. 

  63. -#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
    64. 

  64. +#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
    65. 

  65. +#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
    66. 

  66.  #define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
    67. 

  67.  #define UINT_FAST8_TYPE "unsigned char"
    68. 

  68. -#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
    69. 

  69. -#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
    70. 

  70. +#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
    71. 

  71. +#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
    72. 

  72.  #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
    73. 

  73.  
    74. 

  74.  #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
    75. 

  75. Index: b/gcc/config/linux.h
    76. 

  76. ===================================================================
    77. 

  77. --- a/gcc/config/linux.h
    78. 

  78. +++ b/gcc/config/linux.h
    79. 

  79. @@ -32,11 +32,13 @@
    80. 

  80.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
    81. 

  81.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
    82. 

  82.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
    83. 

  83. +#undef OPTION_MUSL
    84. 

  84.  #define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
    85. 

  85.  #else
    86. 

  86.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
    87. 

  87.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
    88. 

  88.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
    89. 

  89. +#undef OPTION_MUSL
    90. 

  90.  #define OPTION_MUSL   (linux_libc == LIBC_MUSL)
    91. 

  91.  #endif
    92. 

  92.  
    93. 

  93. Index: b/gcc/config/rs6000/linux.h
    94. 

  94. ===================================================================
    95. 

  95. --- a/gcc/config/rs6000/linux.h
    96. 

  96. +++ b/gcc/config/rs6000/linux.h
    97. 

  97. @@ -30,10 +30,14 @@
    98. 

  98.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
    99. 

  99.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
    100. 

  100.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
    101. 

  101. +#undef OPTION_MUSL
    102. 

  102. +#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
    103. 

  103.  #else
    104. 

  104.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
    105. 

  105.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
    106. 

  106.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
    107. 

  107. +#undef OPTION_MUSL
    108. 

  108. +#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
    109. 

  109.  #endif
    110. 

  110.  
    111. 

  111.  /* Determine what functions are present at the runtime;
    112. 

  112. Index: b/gcc/config/rs6000/linux64.h
    113. 

  113. ===================================================================
    114. 

  114. --- a/gcc/config/rs6000/linux64.h
    115. 

  115. +++ b/gcc/config/rs6000/linux64.h
    116. 

  116. @@ -299,10 +299,14 @@
    117. 

  117.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
    118. 

  118.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
    119. 

  119.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
    120. 

  120. +#undef OPTION_MUSL
    121. 

  121. +#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
    122. 

  122.  #else
    123. 

  123.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
    124. 

  124.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
    125. 

  125.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
    126. 

  126. +#undef OPTION_MUSL
    127. 

  127. +#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
    128. 

  128.  #endif
    129. 

  129.  
    130. 

  130.  /* Determine what functions are present at the runtime;
    131.