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