logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

0006-add-musl-support-to-gcc.patch (3086B)

    

  1. SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
  2. SPDX-FileCopyrightText: 2015 Szabolcs Nagy <szabolcs.nagy@arm.com>
  4. SPDX-License-Identifier: GPL-2.0-or-later
  6. Backported from upstream commit 07ad804bfdbe0fa3406c5f2ff51d7c4c29a783c8
  8. Add musl support to GCC
  10. 2015-05-08  Szabolcs Nagy  <szabolcs.nagy@arm.com>
  12. 	* config/glibc-stdint.h (OPTION_MUSL): Define.
  13. 	(INT_FAST16_TYPE, INT_FAST32_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE):
  14. 	Change the definition based on OPTION_MUSL for 64 bit targets.
  15. 	* config/linux.h (OPTION_MUSL): Redefine.
  16. 	* config/alpha/linux.h (OPTION_MUSL): Redefine.
  17. 	* config/rs6000/linux.h (OPTION_MUSL): Redefine.
  18. 	* config/rs6000/linux64.h (OPTION_MUSL): Redefine.
  20. From-SVN: r222905
  22. --- gcc-4.7.4/gcc/config/glibc-stdint.h
  23. +++ gcc-4.7.4/gcc/config/glibc-stdint.h
  24. @@ -22,6 +22,12 @@ a copy of the GCC Runtime Library Exception along with this program;
  25.  see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  26.  <http://www.gnu.org/licenses/>.  */
  27.  
  28. +/* Systems using musl libc should use this header and make sure
  29. +   OPTION_MUSL is defined correctly before using the TYPE macros. */
  30. +#ifndef OPTION_MUSL
  31. +#define OPTION_MUSL 0
  32. +#endif
  33. +
  34.  #define SIG_ATOMIC_TYPE "int"
  35.  
  36.  #define INT8_TYPE "signed char"
  37. @@ -43,12 +49,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  38.  #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
  39.  
  40.  #define INT_FAST8_TYPE "signed char"
  41. -#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
  42. -#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
  43. +#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
  44. +#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
  45.  #define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
  46.  #define UINT_FAST8_TYPE "unsigned char"
  47. -#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
  48. -#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
  49. +#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
  50. +#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
  51.  #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
  52.  
  53.  #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
  54. --- gcc-4.7.4/gcc/config/linux.h
  55. +++ gcc-4.7.4/gcc/config/linux.h
  56. @@ -33,11 +33,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  57.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
  58.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
  59.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
  60. +#undef OPTION_MUSL
  61.  #define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
  62.  #else
  63.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
  64.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
  65.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
  66. +#undef OPTION_MUSL
  67.  #define OPTION_MUSL   (linux_libc == LIBC_MUSL)
  68.  #endif
  69.