Accueil Explorer Aide
S'inscrire Connexion
wareck
/
lede_packages
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Aborescence: dcc3d482f3
Branches Tags
lede_packages
/
devel
/
gcc
/
patches
/
203-musl_powerpc.patch

203-musl_powerpc.patch 7.4 KB
Historique Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209 
  1. 

  2. gcc/Changelog:
    3. 

  3. 

  4. 2015-04-24  Gregor Richards  <gregor.richards@uwaterloo.ca>
    5. 

  5. 	    Szabolcs Nagy  <szabolcs.nagy@arm.com>
    6. 

  6. 

  7. 	* config.gcc (secure_plt): Add *-linux*-musl*.
    8. 

  8. 	* config/rs6000/linux64.h (MUSL_DYNAMIC_LINKER32): Define.
    9. 

  9. 	(MUSL_DYNAMIC_LINKER64): Define.
    10. 

  10. 	(GNU_USER_DYNAMIC_LINKER32): Update.
    11. 

  11. 	(GNU_USER_DYNAMIC_LINKER64): Update.
    12. 

  12. 	(CHOOSE_DYNAMIC_LINKER): Update.
    13. 

  13. 

  14. 	* config/rs6000/secureplt.h (LINK_SECURE_PLT_DEFAULT_SPEC): Define.
    15. 

  15. 	* config/rs6000/sysv4.h (GNU_USER_DYNAMIC_LINKER): Update.
    16. 

  16. 	(MUSL_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER_E,)
    17. 

  17. 	(INCLUDE_DEFAULTS_MUSL_GPP, INCLUDE_DEFAULTS_MUSL_LOCAL,)
    18. 

  18. 	(INCLUDE_DEFAULTS_MUSL_PREFIX, INCLUDE_DEFAULTS_MUSL_CROSS,)
    19. 

  19. 	(INCLUDE_DEFAULTS_MUSL_TOOL, INCLUDE_DEFAULTS_MUSL_NATIVE): Define.
    20. 

  20. 	(LINK_SECURE_PLT_DEFAULT_SPEC): Define.
    21. 

  21. 	(CHOOSE_DYNAMIC_LINKER, LINK_TARGET_SPEC, LINK_OS_LINUX_SPEC): Update.
    22. 

  22. 

  23. 	* config/rs6000/sysv4le.h (MUSL_DYNAMIC_LINKER_E): Define.
    24. 

  24. 

  25. --- a/gcc/config/rs6000/linux64.h
    26. 

  26. +++ b/gcc/config/rs6000/linux64.h
    27. 

  27. @@ -365,17 +365,21 @@ extern int dot_symbols;
    28. 

  28.  #endif
    29. 

  29.  #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    30. 

  30.  #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    31. 

  31. +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E ".so.1"
    32. 

  32. +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E ".so.1"
    33. 

  33.  #if DEFAULT_LIBC == LIBC_UCLIBC
    34. 

  34. -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
    35. 

  35. +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
    36. 

  36.  #elif DEFAULT_LIBC == LIBC_GLIBC
    37. 

  37. -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
    38. 

  38. +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
    39. 

  39. +#elif DEFAULT_LIBC == LIBC_MUSL
    40. 

  40. +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
    41. 

  41.  #else
    42. 

  42.  #error "Unsupported DEFAULT_LIBC"
    43. 

  43.  #endif
    44. 

  44.  #define GNU_USER_DYNAMIC_LINKER32 \
    45. 

  45. -  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
    46. 

  46. +  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
    47. 

  47.  #define GNU_USER_DYNAMIC_LINKER64 \
    48. 

  48. -  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
    49. 

  49. +  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
    50. 

  50.  
    51. 

  51.  #undef  DEFAULT_ASM_ENDIAN
    52. 

  52.  #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
    53. 

  53. --- a/gcc/config/rs6000/secureplt.h
    54. 

  54. +++ b/gcc/config/rs6000/secureplt.h
    55. 

  55. @@ -18,3 +18,4 @@ along with GCC; see the file COPYING3.
    56. 

  56.  <http://www.gnu.org/licenses/>.  */
    57. 

  57.  
    58. 

  58.  #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
    59. 

  59. +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
    60. 

  60. --- a/gcc/config/rs6000/sysv4.h
    61. 

  61. +++ b/gcc/config/rs6000/sysv4.h
    62. 

  62. @@ -537,6 +537,9 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
    63. 

  63.  #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
    64. 

  64.  #define CC1_SECURE_PLT_DEFAULT_SPEC ""
    65. 

  65.  #endif
    66. 

  66. +#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
    67. 

  67. +#define LINK_SECURE_PLT_DEFAULT_SPEC ""
    68. 

  68. +#endif
    69. 

  69.  
    70. 

  70.  /* Pass -G xxx to the compiler.  */
    71. 

  71.  #undef CC1_SPEC
    72. 

  72. @@ -574,7 +577,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
    73. 

  73.  %{R*} \
    74. 

  74.  %(link_shlib) \
    75. 

  75.  %{!T*: %(link_start) } \
    76. 

  76. -%(link_os)"
    77. 

  77. +%(link_os)" \
    78. 

  78. +"%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
    79. 

  79.  
    80. 

  80.  /* Shared libraries are not default.  */
    81. 

  81.  #define LINK_SHLIB_SPEC "\
    82. 

  82. @@ -757,17 +761,22 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
    83. 

  83.  
    84. 

  84.  #define LINK_START_LINUX_SPEC ""
    85. 

  85.  
    86. 

  86. +#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","")
    87. 

  87. +
    88. 

  88.  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    89. 

  89.  #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
    90. 

  90. +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E ".so.1"
    91. 

  91.  #if DEFAULT_LIBC == LIBC_UCLIBC
    92. 

  92. -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
    93. 

  93. +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
    94. 

  94. +#elif DEFAULT_LIBC == LIBC_MUSL
    95. 

  95. +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
    96. 

  96.  #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
    97. 

  97. -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
    98. 

  98. +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
    99. 

  99.  #else
    100. 

  100.  #error "Unsupported DEFAULT_LIBC"
    101. 

  101.  #endif
    102. 

  102.  #define GNU_USER_DYNAMIC_LINKER \
    103. 

  103. -  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
    104. 

  104. +  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
    105. 

  105.  
    106. 

  106.  #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
    107. 

  107.    %{rdynamic:-export-dynamic} \
    108. 

  108. @@ -889,6 +898,7 @@ ncrtn.o%s"
    109. 

  109.    { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
    110. 

  110.    { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
    111. 

  111.    { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
    112. 

  112. +  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
    113. 

  113.    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    114. 

  114.    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    115. 

  115.    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
    116. 

  116. @@ -943,3 +953,72 @@ ncrtn.o%s"
    117. 

  117.  /* This target uses the sysv4.opt file.  */
    118. 

  118.  #define TARGET_USES_SYSV4_OPT 1
    119. 

  119.  
    120. 

  120. +/* Include order changes for musl, same as in generic linux.h.  */
    121. 

  121. +#if DEFAULT_LIBC == LIBC_MUSL
    122. 

  122. +#define INCLUDE_DEFAULTS_MUSL_GPP			\
    123. 

  123. +    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
    124. 

  124. +      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
    125. 

  125. +    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
    126. 

  126. +      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
    127. 

  127. +    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
    128. 

  128. +      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
    129. 

  129. +
    130. 

  130. +#ifdef LOCAL_INCLUDE_DIR
    131. 

  131. +#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
    132. 

  132. +    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
    133. 

  133. +    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
    134. 

  134. +#else
    135. 

  135. +#define INCLUDE_DEFAULTS_MUSL_LOCAL
    136. 

  136. +#endif
    137. 

  137. +
    138. 

  138. +#ifdef PREFIX_INCLUDE_DIR
    139. 

  139. +#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
    140. 

  140. +    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
    141. 

  141. +#else
    142. 

  142. +#define INCLUDE_DEFAULTS_MUSL_PREFIX
    143. 

  143. +#endif
    144. 

  144. +
    145. 

  145. +#ifdef CROSS_INCLUDE_DIR
    146. 

  146. +#define INCLUDE_DEFAULTS_MUSL_CROSS			\
    147. 

  147. +    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
    148. 

  148. +#else
    149. 

  149. +#define INCLUDE_DEFAULTS_MUSL_CROSS
    150. 

  150. +#endif
    151. 

  151. +
    152. 

  152. +#ifdef TOOL_INCLUDE_DIR
    153. 

  153. +#define INCLUDE_DEFAULTS_MUSL_TOOL			\
    154. 

  154. +    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
    155. 

  155. +#else
    156. 

  156. +#define INCLUDE_DEFAULTS_MUSL_TOOL
    157. 

  157. +#endif
    158. 

  158. +
    159. 

  159. +#ifdef NATIVE_SYSTEM_HEADER_DIR
    160. 

  160. +#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
    161. 

  161. +    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
    162. 

  162. +    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
    163. 

  163. +#else
    164. 

  164. +#define INCLUDE_DEFAULTS_MUSL_NATIVE
    165. 

  165. +#endif
    166. 

  166. +
    167. 

  167. +#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
    168. 

  168. +# undef INCLUDE_DEFAULTS_MUSL_LOCAL
    169. 

  169. +# define INCLUDE_DEFAULTS_MUSL_LOCAL
    170. 

  170. +# undef INCLUDE_DEFAULTS_MUSL_NATIVE
    171. 

  171. +# define INCLUDE_DEFAULTS_MUSL_NATIVE
    172. 

  172. +#else
    173. 

  173. +# undef INCLUDE_DEFAULTS_MUSL_CROSS
    174. 

  174. +# define INCLUDE_DEFAULTS_MUSL_CROSS
    175. 

  175. +#endif
    176. 

  176. +
    177. 

  177. +#undef INCLUDE_DEFAULTS
    178. 

  178. +#define INCLUDE_DEFAULTS				\
    179. 

  179. +  {							\
    180. 

  180. +    INCLUDE_DEFAULTS_MUSL_GPP				\
    181. 

  181. +    INCLUDE_DEFAULTS_MUSL_PREFIX			\
    182. 

  182. +    INCLUDE_DEFAULTS_MUSL_CROSS				\
    183. 

  183. +    INCLUDE_DEFAULTS_MUSL_TOOL				\
    184. 

  184. +    INCLUDE_DEFAULTS_MUSL_NATIVE			\
    185. 

  185. +    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
    186. 

  186. +    { 0, 0, 0, 0, 0, 0 }				\
    187. 

  187. +  }
    188. 

  188. +#endif
    189. 

  189. --- a/gcc/config/rs6000/sysv4le.h
    190. 

  190. +++ b/gcc/config/rs6000/sysv4le.h
    191. 

  191. @@ -31,3 +31,5 @@
    192. 

  192.  /* Little-endian PowerPC64 Linux uses the ELF v2 ABI by default.  */
    193. 

  193.  #define LINUX64_DEFAULT_ABI_ELFv2
    194. 

  194.  
    195. 

  195. +#undef MUSL_DYNAMIC_LINKER_E
    196. 

  196. +#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","le")
    197. 

  197. --- a/gcc/config.gcc
    198. 

  198. +++ b/gcc/config.gcc
    199. 

  199. @@ -2416,6 +2416,10 @@ powerpc*-*-linux*)
    200. 

  200.  	    powerpc*-*-linux*paired*)
    201. 

  201.  		tm_file="${tm_file} rs6000/750cl.h" ;;
    202. 

  202.  	esac
    203. 

  203. +	case ${target} in
    204. 

  204. +		*-linux*-musl*)
    205. 

  205. +			enable_secureplt=yes ;;
    206. 

  206. +	esac
    207. 

  207.  	if test x${enable_secureplt} = xyes; then
    208. 

  208.  		tm_file="rs6000/secureplt.h ${tm_file}"
    209. 

  209.  	fi
    210.