gcc10.patch 14 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299
  1. diff -ru a/src/others/squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c b/src/others/squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c
  2. --- a/src/others/squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  3. +++ b/src/others/squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c 2020-12-24 13:37:25.000000000 +0000
  4. @@ -144,7 +144,8 @@
  5. struct file_info *dupl[65536], *frag_dups[65536];
  6. int dup_files = 0;
  7. -int swap, silent = TRUE;
  8. +extern int swap;
  9. +int silent = TRUE;
  10. int file_count = 0, sym_count = 0, dev_count = 0, dir_count = 0, fifo_count = 0, sock_count = 0;
  11. /* list of exclude dirs/files */
  12. diff -ru a/src/others/squashfs-3.0-e2100/mksquashfs.c b/src/others/squashfs-3.0-e2100/mksquashfs.c
  13. --- a/src/others/squashfs-3.0-e2100/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  14. +++ b/src/others/squashfs-3.0-e2100/mksquashfs.c 2020-12-24 13:19:31.000000000 +0000
  15. @@ -88,7 +88,8 @@
  16. /* filesystem flags for building */
  17. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  18. int noI = 0, noD = 0, check_data = 0;
  19. -int swap, silent = TRUE;
  20. +extern int swap;
  21. +int silent = TRUE;
  22. long long global_uid = -1, global_gid = -1;
  23. /* superblock attributes */
  24. diff -ru a/src/others/squashfs-3.2-r2/mksquashfs.c b/src/others/squashfs-3.2-r2/mksquashfs.c
  25. --- a/src/others/squashfs-3.2-r2/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  26. +++ b/src/others/squashfs-3.2-r2/mksquashfs.c 2020-12-24 13:20:26.000000000 +0000
  27. @@ -96,7 +96,8 @@
  28. /* filesystem flags for building */
  29. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  30. int noI = 0, noD = 0, check_data = 0;
  31. -int swap, silent = TRUE;
  32. +extern int swap;
  33. +int silent = TRUE;
  34. long long global_uid = -1, global_gid = -1;
  35. int exportable = TRUE;
  36. int progress = TRUE;
  37. diff -ru a/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c
  38. --- a/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  39. +++ b/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c 2020-12-24 13:22:21.000000000 +0000
  40. @@ -98,7 +98,8 @@
  41. /* filesystem flags for building */
  42. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  43. int noI = 0, noD = 0, check_data = 0;
  44. -int swap, silent = TRUE;
  45. +extern int swap;
  46. +int silent = TRUE;
  47. long long global_uid = -1, global_gid = -1;
  48. int exportable = TRUE;
  49. int progress = TRUE;
  50. diff -ru a/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c
  51. --- a/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  52. +++ b/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c 2020-12-24 13:21:23.000000000 +0000
  53. @@ -98,7 +98,8 @@
  54. /* filesystem flags for building */
  55. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  56. int noI = 0, noD = 0, check_data = 0;
  57. -int swap, silent = TRUE;
  58. +extern int swap;
  59. +int silent = TRUE;
  60. long long global_uid = -1, global_gid = -1;
  61. int exportable = TRUE;
  62. int progress = TRUE;
  63. diff -ru a/src/others/squashfs-3.2-r2-rtn12/mksquashfs.c b/src/others/squashfs-3.2-r2-rtn12/mksquashfs.c
  64. --- a/src/others/squashfs-3.2-r2-rtn12/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  65. +++ b/src/others/squashfs-3.2-r2-rtn12/mksquashfs.c 2020-12-24 13:23:33.000000000 +0000
  66. @@ -100,7 +100,8 @@
  67. /* filesystem flags for building */
  68. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  69. int noI = 0, noD = 0, check_data = 0;
  70. -int swap, silent = TRUE;
  71. +extern int swap;
  72. +int silent = TRUE;
  73. long long global_uid = -1, global_gid = -1;
  74. int exportable = TRUE;
  75. int progress = TRUE;
  76. diff -ru a/src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c b/src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c
  77. --- a/src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  78. +++ b/src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c 2020-12-24 13:22:57.000000000 +0000
  79. @@ -99,7 +99,8 @@
  80. /* filesystem flags for building */
  81. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  82. int noI = 0, noD = 0, check_data = 0;
  83. -int swap, silent = TRUE;
  84. +extern int swap;
  85. +int silent = TRUE;
  86. long long global_uid = -1, global_gid = -1;
  87. int exportable = TRUE;
  88. int progress = TRUE;
  89. diff -ru a/src/others/squashfs-3.3/mksquashfs.c b/src/others/squashfs-3.3/mksquashfs.c
  90. --- a/src/others/squashfs-3.3/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  91. +++ b/src/others/squashfs-3.3/mksquashfs.c 2020-12-24 13:24:07.000000000 +0000
  92. @@ -99,7 +99,8 @@
  93. /* filesystem flags for building */
  94. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  95. int noI = 0, noD = 0, check_data = 0;
  96. -int swap, silent = TRUE;
  97. +extern int swap;
  98. +int silent = TRUE;
  99. long long global_uid = -1, global_gid = -1;
  100. int exportable = TRUE;
  101. int progress = TRUE;
  102. diff -ru a/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/mksquashfs.c
  103. --- a/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  104. +++ b/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/mksquashfs.c 2020-12-24 13:26:03.000000000 +0000
  105. @@ -100,7 +100,8 @@
  106. /* filesystem flags for building */
  107. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  108. int noI = 0, noD = 0, check_data = 0;
  109. -int swap, silent = TRUE;
  110. +extern int swap;
  111. +int silent = TRUE;
  112. long long global_uid = -1, global_gid = -1;
  113. int exportable = TRUE;
  114. int progress = TRUE;
  115. diff -ru a/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c
  116. --- a/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  117. +++ b/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c 2020-12-24 13:25:08.000000000 +0000
  118. @@ -100,7 +100,8 @@
  119. /* filesystem flags for building */
  120. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  121. int noI = 0, noD = 0, check_data = 0;
  122. -int swap, silent = TRUE;
  123. +extern int swap;
  124. +int silent = TRUE;
  125. long long global_uid = -1, global_gid = -1;
  126. int exportable = TRUE;
  127. int progress = TRUE;
  128. diff -ru a/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c
  129. --- a/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  130. +++ b/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c 2020-12-24 13:29:27.000000000 +0000
  131. @@ -115,7 +115,8 @@
  132. /* filesystem flags for building */
  133. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  134. int noI = 0, noD = 0, check_data = 0;
  135. -int swap, silent = TRUE;
  136. +extern int swap;
  137. +int silent = TRUE;
  138. long long global_uid = -1, global_gid = -1;
  139. int exportable = TRUE;
  140. int progress = TRUE;
  141. @@ -2704,7 +2705,7 @@
  142. }
  143. -inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, struct inode_info *inode_info, void *data, struct dir_info *dir)
  144. +extern void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, struct inode_info *inode_info, void *data, struct dir_info *dir)
  145. {
  146. if((dir->count % DIR_ENTRIES) == 0)
  147. if((dir->list = realloc(dir->list, (dir->count + DIR_ENTRIES) * sizeof(struct dir_ent *))) == NULL)
  148. diff -ru a/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c b/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c
  149. --- a/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c 2020-12-24 15:18:56.000000000 +0000
  150. +++ b/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c 2020-12-24 13:32:03.000000000 +0000
  151. @@ -48,7 +48,7 @@
  152. #include <sys/ioctl.h>
  153. #include <sys/time.h>
  154. -#include <sys/sysctl.h>
  155. +/*#include <sys/sysctl.h> */
  156. #ifndef linux
  157. #define __BYTE_ORDER BYTE_ORDER
  158. diff -ru a/src/others/squashfs-4.0-lzma/mksquashfs.c b/src/others/squashfs-4.0-lzma/mksquashfs.c
  159. --- a/src/others/squashfs-4.0-lzma/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  160. +++ b/src/others/squashfs-4.0-lzma/mksquashfs.c 2020-12-24 13:33:51.000000000 +0000
  161. @@ -3129,7 +3129,7 @@
  162. }
  163. -inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  164. +extern void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  165. struct inode_info *inode_info, void *data, struct dir_info *dir)
  166. {
  167. if((dir->count % DIR_ENTRIES) == 0) {
  168. diff -ru a/src/others/squashfs-4.0-realtek/mksquashfs.c b/src/others/squashfs-4.0-realtek/mksquashfs.c
  169. --- a/src/others/squashfs-4.0-realtek/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  170. +++ b/src/others/squashfs-4.0-realtek/mksquashfs.c 2020-12-24 13:34:55.000000000 +0000
  171. @@ -3177,7 +3177,7 @@
  172. }
  173. -inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  174. +extern void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  175. struct inode_info *inode_info, struct dir_info *dir)
  176. {
  177. if((dir->count % DIR_ENTRIES) == 0) {
  178. diff -ru a/src/others/squashfs-4.2/squashfs-tools/mksquashfs.c b/src/others/squashfs-4.2/squashfs-tools/mksquashfs.c
  179. --- a/src/others/squashfs-4.2/squashfs-tools/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  180. +++ b/src/others/squashfs-4.2/squashfs-tools/mksquashfs.c 2020-12-24 13:40:53.000000000 +0000
  181. @@ -3355,7 +3355,7 @@
  182. }
  183. -inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  184. +extern void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  185. struct inode_info *inode_info, struct dir_info *dir)
  186. {
  187. if((dir->count % DIR_ENTRIES) == 0) {
  188. diff -ru a/src/others/squashfs-4.2-official/mksquashfs.c b/src/others/squashfs-4.2-official/mksquashfs.c
  189. --- a/src/others/squashfs-4.2-official/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  190. +++ b/src/others/squashfs-4.2-official/mksquashfs.c 2020-12-24 13:41:44.000000000 +0000
  191. @@ -3340,7 +3340,7 @@
  192. }
  193. -inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  194. +extern void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  195. struct inode_info *inode_info, struct dir_info *dir)
  196. {
  197. if((dir->count % DIR_ENTRIES) == 0) {
  198. diff -ru a/src/squashfs-2.1-r2/mksquashfs.c b/src/squashfs-2.1-r2/mksquashfs.c
  199. --- a/src/squashfs-2.1-r2/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  200. +++ b/src/squashfs-2.1-r2/mksquashfs.c 2020-12-24 13:16:32.000000000 +0000
  201. @@ -64,7 +64,8 @@
  202. /* filesystem flags for building */
  203. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  204. int noI = 0, noD = 0, check_data = 0;
  205. -int swap, silent = TRUE;
  206. +extern int swap;
  207. +int silent = TRUE;
  208. long long global_uid = -1, global_gid = -1;
  209. int filesystem_minor_version = SQUASHFS_MINOR;
  210. diff -ru a/src/squashfs-3.0/mksquashfs.c b/src/squashfs-3.0/mksquashfs.c
  211. --- a/src/squashfs-3.0/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  212. +++ b/src/squashfs-3.0/mksquashfs.c 2020-12-24 13:17:14.000000000 +0000
  213. @@ -119,7 +119,8 @@
  214. /* filesystem flags for building */
  215. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  216. int noI = 0, noD = 0, check_data = 0;
  217. -int swap, silent = TRUE;
  218. +extern int swap;
  219. +int silent = TRUE;
  220. long long global_uid = -1, global_gid = -1;
  221. /* superblock attributes */
  222. diff -ru a/src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c b/src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c
  223. --- a/src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c 2020-12-24 15:18:56.000000000 +0000
  224. +++ b/src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c 2020-12-24 13:18:26.000000000 +0000
  225. @@ -105,7 +105,8 @@
  226. /* filesystem flags for building */
  227. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  228. int noI = 0, noD = 0, check_data = 0;
  229. -int swap, silent = TRUE;
  230. +extern int swap;
  231. +int silent = TRUE;
  232. long long global_uid = -1, global_gid = -1;
  233. /* superblock attributes */
  234. diff -ru a/src/webcomp-tools/common.c b/src/webcomp-tools/common.c
  235. --- a/src/webcomp-tools/common.c 2020-12-24 10:46:32.000000000 +0000
  236. +++ b/src/webcomp-tools/common.c 2020-12-30 18:07:11.000000000 +0000
  237. @@ -10,6 +10,8 @@
  238. #include <elf.h>
  239. #include "common.h"
  240. +struct global globals;
  241. +
  242. /* Given the physical and virtual section loading addresses, convert a virtual address to a physical file offset */
  243. uint32_t file_offset(uint32_t address, uint32_t virtual, uint32_t physical)
  244. {
  245. diff -ru a/src/webcomp-tools/common.h b/src/webcomp-tools/common.h
  246. --- a/src/webcomp-tools/common.h 2020-12-24 15:18:56.000000000 +0000
  247. +++ b/src/webcomp-tools/common.h 2020-12-24 13:44:11.000000000 +0000
  248. @@ -38,7 +38,7 @@
  249. struct new_file_entry *new_entry;
  250. };
  251. -struct global
  252. +extern struct global
  253. {
  254. int endianess;
  255. int use_new_format;
  256. diff -ru a/src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c
  257. --- a/src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c 2020-12-24 15:19:26.000000000 +0000
  258. +++ b/src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c 2020-12-24 12:58:42.000000000 +0000
  259. @@ -118,7 +118,8 @@
  260. /* filesystem flags for building */
  261. int duplicate_checking = 1, noF = 0, no_fragments = 0, always_use_fragments = 0;
  262. int noI = 0, noD = 0, check_data = 0;
  263. -int swap, silent = TRUE;
  264. +extern int swap;
  265. +int silent = TRUE;
  266. long long global_uid = -1, global_gid = -1;
  267. int exportable = TRUE;
  268. int progress = TRUE;
  269. @@ -2718,7 +2719,7 @@
  270. }
  271. -inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, struct inode_info *inode_info, void *data, struct dir_info *dir)
  272. +extern void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, struct inode_info *inode_info, void *data, struct dir_info *dir)
  273. {
  274. if((dir->count % DIR_ENTRIES) == 0)
  275. if((dir->list = realloc(dir->list, (dir->count + DIR_ENTRIES) * sizeof(struct dir_ent *))) == NULL)