logo

live-bootstrap

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

0005-musl-libc-config.patch (10608B)

    

  1. SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
  2. SPDX-FileCopyrightText: 2015 Gregor Richards <gregor.richards@uwaterloo.ca>
  3. SPDX-FileCopyrightText: 2015 Szabolcs Nagy <szabolcs.nagy@arm.com>
  5. SPDX-License-Identifier: GPL-2.0-or-later
  7. Backported from upstream commit 755658a56b57beca14b5fb70afdf1e588a058f7f
  9. musl libc config
  11. 2015-05-08  Gregor Richards  <gregor.richards@uwaterloo.ca>
  12. 	    Szabolcs Nagy  <szabolcs.nagy@arm.com>
  14. 	* config.gcc (LIBC_MUSL): New tm_defines macro.
  15. 	* config/linux.h (OPTION_MUSL): Define.
  16. 	(MUSL_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER32,)
  17. 	(MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32,)
  18. 	(INCLUDE_DEFAULTS_MUSL_GPP, INCLUDE_DEFAULTS_MUSL_LOCAL,)
  19. 	(INCLUDE_DEFAULTS_MUSL_PREFIX, INCLUDE_DEFAULTS_MUSL_CROSS,)
  20. 	(INCLUDE_DEFAULTS_MUSL_TOOL, INCLUDE_DEFAULTS_MUSL_NATIVE): Define.
  21. 	* config/linux.opt (mmusl): New option.
  22. 	* doc/invoke.texi (GNU/Linux Options): Document -mmusl.
  23. 	* configure.ac (gcc_cv_libc_provides_ssp): Add *-*-musl*.
  24. 	(gcc_cv_target_dl_iterate_phdr): Add *-linux-musl*.
  25. 	* configure: Regenerate.
  27. Co-Authored-By: Szabolcs Nagy <szabolcs.nagy@arm.com>
  29. From-SVN: r222904
  31. --- gcc-4.7.4/gcc/config.gcc
  32. +++ gcc-4.7.4/gcc/config.gcc
  33. @@ -522,7 +522,7 @@ case ${target} in
  34.  esac
  35.  
  36.  # Common C libraries.
  37. -tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
  38. +tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
  39.  
  40.  # Common parts for widely ported systems.
  41.  case ${target} in
  42. @@ -625,6 +625,9 @@ case ${target} in
  43.      *-*-*uclibc*)
  44.        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
  45.        ;;
  46. +    *-*-*musl*)
  47. +      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
  48. +      ;;
  49.      *)
  50.        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
  51.        ;;
  52. --- gcc-4.7.4/gcc/config/linux.h
  53. +++ gcc-4.7.4/gcc/config/linux.h
  54. @@ -33,10 +33,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  55.  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
  56.  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
  57.  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
  58. +#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
  59.  #else
  60.  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
  61.  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
  62.  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
  63. +#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
  64.  #endif
  65.  
  66.  #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
  67. @@ -51,21 +53,25 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  68.      } while (0)
  69.  
  70.  /* Determine which dynamic linker to use depending on whether GLIBC or
  71. -   uClibc or Bionic is the default C library and whether
  72. -   -muclibc or -mglibc or -mbionic has been passed to change the default.  */
  73. +   uClibc or Bionic or musl is the default C library and whether
  74. +   -muclibc or -mglibc or -mbionic or -mmusl has been passed to change
  75. +   the default.  */
  76.  
  77. -#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
  78. -  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
  79. +#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
  80. +  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
  81.  
  82.  #if DEFAULT_LIBC == LIBC_GLIBC
  83. -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
  84. -  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
  85. +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
  86. +  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
  87.  #elif DEFAULT_LIBC == LIBC_UCLIBC
  88. -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
  89. -  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
  90. +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
  91. +  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
  92.  #elif DEFAULT_LIBC == LIBC_BIONIC
  93. -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
  94. -  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
  95. +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
  96. +  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
  97. +#elif DEFAULT_LIBC == LIBC_MUSL
  98. +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
  99. +  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
  100.  #else
  101.  #error "Unsupported DEFAULT_LIBC"
  102.  #endif /* DEFAULT_LIBC */
  103. @@ -82,19 +88,24 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  104.  #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
  105.  #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
  106.  #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
  107. +/* Should be redefined for each target that supports musl.  */
  108. +#define MUSL_DYNAMIC_LINKER "/dev/null"
  109. +#define MUSL_DYNAMIC_LINKER32 "/dev/null"
  110. +#define MUSL_DYNAMIC_LINKER64 "/dev/null"
  111. +#define MUSL_DYNAMIC_LINKERX32 "/dev/null"
  112.  
  113.  #define GNU_USER_DYNAMIC_LINKER						\
  114.    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
  115. -			 BIONIC_DYNAMIC_LINKER)
  116. +			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
  117.  #define GNU_USER_DYNAMIC_LINKER32					\
  118.    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
  119. -			 BIONIC_DYNAMIC_LINKER32)
  120. +			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
  121.  #define GNU_USER_DYNAMIC_LINKER64					\
  122.    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
  123. -			 BIONIC_DYNAMIC_LINKER64)
  124. +			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
  125.  #define GNU_USER_DYNAMIC_LINKERX32					\
  126.    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
  127. -			 BIONIC_DYNAMIC_LINKERX32)
  128. +			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
  129.  
  130.  /* Determine whether the entire c99 runtime
  131.     is present in the runtime library.  */
  132. @@ -108,3 +119,74 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  133.  /* Whether we have Bionic libc runtime */
  134.  #undef TARGET_HAS_BIONIC
  135.  #define TARGET_HAS_BIONIC (OPTION_BIONIC)
  136. +
  137. +/* musl avoids problematic includes by rearranging the include directories.
  138. + * Unfortunately, this is mostly duplicated from cppdefault.c */
  139. +#if DEFAULT_LIBC == LIBC_MUSL
  140. +#define INCLUDE_DEFAULTS_MUSL_GPP			\
  141. +    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
  142. +      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
  143. +    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
  144. +      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
  145. +    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
  146. +      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
  147. +
  148. +#ifdef LOCAL_INCLUDE_DIR
  149. +#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
  150. +    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
  151. +    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
  152. +#else
  153. +#define INCLUDE_DEFAULTS_MUSL_LOCAL
  154. +#endif
  155. +
  156. +#ifdef PREFIX_INCLUDE_DIR
  157. +#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
  158. +    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
  159. +#else
  160. +#define INCLUDE_DEFAULTS_MUSL_PREFIX
  161. +#endif
  162. +
  163. +#ifdef CROSS_INCLUDE_DIR
  164. +#define INCLUDE_DEFAULTS_MUSL_CROSS			\
  165. +    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
  166. +#else
  167. +#define INCLUDE_DEFAULTS_MUSL_CROSS
  168. +#endif
  169. +
  170. +#ifdef TOOL_INCLUDE_DIR
  171. +#define INCLUDE_DEFAULTS_MUSL_TOOL			\
  172. +    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
  173. +#else
  174. +#define INCLUDE_DEFAULTS_MUSL_TOOL
  175. +#endif
  176. +
  177. +#ifdef NATIVE_SYSTEM_HEADER_DIR
  178. +#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
  179. +    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
  180. +    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
  181. +#else
  182. +#define INCLUDE_DEFAULTS_MUSL_NATIVE
  183. +#endif
  184. +
  185. +#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
  186. +# undef INCLUDE_DEFAULTS_MUSL_LOCAL
  187. +# define INCLUDE_DEFAULTS_MUSL_LOCAL
  188. +# undef INCLUDE_DEFAULTS_MUSL_NATIVE
  189. +# define INCLUDE_DEFAULTS_MUSL_NATIVE
  190. +#else
  191. +# undef INCLUDE_DEFAULTS_MUSL_CROSS
  192. +# define INCLUDE_DEFAULTS_MUSL_CROSS
  193. +#endif
  194. +
  195. +#undef INCLUDE_DEFAULTS
  196. +#define INCLUDE_DEFAULTS				\
  197. +  {							\
  198. +    INCLUDE_DEFAULTS_MUSL_GPP				\
  199. +    INCLUDE_DEFAULTS_MUSL_PREFIX			\
  200. +    INCLUDE_DEFAULTS_MUSL_CROSS				\
  201. +    INCLUDE_DEFAULTS_MUSL_TOOL				\
  202. +    INCLUDE_DEFAULTS_MUSL_NATIVE			\
  203. +    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
  204. +    { 0, 0, 0, 0, 0, 0 }				\
  205. +  }
  206. +#endif
  207. --- gcc-4.7.4/gcc/config/linux.opt
  208. +++ gcc-4.7.4/gcc/config/linux.opt
  209. @@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_libc,LIBC_GLIBC) Negative(muclibc)
  210.  Use GNU C library
  211.  
  212.  muclibc
  213. -Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
  214. +Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
  215.  Use uClibc C library
  216. +
  217. +mmusl
  218. +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
  219. +Use musl C library
  220. --- gcc-4.7.4/gcc/configure.ac
  221. +++ gcc-4.7.4/gcc/configure.ac
  222. @@ -4669,6 +4669,9 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
  223.        gcc_cv_libc_provides_ssp,
  224.        [gcc_cv_libc_provides_ssp=no
  225.      case "$target" in
  226. +	*-*-musl*)
  227. +	  # All versions of musl provide stack protector
  228. +	  gcc_cv_libc_provides_ssp=yes;;
  229.         *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
  230.        [# glibc 2.4 and later provides __stack_chk_fail and
  231.        # either __stack_chk_guard, or TLS access to stack guard canary.
  232. @@ -4702,6 +4705,7 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
  233.  	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
  234.  	 # simply assert that glibc does provide this, which is true for all
  235.  	 # realistically usable GNU/Hurd configurations.
  236. +	 # All supported versions of musl provide it as well
  237.  	 gcc_cv_libc_provides_ssp=yes;;
  238.         *-*-darwin* | *-*-freebsd*)
  239.  	 AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
  240. @@ -4767,6 +4771,9 @@ case "$target" in
  241.        gcc_cv_target_dl_iterate_phdr=no
  242.      fi
  243.      ;;
  244. +  *-linux-musl*)
  245. +    gcc_cv_target_dl_iterate_phdr=yes
  246. +    ;;
  247.  esac
  248.  GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
  249.  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
  250. --- gcc-4.7.4/gcc/doc/invoke.texi
  251. +++ gcc-4.7.4/gcc/doc/invoke.texi
  252. @@ -595,7 +595,7 @@ Objective-C and Objective-C++ Dialects}.
  253.  -mcpu=@var{cpu}}
  254.  
  255.  @emph{GNU/Linux Options}
  256. -@gccoptlist{-mglibc -muclibc -mbionic -mandroid @gol
  257. +@gccoptlist{-mglibc -muclibc -mmusl -mbionic -mandroid @gol
  258.  -tno-android-cc -tno-android-ld}
  259.  
  260.  @emph{H8/300 Options}
  261. @@ -12879,13 +12879,19 @@ These @samp{-m} options are defined for GNU/Linux targets:
  262.  @item -mglibc
  263.  @opindex mglibc
  264.  Use the GNU C library.  This is the default except
  265. -on @samp{*-*-linux-*uclibc*} and @samp{*-*-linux-*android*} targets.
  266. +on @samp{*-*-linux-*uclibc*}, @samp{*-*-linux-*musl*} and
  267. +@samp{*-*-linux-*android*} targets.
  268.  
  269.  @item -muclibc
  270.  @opindex muclibc
  271.  Use uClibc C library.  This is the default on
  272.  @samp{*-*-linux-*uclibc*} targets.
  273.  
  274. +@item -mmusl
  275. +@opindex mmusl
  276. +Use the musl C library.  This is the default on
  277. +@samp{*-*-linux-*musl*} targets.
  278. +
  279.  @item -mbionic
  280.  @opindex mbionic
  281.  Use Bionic C library.  This is the default on