Home Explore Help
Register Sign In
libreCMC
/
libreCMC
17
18
Fork 12
Files Issues 59 Pull Requests 3 Wiki
Tree: 35ddabda7f
Branches Tags
libreCMC
/
toolchain
/
gcc
/
patches
/
5.5.0
/
250-add-musl.patch

250-add-musl.patch 4.8 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120 
  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. --- a/gcc/config/alpha/linux.h
    23. 

  23. +++ b/gcc/config/alpha/linux.h
    24. 

  24. @@ -61,10 +61,14 @@ along with GCC; see the file COPYING3.
    25. 

  25.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
    26. 

  26.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
    27. 

  27.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
    28. 

  28. +#undef OPTION_MUSL
    29. 

  29. +#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
    30. 

  30.  #else
    31. 

  31.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
    32. 

  32.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
    33. 

  33.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
    34. 

  34. +#undef OPTION_MUSL
    35. 

  35. +#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
    36. 

  36.  #endif
    37. 

  37.  
    38. 

  38.  /* Determine what functions are present at the runtime;
    39. 

  39. --- a/gcc/config/glibc-stdint.h
    40. 

  40. +++ b/gcc/config/glibc-stdint.h
    41. 

  41. @@ -22,6 +22,12 @@ a copy of the GCC Runtime Library Except
    42. 

  42.  see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    43. 

  43.  <http://www.gnu.org/licenses/>.  */
    44. 

  44.  
    45. 

  45. +/* Systems using musl libc should use this header and make sure
    46. 

  46. +   OPTION_MUSL is defined correctly before using the TYPE macros. */
    47. 

  47. +#ifndef OPTION_MUSL
    48. 

  48. +#define OPTION_MUSL 0
    49. 

  49. +#endif
    50. 

  50. +
    51. 

  51.  #define SIG_ATOMIC_TYPE "int"
    52. 

  52.  
    53. 

  53.  #define INT8_TYPE "signed char"
    54. 

  54. @@ -43,12 +49,12 @@ see the files COPYING3 and COPYING.RUNTI
    55. 

  55.  #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
    56. 

  56.  
    57. 

  57.  #define INT_FAST8_TYPE "signed char"
    58. 

  58. -#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
    59. 

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

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

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

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

  63.  #define UINT_FAST8_TYPE "unsigned char"
    64. 

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

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

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

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

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

  69.  
    70. 

  70.  #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
    71. 

  71. --- a/gcc/config/linux.h
    72. 

  72. +++ b/gcc/config/linux.h
    73. 

  73. @@ -32,11 +32,13 @@ see the files COPYING3 and COPYING.RUNTI
    74. 

  74.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
    75. 

  75.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
    76. 

  76.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
    77. 

  77. +#undef OPTION_MUSL
    78. 

  78.  #define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
    79. 

  79.  #else
    80. 

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

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

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

  83. +#undef OPTION_MUSL
    84. 

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

  85.  #endif
    86. 

  86.  
    87. 

  87. --- a/gcc/config/rs6000/linux.h
    88. 

  88. +++ b/gcc/config/rs6000/linux.h
    89. 

  89. @@ -30,10 +30,14 @@
    90. 

  90.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
    91. 

  91.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
    92. 

  92.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
    93. 

  93. +#undef OPTION_MUSL
    94. 

  94. +#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
    95. 

  95.  #else
    96. 

  96.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
    97. 

  97.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
    98. 

  98.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
    99. 

  99. +#undef OPTION_MUSL
    100. 

  100. +#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
    101. 

  101.  #endif
    102. 

  102.  
    103. 

  103.  /* Determine what functions are present at the runtime;
    104. 

  104. --- a/gcc/config/rs6000/linux64.h
    105. 

  105. +++ b/gcc/config/rs6000/linux64.h
    106. 

  106. @@ -299,10 +299,14 @@ extern int dot_symbols;
    107. 

  107.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
    108. 

  108.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
    109. 

  109.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
    110. 

  110. +#undef OPTION_MUSL
    111. 

  111. +#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
    112. 

  112.  #else
    113. 

  113.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
    114. 

  114.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
    115. 

  115.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
    116. 

  116. +#undef OPTION_MUSL
    117. 

  117. +#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
    118. 

  118.  #endif
    119. 

  119.  
    120. 

  120.  /* Determine what functions are present at the runtime;
    121.