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
298
|
From d4fd6975671477721936060771aa4d7d07fb0910 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 18 Sep 2018 14:54:08 +0200
Subject: [PATCH libgpg-error] syscfg: Support ARC CPUs and simplify aliasing
table.
* src/mkheader.c (xmalloc): New.
(xstrdup): Implement using xmalloc.
(canon_host_triplet): Add supporr for arc CPU. Adjust alias table to
also alias *-pc-*. Rename ibm to unknown. Add internal arg. Add
unknown vendor hack.
(main): New mode to just print the canonicalized form.
* src/Makefile.am (lock_obj_pub): s/-(pc|ibm)-/-unknown/. Also rename
files accordingly.
--
config.sub does no real aliasing and thus we would need to add several
vendors to the alising tables despite that this has no technical
meanding. Instead we now replace the vendor with "unknown" for the
4-part-"triplets". This change will make maintenace easier.
Signed-off-by: Werner Koch <wk@gnupg.org>
Upstream-Status: Backport [ http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=48c8f8ddfc80 ]
---
src/Makefile.am | 16 ++--
src/mkheader.c | 92 ++++++++++++++++---
...-gnu.h => lock-obj-pub.i686-unknown-gnu.h} | 0
... lock-obj-pub.i686-unknown-kfreebsd-gnu.h} | 0
... => lock-obj-pub.i686-unknown-linux-gnu.h} | 0
...=> lock-obj-pub.s390x-unknown-linux-gnu.h} | 0
...ock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} | 0
...> lock-obj-pub.x86_64-unknown-linux-gnu.h} | 0
...ock-obj-pub.x86_64-unknown-linux-gnux32.h} | 0
... lock-obj-pub.x86_64-unknown-linux-musl.h} | 0
10 files changed, 85 insertions(+), 23 deletions(-)
rename src/syscfg/{lock-obj-pub.i686-pc-gnu.h => lock-obj-pub.i686-unknown-gnu.h} (100%)
rename src/syscfg/{lock-obj-pub.i686-pc-kfreebsd-gnu.h => lock-obj-pub.i686-unknown-kfreebsd-gnu.h} (100%)
rename src/syscfg/{lock-obj-pub.i686-pc-linux-gnu.h => lock-obj-pub.i686-unknown-linux-gnu.h} (100%)
rename src/syscfg/{lock-obj-pub.s390x-ibm-linux-gnu.h => lock-obj-pub.s390x-unknown-linux-gnu.h} (100%)
rename src/syscfg/{lock-obj-pub.x86_64-pc-kfreebsd-gnu.h => lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} (100%)
rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnu.h => lock-obj-pub.x86_64-unknown-linux-gnu.h} (100%)
rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnux32.h => lock-obj-pub.x86_64-unknown-linux-gnux32.h} (100%)
rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-musl.h => lock-obj-pub.x86_64-unknown-linux-musl.h} (100%)
diff --git a/src/Makefile.am b/src/Makefile.am
index 42998e46a3bc..8ec582ef99fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,9 +52,9 @@ lock_obj_pub = \
syscfg/lock-obj-pub.arm-apple-darwin.h \
syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h \
syscfg/lock-obj-pub.i386-apple-darwin.h \
- syscfg/lock-obj-pub.i686-pc-gnu.h \
- syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h \
- syscfg/lock-obj-pub.i686-pc-linux-gnu.h \
+ syscfg/lock-obj-pub.i686-unknown-gnu.h \
+ syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h \
+ syscfg/lock-obj-pub.i686-unknown-linux-gnu.h \
syscfg/lock-obj-pub.m68k-unknown-linux-gnu.h \
syscfg/lock-obj-pub.mips-unknown-linux-gnu.h \
syscfg/lock-obj-pub.mips64el-unknown-linux-gnuabi64.h \
@@ -66,16 +66,16 @@ lock_obj_pub = \
syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \
syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \
syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \
- syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \
+ syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h \
syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \
syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \
syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \
syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \
syscfg/lock-obj-pub.x86_64-apple-darwin.h \
- syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h \
- syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h \
- syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h \
- syscfg/lock-obj-pub.x86_64-pc-linux-musl.h \
+ syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \
+ syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \
+ syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \
+ syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h \
syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h \
syscfg/lock-obj-pub.ia64-unknown-linux-gnu.h \
syscfg/lock-obj-pub.mingw32.h
diff --git a/src/mkheader.c b/src/mkheader.c
index 2fc5fada66a4..7a38a1bec1a4 100644
--- a/src/mkheader.c
+++ b/src/mkheader.c
@@ -51,17 +51,27 @@ xfree (void *a)
static char *
-xstrdup (const char *string)
+xmalloc (size_t n)
{
char *p;
- size_t len = strlen (string) + 1;
- p = malloc (len);
+ p = malloc (n);
if (!p)
{
fputs (PGM ": out of core\n", stderr);
exit (1);
}
+ return p;
+}
+
+
+static char *
+xstrdup (const char *string)
+{
+ char *p;
+ size_t len = strlen (string) + 1;
+
+ p = xmalloc (len);
memcpy (p, string, len);
return p;
}
@@ -69,23 +79,31 @@ xstrdup (const char *string)
/* Return a malloced string with TRIPLET. If TRIPLET has an alias
return that instead. In general build-aux/config.sub should do the
- aliasing but some returned triplets are anyway identical and thus we
- use this function to map it to the canonical form. */
+ aliasing but some returned triplets are anyway identical and thus
+ we use this function to map it to the canonical form.
+ NO_VENDOR_HACK is for internal use; caller must call with 0. */
static char *
-canon_host_triplet (const char *triplet)
+canon_host_triplet (const char *triplet, int no_vendor_hack)
{
struct {
const char *name;
const char *alias;
} tbl[] = {
- {"i486-pc-linux-gnu", "i686-pc-linux-gnu" },
+ {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" },
{"i586-pc-linux-gnu" },
- {"i486-pc-gnu", "i686-pc-gnu"},
+ {"i686-pc-linux-gnu" },
+ {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */
+
+ {"i486-pc-gnu", "i686-unknown-gnu"},
{"i586-pc-gnu"},
- {"i486-pc-kfreebsd-gnu", "i686-pc-kfreebsd-gnu"},
+ {"i686-pc-gnu"},
+
+ {"i486-pc-kfreebsd-gnu", "i686-unknown-kfreebsd-gnu"},
{"i586-pc-kfreebsd-gnu"},
+ {"i686-pc-kfreebsd-gnu"},
- {"x86_64-pc-linux-gnuhardened1", "x86_64-pc-linux-gnu" },
+ {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" },
+ {"x86_64-pc-linux-gnu" },
{"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" },
@@ -98,6 +116,7 @@ canon_host_triplet (const char *triplet)
};
int i;
const char *lastalias = NULL;
+ const char *s;
for (i=0; tbl[i].name; i++)
{
@@ -110,6 +129,36 @@ canon_host_triplet (const char *triplet)
return xstrdup (lastalias);
}
}
+ for (i=0, s=triplet; *s; s++)
+ if (*s == '-')
+ i++;
+ if (i > 2 && !no_vendor_hack)
+ {
+ /* We have a 4 part "triplet": CPU-VENDOR-KERNEL-SYSTEM where
+ * the last two parts replace the OS part of a real triplet.
+ * The VENDOR part is then in general useless because
+ * KERNEL-SYSTEM is specific enough. We now do a second pass by
+ * replacing VENDOR with "unknown". */
+ char *p;
+ char *buf = xmalloc (strlen (triplet) + 7 + 1);
+
+ for (p=buf,s=triplet,i=0; *s; s++)
+ {
+ *p++ = *s;
+ if (*s == '-' && ++i == 1)
+ {
+ memcpy (p, "unknown-",8);
+ p += 8;
+ for (s++; *s != '-'; s++)
+ ;
+ }
+ }
+ *p = 0;
+ p = canon_host_triplet (buf, 1);
+ xfree (buf);
+ return p;
+ }
+
return xstrdup (triplet);
}
@@ -558,7 +607,7 @@ write_special (const char *fname, int lnr, const char *tag)
int
main (int argc, char **argv)
{
- FILE *fp;
+ FILE *fp = NULL;
char line[LINESIZE];
int lnr = 0;
const char *fname, *s;
@@ -571,11 +620,22 @@ main (int argc, char **argv)
argc--; argv++;
}
- if (argc != 6)
+ if (argc == 1)
+ {
+ /* Print just the canonicalized host triplet. */
+ host_triplet = canon_host_triplet (argv[0], 0);
+ printf ("%s\n", host_triplet);
+ goto leave;
+ }
+ else if (argc == 6)
+ ; /* Standard operation. */
+ else
{
fputs ("usage: " PGM
" host_os host_triplet template.h config.h"
- " version version_number\n",
+ " version version_number\n"
+ " " PGM
+ " host_triplet\n",
stderr);
return 1;
}
@@ -586,7 +646,7 @@ main (int argc, char **argv)
hdr_version = argv[4];
hdr_version_number = argv[5];
- host_triplet = canon_host_triplet (host_triplet_raw);
+ host_triplet = canon_host_triplet (host_triplet_raw, 0);
srcdir = malloc (strlen (fname) + 2 + 1);
if (!srcdir)
@@ -677,13 +737,15 @@ main (int argc, char **argv)
"End:\n"
"*/\n", stdout);
+ leave:
if (ferror (stdout))
{
fprintf (stderr, PGM ": error writing to stdout: %s\n", strerror (errno));
return 1;
}
- fclose (fp);
+ if (fp)
+ fclose (fp);
xfree (host_triplet);
return 0;
diff --git a/src/syscfg/lock-obj-pub.i686-pc-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-gnu.h
similarity index 100%
rename from src/syscfg/lock-obj-pub.i686-pc-gnu.h
rename to src/syscfg/lock-obj-pub.i686-unknown-gnu.h
diff --git a/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h
similarity index 100%
rename from src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h
rename to src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h
diff --git a/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h
similarity index 100%
rename from src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h
rename to src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h
diff --git a/src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h b/src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h
similarity index 100%
rename from src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h
rename to src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h
diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h
similarity index 100%
rename from src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h
rename to src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h
diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h
similarity index 100%
rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h
rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h
diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h
similarity index 100%
rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h
rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h
diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h
similarity index 100%
rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h
rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h
--
2.17.1
|
