nokogiri 1.12.5 → 1.13.6

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of nokogiri might be problematic. Click here for more details.

Files changed (103) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -0
  3. data/README.md +9 -7
  4. data/bin/nokogiri +63 -50
  5. data/dependencies.yml +13 -64
  6. data/ext/nokogiri/extconf.rb +64 -44
  7. data/ext/nokogiri/html4_sax_parser_context.c +2 -3
  8. data/ext/nokogiri/xml_document.c +35 -35
  9. data/ext/nokogiri/xml_document_fragment.c +0 -2
  10. data/ext/nokogiri/xml_dtd.c +2 -2
  11. data/ext/nokogiri/xml_encoding_handler.c +25 -11
  12. data/ext/nokogiri/xml_node.c +638 -333
  13. data/ext/nokogiri/xml_reader.c +37 -11
  14. data/ext/nokogiri/xml_sax_parser_context.c +10 -3
  15. data/ext/nokogiri/xml_xpath_context.c +72 -49
  16. data/ext/nokogiri/xslt_stylesheet.c +107 -9
  17. data/gumbo-parser/src/parser.c +0 -11
  18. data/lib/nokogiri/class_resolver.rb +67 -0
  19. data/lib/nokogiri/css/node.rb +9 -8
  20. data/lib/nokogiri/css/parser.rb +360 -341
  21. data/lib/nokogiri/css/parser.y +249 -244
  22. data/lib/nokogiri/css/parser_extras.rb +22 -20
  23. data/lib/nokogiri/css/syntax_error.rb +1 -0
  24. data/lib/nokogiri/css/tokenizer.rb +4 -3
  25. data/lib/nokogiri/css/tokenizer.rex +3 -2
  26. data/lib/nokogiri/css/xpath_visitor.rb +179 -82
  27. data/lib/nokogiri/css.rb +38 -6
  28. data/lib/nokogiri/decorators/slop.rb +8 -7
  29. data/lib/nokogiri/extension.rb +1 -1
  30. data/lib/nokogiri/gumbo.rb +1 -0
  31. data/lib/nokogiri/html.rb +16 -10
  32. data/lib/nokogiri/html4/builder.rb +1 -0
  33. data/lib/nokogiri/html4/document.rb +88 -77
  34. data/lib/nokogiri/html4/document_fragment.rb +11 -7
  35. data/lib/nokogiri/html4/element_description.rb +1 -0
  36. data/lib/nokogiri/html4/element_description_defaults.rb +426 -520
  37. data/lib/nokogiri/html4/entity_lookup.rb +2 -1
  38. data/lib/nokogiri/html4/sax/parser.rb +5 -2
  39. data/lib/nokogiri/html4/sax/parser_context.rb +1 -0
  40. data/lib/nokogiri/html4/sax/push_parser.rb +7 -7
  41. data/lib/nokogiri/html4.rb +11 -5
  42. data/lib/nokogiri/html5/document.rb +27 -10
  43. data/lib/nokogiri/html5/document_fragment.rb +5 -2
  44. data/lib/nokogiri/html5/node.rb +10 -3
  45. data/lib/nokogiri/html5.rb +69 -64
  46. data/lib/nokogiri/jruby/dependencies.rb +10 -9
  47. data/lib/nokogiri/syntax_error.rb +1 -0
  48. data/lib/nokogiri/version/constant.rb +2 -1
  49. data/lib/nokogiri/version/info.rb +20 -13
  50. data/lib/nokogiri/version.rb +1 -0
  51. data/lib/nokogiri/xml/attr.rb +5 -3
  52. data/lib/nokogiri/xml/attribute_decl.rb +2 -1
  53. data/lib/nokogiri/xml/builder.rb +34 -32
  54. data/lib/nokogiri/xml/cdata.rb +2 -1
  55. data/lib/nokogiri/xml/character_data.rb +1 -0
  56. data/lib/nokogiri/xml/document.rb +144 -103
  57. data/lib/nokogiri/xml/document_fragment.rb +41 -38
  58. data/lib/nokogiri/xml/dtd.rb +3 -2
  59. data/lib/nokogiri/xml/element_content.rb +1 -0
  60. data/lib/nokogiri/xml/element_decl.rb +2 -1
  61. data/lib/nokogiri/xml/entity_decl.rb +3 -2
  62. data/lib/nokogiri/xml/entity_reference.rb +1 -0
  63. data/lib/nokogiri/xml/namespace.rb +2 -0
  64. data/lib/nokogiri/xml/node/save_options.rb +8 -4
  65. data/lib/nokogiri/xml/node.rb +521 -351
  66. data/lib/nokogiri/xml/node_set.rb +50 -54
  67. data/lib/nokogiri/xml/notation.rb +12 -0
  68. data/lib/nokogiri/xml/parse_options.rb +12 -7
  69. data/lib/nokogiri/xml/pp/character_data.rb +8 -6
  70. data/lib/nokogiri/xml/pp/node.rb +24 -26
  71. data/lib/nokogiri/xml/pp.rb +1 -0
  72. data/lib/nokogiri/xml/processing_instruction.rb +2 -1
  73. data/lib/nokogiri/xml/reader.rb +17 -19
  74. data/lib/nokogiri/xml/relax_ng.rb +1 -0
  75. data/lib/nokogiri/xml/sax/document.rb +20 -19
  76. data/lib/nokogiri/xml/sax/parser.rb +37 -34
  77. data/lib/nokogiri/xml/sax/parser_context.rb +7 -3
  78. data/lib/nokogiri/xml/sax/push_parser.rb +5 -5
  79. data/lib/nokogiri/xml/sax.rb +1 -0
  80. data/lib/nokogiri/xml/schema.rb +7 -6
  81. data/lib/nokogiri/xml/searchable.rb +93 -62
  82. data/lib/nokogiri/xml/syntax_error.rb +5 -4
  83. data/lib/nokogiri/xml/text.rb +1 -0
  84. data/lib/nokogiri/xml/xpath/syntax_error.rb +2 -1
  85. data/lib/nokogiri/xml/xpath.rb +12 -0
  86. data/lib/nokogiri/xml/xpath_context.rb +2 -3
  87. data/lib/nokogiri/xml.rb +4 -3
  88. data/lib/nokogiri/xslt/stylesheet.rb +1 -0
  89. data/lib/nokogiri/xslt.rb +21 -13
  90. data/lib/nokogiri.rb +19 -16
  91. data/lib/xsd/xmlparser/nokogiri.rb +25 -24
  92. data/patches/libxml2/0004-use-glibc-strlen.patch +3 -3
  93. data/patches/libxml2/0006-update-automake-files-for-arm64.patch +2443 -1914
  94. data/patches/libxml2/0008-htmlParseComment-handle-abruptly-closed-comments.patch +61 -0
  95. data/patches/libxml2/0009-allow-wildcard-namespaces.patch +77 -0
  96. data/patches/libxslt/0001-update-automake-files-for-arm64.patch +2445 -1919
  97. data/ports/archives/libxml2-2.9.14.tar.xz +0 -0
  98. data/ports/archives/libxslt-1.1.35.tar.xz +0 -0
  99. metadata +109 -31
  100. data/patches/libxml2/0007-Fix-XPath-recursion-limit.patch +0 -31
  101. data/patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch +0 -19
  102. data/ports/archives/libxml2-2.9.12.tar.gz +0 -0
  103. data/ports/archives/libxslt-1.1.34.tar.gz +0 -0
data/patches/libxml2/0006-update-automake-files-for-arm64.patch CHANGED
@@ -9,7 +9,7 @@ aarch64/arm64/M1 can compile.
9
9
  -# Copyright 1992-2018 Free Software Foundation, Inc.
10
10
  +# Copyright 1992-2020 Free Software Foundation, Inc.
11
11
 
12
- -timestamp='2018-08-29'
12
+ -timestamp='2018-02-22'
13
13
  +timestamp='2020-11-07'
14
14
 
15
15
  # This file is free software; you can redistribute it and/or modify it
@@ -41,1045 +41,2213 @@ aarch64/arm64/M1 can compile.
41
41
  exit 1 ;;
42
42
 
43
43
  *local*)
44
- @@ -111,7 +111,8 @@
44
+ @@ -110,1223 +110,1167 @@
45
+ exit 1;;
45
46
  esac
46
47
 
47
- # Split fields of configuration type
48
- -IFS="-" read -r field1 field2 field3 field4 <<EOF
48
+ -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
49
+ -# Here we must recognize all the valid KERNEL-OS combinations.
50
+ -maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
51
+ -case $maybe_os in
52
+ - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
53
+ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
54
+ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
55
+ - kopensolaris*-gnu* | cloudabi*-eabi* | \
56
+ - storm-chaos* | os2-emx* | rtmk-nova*)
57
+ - os=-$maybe_os
58
+ - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
59
+ - ;;
60
+ - android-linux)
61
+ - os=-linux-android
62
+ - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
63
+ - ;;
64
+ - *)
65
+ - basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
66
+ - if [ "$basic_machine" != "$1" ]
67
+ - then os=`echo "$1" | sed 's/.*-/-/'`
68
+ - else os=; fi
69
+ - ;;
70
+ -esac
71
+ -
72
+ -### Let's recognize common machines as not being operating systems so
73
+ -### that things like config.sub decstation-3100 work. We also
74
+ -### recognize some manufacturers as not being operating systems, so we
75
+ -### can provide default operating systems below.
76
+ -case $os in
77
+ - -sun*os*)
78
+ - # Prevent following clause from handling this invalid input.
79
+ - ;;
80
+ - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
81
+ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
82
+ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
83
+ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
84
+ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
85
+ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
86
+ - -apple | -axis | -knuth | -cray | -microblaze*)
87
+ - os=
88
+ - basic_machine=$1
89
+ - ;;
90
+ - -bluegene*)
91
+ - os=-cnk
92
+ - ;;
93
+ - -sim | -cisco | -oki | -wec | -winbond)
94
+ - os=
95
+ - basic_machine=$1
96
+ - ;;
97
+ - -scout)
98
+ - ;;
99
+ - -wrs)
100
+ - os=-vxworks
101
+ - basic_machine=$1
102
+ - ;;
103
+ - -chorusos*)
104
+ - os=-chorusos
105
+ - basic_machine=$1
106
+ - ;;
107
+ - -chorusrdb)
108
+ - os=-chorusrdb
109
+ - basic_machine=$1
110
+ - ;;
111
+ - -hiux*)
112
+ - os=-hiuxwe2
113
+ - ;;
114
+ - -sco6)
115
+ - os=-sco5v6
116
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
117
+ - ;;
118
+ - -sco5)
119
+ - os=-sco3.2v5
120
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
121
+ - ;;
122
+ - -sco4)
123
+ - os=-sco3.2v4
124
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
125
+ - ;;
126
+ - -sco3.2.[4-9]*)
127
+ - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
128
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
129
+ - ;;
130
+ - -sco3.2v[4-9]*)
131
+ - # Don't forget version if it is 3.2v4 or newer.
132
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
133
+ - ;;
134
+ - -sco5v6*)
135
+ - # Don't forget version if it is 3.2v4 or newer.
136
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
137
+ - ;;
138
+ - -sco*)
139
+ - os=-sco3.2v2
140
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
141
+ - ;;
142
+ - -udk*)
143
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
144
+ - ;;
145
+ - -isc)
146
+ - os=-isc2.2
147
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
148
+ - ;;
149
+ - -clix*)
150
+ - basic_machine=clipper-intergraph
151
+ - ;;
152
+ - -isc*)
153
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
154
+ - ;;
155
+ - -lynx*178)
156
+ - os=-lynxos178
157
+ - ;;
158
+ - -lynx*5)
159
+ - os=-lynxos5
160
+ +# Split fields of configuration type
49
161
  +# shellcheck disable=SC2162
50
162
  +IFS="-" read field1 field2 field3 field4 <<EOF
51
- $1
52
- EOF
53
-
54
- @@ -123,37 +124,36 @@
163
+ +$1
164
+ +EOF
165
+ +
166
+ +# Separate into logical components for further validation
167
+ +case $1 in
168
+ + *-*-*-*-*)
169
+ + echo Invalid configuration \`"$1"\': more than four components >&2
170
+ + exit 1
55
171
  ;;
56
- *-*-*-*)
57
- basic_machine=$field1-$field2
58
- - os=$field3-$field4
172
+ - -lynx*)
173
+ - os=-lynxos
174
+ + *-*-*-*)
175
+ + basic_machine=$field1-$field2
59
176
  + basic_os=$field3-$field4
60
177
  ;;
61
- *-*-*)
62
- # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
63
- # parts
64
- maybe_os=$field2-$field3
65
- case $maybe_os in
66
- - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
67
- - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
178
+ - -ptx*)
179
+ - basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
180
+ + *-*-*)
181
+ + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
182
+ + # parts
183
+ + maybe_os=$field2-$field3
184
+ + case $maybe_os in
68
185
  + nto-qnx* | linux-* | uclinux-uclibc* \
69
- | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
70
- | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
71
- | storm-chaos* | os2-emx* | rtmk-nova*)
72
- basic_machine=$field1
73
- - os=$maybe_os
186
+ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
187
+ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
188
+ + | storm-chaos* | os2-emx* | rtmk-nova*)
189
+ + basic_machine=$field1
74
190
  + basic_os=$maybe_os
75
- ;;
76
- android-linux)
77
- basic_machine=$field1-unknown
78
- - os=linux-android
191
+ + ;;
192
+ + android-linux)
193
+ + basic_machine=$field1-unknown
79
194
  + basic_os=linux-android
80
- ;;
81
- *)
82
- basic_machine=$field1-$field2
83
- - os=$field3
195
+ + ;;
196
+ + *)
197
+ + basic_machine=$field1-$field2
84
198
  + basic_os=$field3
85
- ;;
86
- esac
199
+ + ;;
200
+ + esac
87
201
  ;;
88
- *-*)
89
- - # A lone config we happen to match not fitting any patern
202
+ - -psos*)
203
+ - os=-psos
204
+ + *-*)
90
205
  + # A lone config we happen to match not fitting any pattern
91
- case $field1-$field2 in
92
- decstation-3100)
93
- basic_machine=mips-dec
94
- - os=
206
+ + case $field1-$field2 in
207
+ + decstation-3100)
208
+ + basic_machine=mips-dec
95
209
  + basic_os=
96
- ;;
97
- *-*)
98
- # Second component is usually, but not always the OS
99
- @@ -161,7 +161,7 @@
100
- # Prevent following clause from handling this valid os
101
- sun*os*)
102
- basic_machine=$field1
103
- - os=$field2
210
+ + ;;
211
+ + *-*)
212
+ + # Second component is usually, but not always the OS
213
+ + case $field2 in
214
+ + # Prevent following clause from handling this valid os
215
+ + sun*os*)
216
+ + basic_machine=$field1
104
217
  + basic_os=$field2
105
- ;;
106
- # Manufacturers
107
- dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
108
- @@ -174,11 +174,11 @@
109
- | microblaze* | sim | cisco \
110
- | oki | wec | wrs | winbond)
111
- basic_machine=$field1-$field2
112
- - os=
218
+ + ;;
219
+ + # Manufacturers
220
+ + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
221
+ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
222
+ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \
223
+ + | convergent* | ncr* | news | 32* | 3600* | 3100* \
224
+ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
225
+ + | ultra | tti* | harris | dolphin | highlevel | gould \
226
+ + | cbm | ns | masscomp | apple | axis | knuth | cray \
227
+ + | microblaze* | sim | cisco \
228
+ + | oki | wec | wrs | winbond)
229
+ + basic_machine=$field1-$field2
113
230
  + basic_os=
114
- ;;
115
- *)
116
- basic_machine=$field1
117
- - os=$field2
231
+ + ;;
232
+ + *)
233
+ + basic_machine=$field1
118
234
  + basic_os=$field2
119
- ;;
120
- esac
121
- ;;
122
- @@ -190,450 +190,451 @@
123
- case $field1 in
124
- 386bsd)
125
- basic_machine=i386-pc
126
- - os=bsd
235
+ + ;;
236
+ + esac
237
+ + ;;
238
+ + esac
239
+ ;;
240
+ - -mint | -mint[0-9]*)
241
+ - basic_machine=m68k-atari
242
+ - os=-mint
243
+ + *)
244
+ + # Convert single-component short-hands not valid as part of
245
+ + # multi-component configurations.
246
+ + case $field1 in
247
+ + 386bsd)
248
+ + basic_machine=i386-pc
127
249
  + basic_os=bsd
128
- ;;
129
- a29khif)
130
- basic_machine=a29k-amd
131
- - os=udi
250
+ + ;;
251
+ + a29khif)
252
+ + basic_machine=a29k-amd
132
253
  + basic_os=udi
133
- ;;
134
- adobe68k)
135
- basic_machine=m68010-adobe
136
- - os=scout
254
+ + ;;
255
+ + adobe68k)
256
+ + basic_machine=m68010-adobe
137
257
  + basic_os=scout
138
- ;;
139
- alliant)
140
- basic_machine=fx80-alliant
141
- - os=
258
+ + ;;
259
+ + alliant)
260
+ + basic_machine=fx80-alliant
142
261
  + basic_os=
143
- ;;
144
- altos | altos3068)
145
- basic_machine=m68k-altos
146
- - os=
262
+ + ;;
263
+ + altos | altos3068)
264
+ + basic_machine=m68k-altos
147
265
  + basic_os=
148
- ;;
149
- am29k)
150
- basic_machine=a29k-none
151
- - os=bsd
266
+ + ;;
267
+ + am29k)
268
+ + basic_machine=a29k-none
152
269
  + basic_os=bsd
153
- ;;
154
- amdahl)
155
- basic_machine=580-amdahl
156
- - os=sysv
270
+ + ;;
271
+ + amdahl)
272
+ + basic_machine=580-amdahl
157
273
  + basic_os=sysv
158
- ;;
159
- amiga)
160
- basic_machine=m68k-unknown
161
- - os=
274
+ + ;;
275
+ + amiga)
276
+ + basic_machine=m68k-unknown
162
277
  + basic_os=
163
- ;;
164
- amigaos | amigados)
165
- basic_machine=m68k-unknown
166
- - os=amigaos
278
+ + ;;
279
+ + amigaos | amigados)
280
+ + basic_machine=m68k-unknown
167
281
  + basic_os=amigaos
168
- ;;
169
- amigaunix | amix)
170
- basic_machine=m68k-unknown
171
- - os=sysv4
282
+ + ;;
283
+ + amigaunix | amix)
284
+ + basic_machine=m68k-unknown
172
285
  + basic_os=sysv4
173
- ;;
174
- apollo68)
175
- basic_machine=m68k-apollo
176
- - os=sysv
286
+ + ;;
287
+ + apollo68)
288
+ + basic_machine=m68k-apollo
177
289
  + basic_os=sysv
178
- ;;
179
- apollo68bsd)
180
- basic_machine=m68k-apollo
181
- - os=bsd
290
+ + ;;
291
+ + apollo68bsd)
292
+ + basic_machine=m68k-apollo
182
293
  + basic_os=bsd
183
- ;;
184
- aros)
185
- basic_machine=i386-pc
186
- - os=aros
294
+ + ;;
295
+ + aros)
296
+ + basic_machine=i386-pc
187
297
  + basic_os=aros
188
- ;;
189
- aux)
190
- basic_machine=m68k-apple
191
- - os=aux
298
+ + ;;
299
+ + aux)
300
+ + basic_machine=m68k-apple
192
301
  + basic_os=aux
193
- ;;
194
- balance)
195
- basic_machine=ns32k-sequent
196
- - os=dynix
302
+ + ;;
303
+ + balance)
304
+ + basic_machine=ns32k-sequent
197
305
  + basic_os=dynix
198
- ;;
199
- blackfin)
200
- basic_machine=bfin-unknown
201
- - os=linux
306
+ + ;;
307
+ + blackfin)
308
+ + basic_machine=bfin-unknown
202
309
  + basic_os=linux
203
- ;;
204
- cegcc)
205
- basic_machine=arm-unknown
206
- - os=cegcc
310
+ + ;;
311
+ + cegcc)
312
+ + basic_machine=arm-unknown
207
313
  + basic_os=cegcc
208
- ;;
209
- convex-c1)
210
- basic_machine=c1-convex
211
- - os=bsd
314
+ + ;;
315
+ + convex-c1)
316
+ + basic_machine=c1-convex
212
317
  + basic_os=bsd
213
- ;;
214
- convex-c2)
215
- basic_machine=c2-convex
216
- - os=bsd
318
+ + ;;
319
+ + convex-c2)
320
+ + basic_machine=c2-convex
217
321
  + basic_os=bsd
218
- ;;
219
- convex-c32)
220
- basic_machine=c32-convex
221
- - os=bsd
322
+ + ;;
323
+ + convex-c32)
324
+ + basic_machine=c32-convex
222
325
  + basic_os=bsd
223
- ;;
224
- convex-c34)
225
- basic_machine=c34-convex
226
- - os=bsd
326
+ + ;;
327
+ + convex-c34)
328
+ + basic_machine=c34-convex
227
329
  + basic_os=bsd
228
- ;;
229
- convex-c38)
230
- basic_machine=c38-convex
231
- - os=bsd
330
+ + ;;
331
+ + convex-c38)
332
+ + basic_machine=c38-convex
232
333
  + basic_os=bsd
233
- ;;
234
- cray)
235
- basic_machine=j90-cray
236
- - os=unicos
334
+ + ;;
335
+ + cray)
336
+ + basic_machine=j90-cray
237
337
  + basic_os=unicos
238
- ;;
239
- crds | unos)
240
- basic_machine=m68k-crds
241
- - os=
338
+ + ;;
339
+ + crds | unos)
340
+ + basic_machine=m68k-crds
242
341
  + basic_os=
243
- ;;
244
- da30)
245
- basic_machine=m68k-da30
246
- - os=
342
+ + ;;
343
+ + da30)
344
+ + basic_machine=m68k-da30
247
345
  + basic_os=
248
- ;;
249
- decstation | pmax | pmin | dec3100 | decstatn)
250
- basic_machine=mips-dec
251
- - os=
346
+ + ;;
347
+ + decstation | pmax | pmin | dec3100 | decstatn)
348
+ + basic_machine=mips-dec
252
349
  + basic_os=
253
- ;;
254
- delta88)
255
- basic_machine=m88k-motorola
256
- - os=sysv3
350
+ + ;;
351
+ + delta88)
352
+ + basic_machine=m88k-motorola
257
353
  + basic_os=sysv3
258
- ;;
259
- dicos)
260
- basic_machine=i686-pc
261
- - os=dicos
354
+ + ;;
355
+ + dicos)
356
+ + basic_machine=i686-pc
262
357
  + basic_os=dicos
263
- ;;
264
- djgpp)
265
- basic_machine=i586-pc
266
- - os=msdosdjgpp
358
+ + ;;
359
+ + djgpp)
360
+ + basic_machine=i586-pc
267
361
  + basic_os=msdosdjgpp
268
- ;;
269
- ebmon29k)
270
- basic_machine=a29k-amd
271
- - os=ebmon
362
+ + ;;
363
+ + ebmon29k)
364
+ + basic_machine=a29k-amd
272
365
  + basic_os=ebmon
273
- ;;
274
- es1800 | OSE68k | ose68k | ose | OSE)
275
- basic_machine=m68k-ericsson
276
- - os=ose
366
+ + ;;
367
+ + es1800 | OSE68k | ose68k | ose | OSE)
368
+ + basic_machine=m68k-ericsson
277
369
  + basic_os=ose
278
- ;;
279
- gmicro)
280
- basic_machine=tron-gmicro
281
- - os=sysv
370
+ + ;;
371
+ + gmicro)
372
+ + basic_machine=tron-gmicro
282
373
  + basic_os=sysv
283
- ;;
284
- go32)
285
- basic_machine=i386-pc
286
- - os=go32
374
+ + ;;
375
+ + go32)
376
+ + basic_machine=i386-pc
287
377
  + basic_os=go32
288
- ;;
289
- h8300hms)
290
- basic_machine=h8300-hitachi
291
- - os=hms
378
+ + ;;
379
+ + h8300hms)
380
+ + basic_machine=h8300-hitachi
292
381
  + basic_os=hms
293
- ;;
294
- h8300xray)
295
- basic_machine=h8300-hitachi
296
- - os=xray
382
+ + ;;
383
+ + h8300xray)
384
+ + basic_machine=h8300-hitachi
297
385
  + basic_os=xray
298
- ;;
299
- h8500hms)
300
- basic_machine=h8500-hitachi
301
- - os=hms
386
+ + ;;
387
+ + h8500hms)
388
+ + basic_machine=h8500-hitachi
302
389
  + basic_os=hms
303
- ;;
304
- harris)
305
- basic_machine=m88k-harris
306
- - os=sysv3
390
+ + ;;
391
+ + harris)
392
+ + basic_machine=m88k-harris
307
393
  + basic_os=sysv3
308
- ;;
309
- - hp300)
394
+ + ;;
310
395
  + hp300 | hp300hpux)
311
- basic_machine=m68k-hp
396
+ + basic_machine=m68k-hp
312
397
  + basic_os=hpux
313
- ;;
314
- hp300bsd)
315
- basic_machine=m68k-hp
316
- - os=bsd
317
- - ;;
318
- - hp300hpux)
319
- - basic_machine=m68k-hp
320
- - os=hpux
398
+ + ;;
399
+ + hp300bsd)
400
+ + basic_machine=m68k-hp
321
401
  + basic_os=bsd
322
- ;;
323
- hppaosf)
324
- basic_machine=hppa1.1-hp
325
- - os=osf
402
+ + ;;
403
+ + hppaosf)
404
+ + basic_machine=hppa1.1-hp
326
405
  + basic_os=osf
327
- ;;
328
- hppro)
329
- basic_machine=hppa1.1-hp
330
- - os=proelf
406
+ + ;;
407
+ + hppro)
408
+ + basic_machine=hppa1.1-hp
331
409
  + basic_os=proelf
332
- ;;
333
- i386mach)
334
- basic_machine=i386-mach
335
- - os=mach
336
- - ;;
337
- - vsta)
338
- - basic_machine=i386-pc
339
- - os=vsta
410
+ + ;;
411
+ + i386mach)
412
+ + basic_machine=i386-mach
340
413
  + basic_os=mach
341
- ;;
342
- isi68 | isi)
343
- basic_machine=m68k-isi
344
- - os=sysv
414
+ + ;;
415
+ + isi68 | isi)
416
+ + basic_machine=m68k-isi
345
417
  + basic_os=sysv
346
- ;;
347
- m68knommu)
348
- basic_machine=m68k-unknown
349
- - os=linux
418
+ + ;;
419
+ + m68knommu)
420
+ + basic_machine=m68k-unknown
350
421
  + basic_os=linux
351
- ;;
352
- magnum | m3230)
353
- basic_machine=mips-mips
354
- - os=sysv
422
+ + ;;
423
+ + magnum | m3230)
424
+ + basic_machine=mips-mips
355
425
  + basic_os=sysv
356
- ;;
357
- merlin)
358
- basic_machine=ns32k-utek
359
- - os=sysv
426
+ + ;;
427
+ + merlin)
428
+ + basic_machine=ns32k-utek
360
429
  + basic_os=sysv
361
- ;;
362
- mingw64)
363
- basic_machine=x86_64-pc
364
- - os=mingw64
430
+ + ;;
431
+ + mingw64)
432
+ + basic_machine=x86_64-pc
365
433
  + basic_os=mingw64
366
- ;;
367
- mingw32)
368
- basic_machine=i686-pc
369
- - os=mingw32
434
+ + ;;
435
+ + mingw32)
436
+ + basic_machine=i686-pc
370
437
  + basic_os=mingw32
371
- ;;
372
- mingw32ce)
373
- basic_machine=arm-unknown
374
- - os=mingw32ce
438
+ + ;;
439
+ + mingw32ce)
440
+ + basic_machine=arm-unknown
375
441
  + basic_os=mingw32ce
376
- ;;
377
- monitor)
378
- basic_machine=m68k-rom68k
379
- - os=coff
442
+ + ;;
443
+ + monitor)
444
+ + basic_machine=m68k-rom68k
380
445
  + basic_os=coff
381
- ;;
382
- morphos)
383
- basic_machine=powerpc-unknown
384
- - os=morphos
446
+ + ;;
447
+ + morphos)
448
+ + basic_machine=powerpc-unknown
385
449
  + basic_os=morphos
386
- ;;
387
- moxiebox)
388
- basic_machine=moxie-unknown
389
- - os=moxiebox
450
+ + ;;
451
+ + moxiebox)
452
+ + basic_machine=moxie-unknown
390
453
  + basic_os=moxiebox
391
- ;;
392
- msdos)
393
- basic_machine=i386-pc
394
- - os=msdos
454
+ + ;;
455
+ + msdos)
456
+ + basic_machine=i386-pc
395
457
  + basic_os=msdos
396
- ;;
397
- msys)
398
- basic_machine=i686-pc
399
- - os=msys
458
+ + ;;
459
+ + msys)
460
+ + basic_machine=i686-pc
400
461
  + basic_os=msys
401
- ;;
402
- mvs)
403
- basic_machine=i370-ibm
404
- - os=mvs
462
+ + ;;
463
+ + mvs)
464
+ + basic_machine=i370-ibm
405
465
  + basic_os=mvs
406
- ;;
407
- nacl)
408
- basic_machine=le32-unknown
409
- - os=nacl
466
+ + ;;
467
+ + nacl)
468
+ + basic_machine=le32-unknown
410
469
  + basic_os=nacl
411
- ;;
412
- ncr3000)
413
- basic_machine=i486-ncr
414
- - os=sysv4
470
+ + ;;
471
+ + ncr3000)
472
+ + basic_machine=i486-ncr
415
473
  + basic_os=sysv4
416
- ;;
417
- netbsd386)
418
- basic_machine=i386-pc
419
- - os=netbsd
474
+ + ;;
475
+ + netbsd386)
476
+ + basic_machine=i386-pc
420
477
  + basic_os=netbsd
421
- ;;
422
- netwinder)
423
- basic_machine=armv4l-rebel
424
- - os=linux
478
+ + ;;
479
+ + netwinder)
480
+ + basic_machine=armv4l-rebel
425
481
  + basic_os=linux
426
- ;;
427
- news | news700 | news800 | news900)
428
- basic_machine=m68k-sony
429
- - os=newsos
482
+ + ;;
483
+ + news | news700 | news800 | news900)
484
+ + basic_machine=m68k-sony
430
485
  + basic_os=newsos
431
- ;;
432
- news1000)
433
- basic_machine=m68030-sony
434
- - os=newsos
486
+ + ;;
487
+ + news1000)
488
+ + basic_machine=m68030-sony
435
489
  + basic_os=newsos
436
- ;;
437
- necv70)
438
- basic_machine=v70-nec
439
- - os=sysv
490
+ + ;;
491
+ + necv70)
492
+ + basic_machine=v70-nec
440
493
  + basic_os=sysv
441
- ;;
442
- nh3000)
443
- basic_machine=m68k-harris
444
- - os=cxux
494
+ + ;;
495
+ + nh3000)
496
+ + basic_machine=m68k-harris
445
497
  + basic_os=cxux
446
- ;;
447
- nh[45]000)
448
- basic_machine=m88k-harris
449
- - os=cxux
498
+ + ;;
499
+ + nh[45]000)
500
+ + basic_machine=m88k-harris
450
501
  + basic_os=cxux
451
- ;;
452
- nindy960)
453
- basic_machine=i960-intel
454
- - os=nindy
502
+ + ;;
503
+ + nindy960)
504
+ + basic_machine=i960-intel
455
505
  + basic_os=nindy
456
- ;;
457
- mon960)
458
- basic_machine=i960-intel
459
- - os=mon960
506
+ + ;;
507
+ + mon960)
508
+ + basic_machine=i960-intel
460
509
  + basic_os=mon960
461
- ;;
462
- nonstopux)
463
- basic_machine=mips-compaq
464
- - os=nonstopux
510
+ + ;;
511
+ + nonstopux)
512
+ + basic_machine=mips-compaq
465
513
  + basic_os=nonstopux
466
- ;;
467
- os400)
468
- basic_machine=powerpc-ibm
469
- - os=os400
514
+ + ;;
515
+ + os400)
516
+ + basic_machine=powerpc-ibm
470
517
  + basic_os=os400
471
- ;;
472
- OSE68000 | ose68000)
473
- basic_machine=m68000-ericsson
474
- - os=ose
518
+ + ;;
519
+ + OSE68000 | ose68000)
520
+ + basic_machine=m68000-ericsson
475
521
  + basic_os=ose
476
- ;;
477
- os68k)
478
- basic_machine=m68k-none
479
- - os=os68k
522
+ + ;;
523
+ + os68k)
524
+ + basic_machine=m68k-none
480
525
  + basic_os=os68k
481
- ;;
482
- paragon)
483
- basic_machine=i860-intel
484
- - os=osf
526
+ + ;;
527
+ + paragon)
528
+ + basic_machine=i860-intel
485
529
  + basic_os=osf
486
- ;;
487
- parisc)
488
- basic_machine=hppa-unknown
489
- - os=linux
530
+ + ;;
531
+ + parisc)
532
+ + basic_machine=hppa-unknown
490
533
  + basic_os=linux
491
534
  + ;;
492
535
  + psp)
493
536
  + basic_machine=mipsallegrexel-sony
494
537
  + basic_os=psp
495
- ;;
496
- pw32)
497
- basic_machine=i586-unknown
498
- - os=pw32
538
+ + ;;
539
+ + pw32)
540
+ + basic_machine=i586-unknown
499
541
  + basic_os=pw32
500
- ;;
501
- rdos | rdos64)
502
- basic_machine=x86_64-pc
503
- - os=rdos
542
+ + ;;
543
+ + rdos | rdos64)
544
+ + basic_machine=x86_64-pc
504
545
  + basic_os=rdos
505
- ;;
506
- rdos32)
507
- basic_machine=i386-pc
508
- - os=rdos
546
+ + ;;
547
+ + rdos32)
548
+ + basic_machine=i386-pc
509
549
  + basic_os=rdos
510
- ;;
511
- rom68k)
512
- basic_machine=m68k-rom68k
513
- - os=coff
550
+ + ;;
551
+ + rom68k)
552
+ + basic_machine=m68k-rom68k
514
553
  + basic_os=coff
515
- ;;
516
- sa29200)
517
- basic_machine=a29k-amd
518
- - os=udi
554
+ + ;;
555
+ + sa29200)
556
+ + basic_machine=a29k-amd
519
557
  + basic_os=udi
520
- ;;
521
- sei)
522
- basic_machine=mips-sei
523
- - os=seiux
558
+ + ;;
559
+ + sei)
560
+ + basic_machine=mips-sei
524
561
  + basic_os=seiux
525
- ;;
526
- sequent)
527
- basic_machine=i386-sequent
528
- - os=
562
+ + ;;
563
+ + sequent)
564
+ + basic_machine=i386-sequent
529
565
  + basic_os=
530
- ;;
531
- sps7)
532
- basic_machine=m68k-bull
533
- - os=sysv2
566
+ + ;;
567
+ + sps7)
568
+ + basic_machine=m68k-bull
534
569
  + basic_os=sysv2
535
- ;;
536
- st2000)
537
- basic_machine=m68k-tandem
538
- - os=
570
+ + ;;
571
+ + st2000)
572
+ + basic_machine=m68k-tandem
539
573
  + basic_os=
540
- ;;
541
- stratus)
542
- basic_machine=i860-stratus
543
- - os=sysv4
574
+ + ;;
575
+ + stratus)
576
+ + basic_machine=i860-stratus
544
577
  + basic_os=sysv4
545
- ;;
546
- sun2)
547
- basic_machine=m68000-sun
548
- - os=
578
+ + ;;
579
+ + sun2)
580
+ + basic_machine=m68000-sun
549
581
  + basic_os=
550
- ;;
551
- sun2os3)
552
- basic_machine=m68000-sun
553
- - os=sunos3
582
+ + ;;
583
+ + sun2os3)
584
+ + basic_machine=m68000-sun
554
585
  + basic_os=sunos3
555
- ;;
556
- sun2os4)
557
- basic_machine=m68000-sun
558
- - os=sunos4
586
+ + ;;
587
+ + sun2os4)
588
+ + basic_machine=m68000-sun
559
589
  + basic_os=sunos4
560
- ;;
561
- sun3)
562
- basic_machine=m68k-sun
563
- - os=
590
+ + ;;
591
+ + sun3)
592
+ + basic_machine=m68k-sun
564
593
  + basic_os=
565
- ;;
566
- sun3os3)
567
- basic_machine=m68k-sun
568
- - os=sunos3
594
+ + ;;
595
+ + sun3os3)
596
+ + basic_machine=m68k-sun
569
597
  + basic_os=sunos3
570
- ;;
571
- sun3os4)
572
- basic_machine=m68k-sun
573
- - os=sunos4
598
+ + ;;
599
+ + sun3os4)
600
+ + basic_machine=m68k-sun
574
601
  + basic_os=sunos4
575
- ;;
576
- sun4)
577
- basic_machine=sparc-sun
578
- - os=
602
+ + ;;
603
+ + sun4)
604
+ + basic_machine=sparc-sun
579
605
  + basic_os=
580
- ;;
581
- sun4os3)
582
- basic_machine=sparc-sun
583
- - os=sunos3
606
+ + ;;
607
+ + sun4os3)
608
+ + basic_machine=sparc-sun
584
609
  + basic_os=sunos3
585
- ;;
586
- sun4os4)
587
- basic_machine=sparc-sun
588
- - os=sunos4
610
+ + ;;
611
+ + sun4os4)
612
+ + basic_machine=sparc-sun
589
613
  + basic_os=sunos4
590
- ;;
591
- sun4sol2)
592
- basic_machine=sparc-sun
593
- - os=solaris2
614
+ + ;;
615
+ + sun4sol2)
616
+ + basic_machine=sparc-sun
594
617
  + basic_os=solaris2
595
- ;;
596
- sun386 | sun386i | roadrunner)
597
- basic_machine=i386-sun
598
- - os=
618
+ + ;;
619
+ + sun386 | sun386i | roadrunner)
620
+ + basic_machine=i386-sun
599
621
  + basic_os=
600
- ;;
601
- sv1)
602
- basic_machine=sv1-cray
603
- - os=unicos
622
+ + ;;
623
+ + sv1)
624
+ + basic_machine=sv1-cray
604
625
  + basic_os=unicos
605
- ;;
606
- symmetry)
607
- basic_machine=i386-sequent
608
- - os=dynix
626
+ + ;;
627
+ + symmetry)
628
+ + basic_machine=i386-sequent
609
629
  + basic_os=dynix
610
- ;;
611
- t3e)
612
- basic_machine=alphaev5-cray
613
- - os=unicos
630
+ + ;;
631
+ + t3e)
632
+ + basic_machine=alphaev5-cray
614
633
  + basic_os=unicos
615
- ;;
616
- t90)
617
- basic_machine=t90-cray
618
- - os=unicos
634
+ + ;;
635
+ + t90)
636
+ + basic_machine=t90-cray
619
637
  + basic_os=unicos
620
- ;;
621
- toad1)
622
- basic_machine=pdp10-xkl
623
- - os=tops20
638
+ + ;;
639
+ + toad1)
640
+ + basic_machine=pdp10-xkl
624
641
  + basic_os=tops20
625
- ;;
626
- tpf)
627
- basic_machine=s390x-ibm
628
- - os=tpf
642
+ + ;;
643
+ + tpf)
644
+ + basic_machine=s390x-ibm
629
645
  + basic_os=tpf
630
- ;;
631
- udi29k)
632
- basic_machine=a29k-amd
633
- - os=udi
646
+ + ;;
647
+ + udi29k)
648
+ + basic_machine=a29k-amd
634
649
  + basic_os=udi
635
- ;;
636
- ultra3)
637
- basic_machine=a29k-nyu
638
- - os=sym1
650
+ + ;;
651
+ + ultra3)
652
+ + basic_machine=a29k-nyu
639
653
  + basic_os=sym1
640
- ;;
641
- v810 | necv810)
642
- basic_machine=v810-nec
643
- - os=none
654
+ + ;;
655
+ + v810 | necv810)
656
+ + basic_machine=v810-nec
644
657
  + basic_os=none
645
- ;;
646
- vaxv)
647
- basic_machine=vax-dec
648
- - os=sysv
658
+ + ;;
659
+ + vaxv)
660
+ + basic_machine=vax-dec
649
661
  + basic_os=sysv
650
- ;;
651
- vms)
652
- basic_machine=vax-dec
653
- - os=vms
662
+ + ;;
663
+ + vms)
664
+ + basic_machine=vax-dec
654
665
  + basic_os=vms
655
666
  + ;;
656
667
  + vsta)
657
668
  + basic_machine=i386-pc
658
669
  + basic_os=vsta
659
- ;;
660
- vxworks960)
661
- basic_machine=i960-wrs
662
- - os=vxworks
670
+ + ;;
671
+ + vxworks960)
672
+ + basic_machine=i960-wrs
663
673
  + basic_os=vxworks
664
- ;;
665
- vxworks68)
666
- basic_machine=m68k-wrs
667
- - os=vxworks
674
+ + ;;
675
+ + vxworks68)
676
+ + basic_machine=m68k-wrs
668
677
  + basic_os=vxworks
669
- ;;
670
- vxworks29k)
671
- basic_machine=a29k-wrs
672
- - os=vxworks
678
+ + ;;
679
+ + vxworks29k)
680
+ + basic_machine=a29k-wrs
673
681
  + basic_os=vxworks
674
- ;;
675
- xbox)
676
- basic_machine=i686-pc
677
- - os=mingw32
682
+ + ;;
683
+ + xbox)
684
+ + basic_machine=i686-pc
678
685
  + basic_os=mingw32
679
- ;;
680
- ymp)
681
- basic_machine=ymp-cray
682
- - os=unicos
686
+ + ;;
687
+ + ymp)
688
+ + basic_machine=ymp-cray
683
689
  + basic_os=unicos
684
- ;;
685
- *)
686
- basic_machine=$1
687
- - os=
690
+ + ;;
691
+ + *)
692
+ + basic_machine=$1
688
693
  + basic_os=
689
- ;;
690
- esac
694
+ + ;;
695
+ + esac
696
+ ;;
697
+ esac
698
+
699
+ -# Decode aliases for certain CPU-COMPANY combinations.
700
+ +# Decode 1-component or ad-hoc basic machines
701
+ case $basic_machine in
702
+ - # Recognize the basic CPU types without company name.
703
+ - # Some are omitted here because they have special meanings below.
704
+ - 1750a | 580 \
705
+ - | a29k \
706
+ - | aarch64 | aarch64_be \
707
+ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
708
+ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
709
+ - | am33_2.0 \
710
+ - | arc | arceb \
711
+ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
712
+ - | avr | avr32 \
713
+ - | ba \
714
+ - | be32 | be64 \
715
+ - | bfin \
716
+ - | c4x | c8051 | clipper \
717
+ - | d10v | d30v | dlx | dsp16xx \
718
+ - | e2k | epiphany \
719
+ - | fido | fr30 | frv | ft32 \
720
+ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
721
+ - | hexagon \
722
+ - | i370 | i860 | i960 | ia16 | ia64 \
723
+ - | ip2k | iq2000 \
724
+ - | k1om \
725
+ - | le32 | le64 \
726
+ - | lm32 \
727
+ - | m32c | m32r | m32rle | m68000 | m68k | m88k \
728
+ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
729
+ - | mips | mipsbe | mipseb | mipsel | mipsle \
730
+ - | mips16 \
731
+ - | mips64 | mips64el \
732
+ - | mips64octeon | mips64octeonel \
733
+ - | mips64orion | mips64orionel \
734
+ - | mips64r5900 | mips64r5900el \
735
+ - | mips64vr | mips64vrel \
736
+ - | mips64vr4100 | mips64vr4100el \
737
+ - | mips64vr4300 | mips64vr4300el \
738
+ - | mips64vr5000 | mips64vr5000el \
739
+ - | mips64vr5900 | mips64vr5900el \
740
+ - | mipsisa32 | mipsisa32el \
741
+ - | mipsisa32r2 | mipsisa32r2el \
742
+ - | mipsisa32r6 | mipsisa32r6el \
743
+ - | mipsisa64 | mipsisa64el \
744
+ - | mipsisa64r2 | mipsisa64r2el \
745
+ - | mipsisa64r6 | mipsisa64r6el \
746
+ - | mipsisa64sb1 | mipsisa64sb1el \
747
+ - | mipsisa64sr71k | mipsisa64sr71kel \
748
+ - | mipsr5900 | mipsr5900el \
749
+ - | mipstx39 | mipstx39el \
750
+ - | mn10200 | mn10300 \
751
+ - | moxie \
752
+ - | mt \
753
+ - | msp430 \
754
+ - | nds32 | nds32le | nds32be \
755
+ - | nios | nios2 | nios2eb | nios2el \
756
+ - | ns16k | ns32k \
757
+ - | open8 | or1k | or1knd | or32 \
758
+ - | pdp10 | pj | pjl \
759
+ - | powerpc | powerpc64 | powerpc64le | powerpcle \
760
+ - | pru \
761
+ - | pyramid \
762
+ - | riscv32 | riscv64 \
763
+ - | rl78 | rx \
764
+ - | score \
765
+ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
766
+ - | sh64 | sh64le \
767
+ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
768
+ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
769
+ - | spu \
770
+ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
771
+ - | ubicom32 \
772
+ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
773
+ - | visium \
774
+ - | wasm32 \
775
+ - | x86 | xc16x | xstormy16 | xtensa \
776
+ - | z8k | z80)
777
+ - basic_machine=$basic_machine-unknown
778
+ - ;;
779
+ - c54x)
780
+ - basic_machine=tic54x-unknown
781
+ - ;;
782
+ - c55x)
783
+ - basic_machine=tic55x-unknown
784
+ - ;;
785
+ - c6x)
786
+ - basic_machine=tic6x-unknown
787
+ - ;;
788
+ - leon|leon[3-9])
789
+ - basic_machine=sparc-$basic_machine
790
+ - ;;
791
+ - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
792
+ - basic_machine=$basic_machine-unknown
793
+ - os=-none
794
+ + # Here we handle the default manufacturer of certain CPU types. It is in
795
+ + # some cases the only manufacturer, in others, it is the most popular.
796
+ + w89k)
797
+ + cpu=hppa1.1
798
+ + vendor=winbond
799
+ ;;
800
+ - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
801
+ + op50n)
802
+ + cpu=hppa1.1
803
+ + vendor=oki
804
+ ;;
805
+ - ms1)
806
+ - basic_machine=mt-unknown
807
+ + op60c)
808
+ + cpu=hppa1.1
809
+ + vendor=oki
810
+ ;;
811
+ -
812
+ - strongarm | thumb | xscale)
813
+ - basic_machine=arm-unknown
814
+ + ibm*)
815
+ + cpu=i370
816
+ + vendor=ibm
817
+ ;;
818
+ - xgate)
819
+ - basic_machine=$basic_machine-unknown
820
+ - os=-none
821
+ + orion105)
822
+ + cpu=clipper
823
+ + vendor=highlevel
824
+ ;;
825
+ - xscaleeb)
826
+ - basic_machine=armeb-unknown
827
+ + mac | mpw | mac-mpw)
828
+ + cpu=m68k
829
+ + vendor=apple
830
+ ;;
831
+ -
832
+ - xscaleel)
833
+ - basic_machine=armel-unknown
834
+ + pmac | pmac-mpw)
835
+ + cpu=powerpc
836
+ + vendor=apple
837
+ ;;
838
+
839
+ - # We use `pc' rather than `unknown'
840
+ - # because (1) that's what they normally are, and
841
+ - # (2) the word "unknown" tends to confuse beginning users.
842
+ - i*86 | x86_64)
843
+ - basic_machine=$basic_machine-pc
844
+ - ;;
845
+ - # Object if more than one company name word.
846
+ - *-*-*)
847
+ - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
848
+ - exit 1
849
+ - ;;
850
+ - # Recognize the basic CPU types with company name.
851
+ - 580-* \
852
+ - | a29k-* \
853
+ - | aarch64-* | aarch64_be-* \
854
+ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
855
+ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
856
+ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
857
+ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
858
+ - | avr-* | avr32-* \
859
+ - | ba-* \
860
+ - | be32-* | be64-* \
861
+ - | bfin-* | bs2000-* \
862
+ - | c[123]* | c30-* | [cjt]90-* | c4x-* \
863
+ - | c8051-* | clipper-* | craynv-* | cydra-* \
864
+ - | d10v-* | d30v-* | dlx-* \
865
+ - | e2k-* | elxsi-* \
866
+ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
867
+ - | h8300-* | h8500-* \
868
+ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
869
+ - | hexagon-* \
870
+ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
871
+ - | ip2k-* | iq2000-* \
872
+ - | k1om-* \
873
+ - | le32-* | le64-* \
874
+ - | lm32-* \
875
+ - | m32c-* | m32r-* | m32rle-* \
876
+ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
877
+ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
878
+ - | microblaze-* | microblazeel-* \
879
+ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
880
+ - | mips16-* \
881
+ - | mips64-* | mips64el-* \
882
+ - | mips64octeon-* | mips64octeonel-* \
883
+ - | mips64orion-* | mips64orionel-* \
884
+ - | mips64r5900-* | mips64r5900el-* \
885
+ - | mips64vr-* | mips64vrel-* \
886
+ - | mips64vr4100-* | mips64vr4100el-* \
887
+ - | mips64vr4300-* | mips64vr4300el-* \
888
+ - | mips64vr5000-* | mips64vr5000el-* \
889
+ - | mips64vr5900-* | mips64vr5900el-* \
890
+ - | mipsisa32-* | mipsisa32el-* \
891
+ - | mipsisa32r2-* | mipsisa32r2el-* \
892
+ - | mipsisa32r6-* | mipsisa32r6el-* \
893
+ - | mipsisa64-* | mipsisa64el-* \
894
+ - | mipsisa64r2-* | mipsisa64r2el-* \
895
+ - | mipsisa64r6-* | mipsisa64r6el-* \
896
+ - | mipsisa64sb1-* | mipsisa64sb1el-* \
897
+ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \
898
+ - | mipsr5900-* | mipsr5900el-* \
899
+ - | mipstx39-* | mipstx39el-* \
900
+ - | mmix-* \
901
+ - | mt-* \
902
+ - | msp430-* \
903
+ - | nds32-* | nds32le-* | nds32be-* \
904
+ - | nios-* | nios2-* | nios2eb-* | nios2el-* \
905
+ - | none-* | np1-* | ns16k-* | ns32k-* \
906
+ - | open8-* \
907
+ - | or1k*-* \
908
+ - | orion-* \
909
+ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
910
+ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
911
+ - | pru-* \
912
+ - | pyramid-* \
913
+ - | riscv32-* | riscv64-* \
914
+ - | rl78-* | romp-* | rs6000-* | rx-* \
915
+ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
916
+ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
917
+ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
918
+ - | sparclite-* \
919
+ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
920
+ - | tahoe-* \
921
+ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
922
+ - | tile*-* \
923
+ - | tron-* \
924
+ - | ubicom32-* \
925
+ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
926
+ - | vax-* \
927
+ - | visium-* \
928
+ - | wasm32-* \
929
+ - | we32k-* \
930
+ - | x86-* | x86_64-* | xc16x-* | xps100-* \
931
+ - | xstormy16-* | xtensa*-* \
932
+ - | ymp-* \
933
+ - | z8k-* | z80-*)
934
+ - ;;
935
+ - # Recognize the basic CPU types without company name, with glob match.
936
+ - xtensa*)
937
+ - basic_machine=$basic_machine-unknown
938
+ - ;;
939
+ # Recognize the various machine names and aliases which stand
940
+ # for a CPU type and a company and sometimes even an OS.
941
+ - 386bsd)
942
+ - basic_machine=i386-pc
943
+ - os=-bsd
944
+ - ;;
945
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
946
+ - basic_machine=m68000-att
947
+ + cpu=m68000
948
+ + vendor=att
949
+ ;;
950
+ 3b*)
951
+ - basic_machine=we32k-att
952
+ - ;;
953
+ - a29khif)
954
+ - basic_machine=a29k-amd
955
+ - os=-udi
956
+ - ;;
957
+ - abacus)
958
+ - basic_machine=abacus-unknown
959
+ - ;;
960
+ - adobe68k)
961
+ - basic_machine=m68010-adobe
962
+ - os=-scout
963
+ - ;;
964
+ - alliant | fx80)
965
+ - basic_machine=fx80-alliant
966
+ - ;;
967
+ - altos | altos3068)
968
+ - basic_machine=m68k-altos
969
+ - ;;
970
+ - am29k)
971
+ - basic_machine=a29k-none
972
+ - os=-bsd
973
+ - ;;
974
+ - amd64)
975
+ - basic_machine=x86_64-pc
976
+ - ;;
977
+ - amd64-*)
978
+ - basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
979
+ - ;;
980
+ - amdahl)
981
+ - basic_machine=580-amdahl
982
+ - os=-sysv
983
+ - ;;
984
+ - amiga | amiga-*)
985
+ - basic_machine=m68k-unknown
986
+ - ;;
987
+ - amigaos | amigados)
988
+ - basic_machine=m68k-unknown
989
+ - os=-amigaos
990
+ - ;;
991
+ - amigaunix | amix)
992
+ - basic_machine=m68k-unknown
993
+ - os=-sysv4
994
+ - ;;
995
+ - apollo68)
996
+ - basic_machine=m68k-apollo
997
+ - os=-sysv
998
+ - ;;
999
+ - apollo68bsd)
1000
+ - basic_machine=m68k-apollo
1001
+ - os=-bsd
1002
+ - ;;
1003
+ - aros)
1004
+ - basic_machine=i386-pc
1005
+ - os=-aros
1006
+ - ;;
1007
+ - asmjs)
1008
+ - basic_machine=asmjs-unknown
1009
+ - ;;
1010
+ - aux)
1011
+ - basic_machine=m68k-apple
1012
+ - os=-aux
1013
+ - ;;
1014
+ - balance)
1015
+ - basic_machine=ns32k-sequent
1016
+ - os=-dynix
1017
+ - ;;
1018
+ - blackfin)
1019
+ - basic_machine=bfin-unknown
1020
+ - os=-linux
1021
+ - ;;
1022
+ - blackfin-*)
1023
+ - basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1024
+ - os=-linux
1025
+ + cpu=we32k
1026
+ + vendor=att
691
1027
  ;;
692
- @@ -685,17 +686,17 @@
693
1028
  bluegene*)
694
- cpu=powerpc
695
- vendor=ibm
696
- - os=cnk
1029
+ - basic_machine=powerpc-ibm
1030
+ - os=-cnk
1031
+ - ;;
1032
+ - c54x-*)
1033
+ - basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1034
+ - ;;
1035
+ - c55x-*)
1036
+ - basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1037
+ - ;;
1038
+ - c6x-*)
1039
+ - basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1040
+ - ;;
1041
+ - c90)
1042
+ - basic_machine=c90-cray
1043
+ - os=-unicos
1044
+ - ;;
1045
+ - cegcc)
1046
+ - basic_machine=arm-unknown
1047
+ - os=-cegcc
1048
+ - ;;
1049
+ - convex-c1)
1050
+ - basic_machine=c1-convex
1051
+ - os=-bsd
1052
+ - ;;
1053
+ - convex-c2)
1054
+ - basic_machine=c2-convex
1055
+ - os=-bsd
1056
+ - ;;
1057
+ - convex-c32)
1058
+ - basic_machine=c32-convex
1059
+ - os=-bsd
1060
+ - ;;
1061
+ - convex-c34)
1062
+ - basic_machine=c34-convex
1063
+ - os=-bsd
1064
+ - ;;
1065
+ - convex-c38)
1066
+ - basic_machine=c38-convex
1067
+ - os=-bsd
1068
+ - ;;
1069
+ - cray | j90)
1070
+ - basic_machine=j90-cray
1071
+ - os=-unicos
1072
+ - ;;
1073
+ - craynv)
1074
+ - basic_machine=craynv-cray
1075
+ - os=-unicosmp
1076
+ - ;;
1077
+ - cr16 | cr16-*)
1078
+ - basic_machine=cr16-unknown
1079
+ - os=-elf
1080
+ - ;;
1081
+ - crds | unos)
1082
+ - basic_machine=m68k-crds
1083
+ - ;;
1084
+ - crisv32 | crisv32-* | etraxfs*)
1085
+ - basic_machine=crisv32-axis
1086
+ - ;;
1087
+ - cris | cris-* | etrax*)
1088
+ - basic_machine=cris-axis
1089
+ - ;;
1090
+ - crx)
1091
+ - basic_machine=crx-unknown
1092
+ - os=-elf
1093
+ - ;;
1094
+ - da30 | da30-*)
1095
+ - basic_machine=m68k-da30
1096
+ - ;;
1097
+ - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
1098
+ - basic_machine=mips-dec
1099
+ + cpu=powerpc
1100
+ + vendor=ibm
697
1101
  + basic_os=cnk
698
1102
  ;;
699
1103
  decsystem10* | dec10*)
700
- cpu=pdp10
701
- vendor=dec
702
- - os=tops10
1104
+ - basic_machine=pdp10-dec
1105
+ - os=-tops10
1106
+ + cpu=pdp10
1107
+ + vendor=dec
703
1108
  + basic_os=tops10
704
1109
  ;;
705
1110
  decsystem20* | dec20*)
706
- cpu=pdp10
707
- vendor=dec
708
- - os=tops20
1111
+ - basic_machine=pdp10-dec
1112
+ - os=-tops20
1113
+ + cpu=pdp10
1114
+ + vendor=dec
709
1115
  + basic_os=tops20
710
1116
  ;;
711
1117
  delta | 3300 | motorola-3300 | motorola-delta \
712
1118
  | 3300-motorola | delta-motorola)
713
- @@ -705,7 +706,7 @@
1119
+ - basic_machine=m68k-motorola
1120
+ - ;;
1121
+ - delta88)
1122
+ - basic_machine=m88k-motorola
1123
+ - os=-sysv3
1124
+ - ;;
1125
+ - dicos)
1126
+ - basic_machine=i686-pc
1127
+ - os=-dicos
1128
+ - ;;
1129
+ - djgpp)
1130
+ - basic_machine=i586-pc
1131
+ - os=-msdosdjgpp
1132
+ - ;;
1133
+ - dpx20 | dpx20-*)
1134
+ - basic_machine=rs6000-bull
1135
+ - os=-bosx
1136
+ + cpu=m68k
1137
+ + vendor=motorola
1138
+ ;;
714
1139
  dpx2*)
715
- cpu=m68k
716
- vendor=bull
717
- - os=sysv3
1140
+ - basic_machine=m68k-bull
1141
+ - os=-sysv3
1142
+ - ;;
1143
+ - e500v[12])
1144
+ - basic_machine=powerpc-unknown
1145
+ - os=$os"spe"
1146
+ - ;;
1147
+ - e500v[12]-*)
1148
+ - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1149
+ - os=$os"spe"
1150
+ - ;;
1151
+ - ebmon29k)
1152
+ - basic_machine=a29k-amd
1153
+ - os=-ebmon
1154
+ - ;;
1155
+ - elxsi)
1156
+ - basic_machine=elxsi-elxsi
1157
+ - os=-bsd
1158
+ + cpu=m68k
1159
+ + vendor=bull
718
1160
  + basic_os=sysv3
719
1161
  ;;
720
1162
  encore | umax | mmax)
721
- cpu=ns32k
722
- @@ -714,7 +715,7 @@
723
- elxsi)
724
- cpu=elxsi
725
- vendor=elxsi
726
- - os=${os:-bsd}
1163
+ - basic_machine=ns32k-encore
1164
+ + cpu=ns32k
1165
+ + vendor=encore
1166
+ ;;
1167
+ - es1800 | OSE68k | ose68k | ose | OSE)
1168
+ - basic_machine=m68k-ericsson
1169
+ - os=-ose
1170
+ + elxsi)
1171
+ + cpu=elxsi
1172
+ + vendor=elxsi
727
1173
  + basic_os=${basic_os:-bsd}
728
1174
  ;;
729
1175
  fx2800)
730
- cpu=i860
731
- @@ -727,7 +728,7 @@
1176
+ - basic_machine=i860-alliant
1177
+ + cpu=i860
1178
+ + vendor=alliant
1179
+ ;;
1180
+ genix)
1181
+ - basic_machine=ns32k-ns
1182
+ - ;;
1183
+ - gmicro)
1184
+ - basic_machine=tron-gmicro
1185
+ - os=-sysv
1186
+ - ;;
1187
+ - go32)
1188
+ - basic_machine=i386-pc
1189
+ - os=-go32
1190
+ + cpu=ns32k
1191
+ + vendor=ns
1192
+ ;;
732
1193
  h3050r* | hiux*)
733
- cpu=hppa1.1
734
- vendor=hitachi
735
- - os=hiuxwe2
1194
+ - basic_machine=hppa1.1-hitachi
1195
+ - os=-hiuxwe2
1196
+ - ;;
1197
+ - h8300hms)
1198
+ - basic_machine=h8300-hitachi
1199
+ - os=-hms
1200
+ - ;;
1201
+ - h8300xray)
1202
+ - basic_machine=h8300-hitachi
1203
+ - os=-xray
1204
+ - ;;
1205
+ - h8500hms)
1206
+ - basic_machine=h8500-hitachi
1207
+ - os=-hms
1208
+ - ;;
1209
+ - harris)
1210
+ - basic_machine=m88k-harris
1211
+ - os=-sysv3
1212
+ - ;;
1213
+ - hp300-*)
1214
+ - basic_machine=m68k-hp
1215
+ - ;;
1216
+ - hp300bsd)
1217
+ - basic_machine=m68k-hp
1218
+ - os=-bsd
1219
+ - ;;
1220
+ - hp300hpux)
1221
+ - basic_machine=m68k-hp
1222
+ - os=-hpux
1223
+ + cpu=hppa1.1
1224
+ + vendor=hitachi
736
1225
  + basic_os=hiuxwe2
737
1226
  ;;
738
1227
  hp3k9[0-9][0-9] | hp9[0-9][0-9])
739
- cpu=hppa1.0
740
- @@ -768,38 +769,38 @@
741
- vendor=hp
1228
+ - basic_machine=hppa1.0-hp
1229
+ + cpu=hppa1.0
1230
+ + vendor=hp
1231
+ ;;
1232
+ hp9k2[0-9][0-9] | hp9k31[0-9])
1233
+ - basic_machine=m68000-hp
1234
+ + cpu=m68000
1235
+ + vendor=hp
1236
+ ;;
1237
+ hp9k3[2-9][0-9])
1238
+ - basic_machine=m68k-hp
1239
+ + cpu=m68k
1240
+ + vendor=hp
1241
+ ;;
1242
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
1243
+ - basic_machine=hppa1.0-hp
1244
+ + cpu=hppa1.0
1245
+ + vendor=hp
1246
+ ;;
1247
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
1248
+ - basic_machine=hppa1.1-hp
1249
+ + cpu=hppa1.1
1250
+ + vendor=hp
1251
+ ;;
1252
+ hp9k78[0-9] | hp78[0-9])
1253
+ # FIXME: really hppa2.0-hp
1254
+ - basic_machine=hppa1.1-hp
1255
+ + cpu=hppa1.1
1256
+ + vendor=hp
1257
+ ;;
1258
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
1259
+ # FIXME: really hppa2.0-hp
1260
+ - basic_machine=hppa1.1-hp
1261
+ + cpu=hppa1.1
1262
+ + vendor=hp
1263
+ ;;
1264
+ hp9k8[0-9][13679] | hp8[0-9][13679])
1265
+ - basic_machine=hppa1.1-hp
1266
+ + cpu=hppa1.1
1267
+ + vendor=hp
1268
+ ;;
1269
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
1270
+ - basic_machine=hppa1.0-hp
1271
+ - ;;
1272
+ - hppaosf)
1273
+ - basic_machine=hppa1.1-hp
1274
+ - os=-osf
1275
+ - ;;
1276
+ - hppro)
1277
+ - basic_machine=hppa1.1-hp
1278
+ - os=-proelf
1279
+ - ;;
1280
+ - i370-ibm* | ibm*)
1281
+ - basic_machine=i370-ibm
1282
+ + cpu=hppa1.0
1283
+ + vendor=hp
742
1284
  ;;
743
1285
  i*86v32)
744
- - cpu=`echo "$1" | sed -e 's/86.*/86/'`
1286
+ - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
1287
+ - os=-sysv32
745
1288
  + cpu=$(echo "$1" | sed -e 's/86.*/86/')
746
- vendor=pc
747
- - os=sysv32
1289
+ + vendor=pc
748
1290
  + basic_os=sysv32
749
1291
  ;;
750
1292
  i*86v4*)
751
- - cpu=`echo "$1" | sed -e 's/86.*/86/'`
1293
+ - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
1294
+ - os=-sysv4
752
1295
  + cpu=$(echo "$1" | sed -e 's/86.*/86/')
753
- vendor=pc
754
- - os=sysv4
1296
+ + vendor=pc
755
1297
  + basic_os=sysv4
756
1298
  ;;
757
1299
  i*86v)
758
- - cpu=`echo "$1" | sed -e 's/86.*/86/'`
1300
+ - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
1301
+ - os=-sysv
759
1302
  + cpu=$(echo "$1" | sed -e 's/86.*/86/')
760
- vendor=pc
761
- - os=sysv
1303
+ + vendor=pc
762
1304
  + basic_os=sysv
763
1305
  ;;
764
1306
  i*86sol2)
765
- - cpu=`echo "$1" | sed -e 's/86.*/86/'`
1307
+ - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
1308
+ - os=-solaris2
1309
+ - ;;
1310
+ - i386mach)
1311
+ - basic_machine=i386-mach
1312
+ - os=-mach
1313
+ - ;;
1314
+ - vsta)
1315
+ - basic_machine=i386-unknown
1316
+ - os=-vsta
766
1317
  + cpu=$(echo "$1" | sed -e 's/86.*/86/')
767
- vendor=pc
768
- - os=solaris2
1318
+ + vendor=pc
769
1319
  + basic_os=solaris2
770
- ;;
771
- j90 | j90-cray)
772
- cpu=j90
773
- vendor=cray
774
- - os=${os:-unicos}
1320
+ + ;;
1321
+ + j90 | j90-cray)
1322
+ + cpu=j90
1323
+ + vendor=cray
775
1324
  + basic_os=${basic_os:-unicos}
776
1325
  ;;
777
1326
  iris | iris4d)
778
- cpu=mips
779
- vendor=sgi
1327
+ - basic_machine=mips-sgi
780
1328
  - case $os in
1329
+ - -irix*)
1330
+ + cpu=mips
1331
+ + vendor=sgi
781
1332
  + case $basic_os in
782
- irix*)
1333
+ + irix*)
783
1334
  ;;
784
1335
  *)
785
- - os=irix4
1336
+ - os=-irix4
786
1337
  + basic_os=irix4
787
1338
  ;;
788
1339
  esac
789
1340
  ;;
790
- @@ -810,24 +811,26 @@
791
- *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
792
- cpu=m68k
793
- vendor=atari
794
- - os=mint
1341
+ - isi68 | isi)
1342
+ - basic_machine=m68k-isi
1343
+ - os=-sysv
1344
+ - ;;
1345
+ - leon-*|leon[3-9]-*)
1346
+ - basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
1347
+ - ;;
1348
+ - m68knommu)
1349
+ - basic_machine=m68k-unknown
1350
+ - os=-linux
1351
+ - ;;
1352
+ - m68knommu-*)
1353
+ - basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1354
+ - os=-linux
1355
+ - ;;
1356
+ - magnum | m3230)
1357
+ - basic_machine=mips-mips
1358
+ - os=-sysv
1359
+ - ;;
1360
+ - merlin)
1361
+ - basic_machine=ns32k-utek
1362
+ - os=-sysv
1363
+ - ;;
1364
+ - microblaze*)
1365
+ - basic_machine=microblaze-xilinx
1366
+ - ;;
1367
+ - mingw64)
1368
+ - basic_machine=x86_64-pc
1369
+ - os=-mingw64
1370
+ - ;;
1371
+ - mingw32)
1372
+ - basic_machine=i686-pc
1373
+ - os=-mingw32
1374
+ - ;;
1375
+ - mingw32ce)
1376
+ - basic_machine=arm-unknown
1377
+ - os=-mingw32ce
1378
+ - ;;
1379
+ miniframe)
1380
+ - basic_machine=m68000-convergent
1381
+ - ;;
1382
+ - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
1383
+ - basic_machine=m68k-atari
1384
+ - os=-mint
1385
+ - ;;
1386
+ - mips3*-*)
1387
+ - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
1388
+ + cpu=m68000
1389
+ + vendor=convergent
1390
+ ;;
1391
+ - mips3*)
1392
+ - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
1393
+ - ;;
1394
+ - monitor)
1395
+ - basic_machine=m68k-rom68k
1396
+ - os=-coff
1397
+ - ;;
1398
+ - morphos)
1399
+ - basic_machine=powerpc-unknown
1400
+ - os=-morphos
1401
+ - ;;
1402
+ - moxiebox)
1403
+ - basic_machine=moxie-unknown
1404
+ - os=-moxiebox
1405
+ - ;;
1406
+ - msdos)
1407
+ - basic_machine=i386-pc
1408
+ - os=-msdos
1409
+ - ;;
1410
+ - ms1-*)
1411
+ - basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
1412
+ - ;;
1413
+ - msys)
1414
+ - basic_machine=i686-pc
1415
+ - os=-msys
1416
+ - ;;
1417
+ - mvs)
1418
+ - basic_machine=i370-ibm
1419
+ - os=-mvs
1420
+ - ;;
1421
+ - nacl)
1422
+ - basic_machine=le32-unknown
1423
+ - os=-nacl
1424
+ - ;;
1425
+ - ncr3000)
1426
+ - basic_machine=i486-ncr
1427
+ - os=-sysv4
1428
+ - ;;
1429
+ - netbsd386)
1430
+ - basic_machine=i386-unknown
1431
+ - os=-netbsd
1432
+ - ;;
1433
+ - netwinder)
1434
+ - basic_machine=armv4l-rebel
1435
+ - os=-linux
1436
+ - ;;
1437
+ - news | news700 | news800 | news900)
1438
+ - basic_machine=m68k-sony
1439
+ - os=-newsos
1440
+ - ;;
1441
+ - news1000)
1442
+ - basic_machine=m68030-sony
1443
+ - os=-newsos
1444
+ + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
1445
+ + cpu=m68k
1446
+ + vendor=atari
795
1447
  + basic_os=mint
796
1448
  ;;
797
1449
  news-3600 | risc-news)
798
- cpu=mips
799
- vendor=sony
800
- - os=newsos
1450
+ - basic_machine=mips-sony
1451
+ - os=-newsos
1452
+ - ;;
1453
+ - necv70)
1454
+ - basic_machine=v70-nec
1455
+ - os=-sysv
1456
+ + cpu=mips
1457
+ + vendor=sony
801
1458
  + basic_os=newsos
802
1459
  ;;
803
1460
  next | m*-next)
804
- cpu=m68k
805
- vendor=next
1461
+ - basic_machine=m68k-next
806
1462
  - case $os in
807
- - nextstep* )
1463
+ - -nextstep* )
1464
+ + cpu=m68k
1465
+ + vendor=next
808
1466
  + case $basic_os in
809
1467
  + openstep*)
810
1468
  + ;;
811
1469
  + nextstep*)
812
1470
  ;;
813
- ns2*)
814
- - os=nextstep2
1471
+ - -ns2*)
1472
+ - os=-nextstep2
1473
+ + ns2*)
815
1474
  + basic_os=nextstep2
816
1475
  ;;
817
1476
  *)
818
- - os=nextstep3
1477
+ - os=-nextstep3
819
1478
  + basic_os=nextstep3
820
1479
  ;;
821
1480
  esac
822
1481
  ;;
823
- @@ -838,12 +841,12 @@
1482
+ - nh3000)
1483
+ - basic_machine=m68k-harris
1484
+ - os=-cxux
1485
+ - ;;
1486
+ - nh[45]000)
1487
+ - basic_machine=m88k-harris
1488
+ - os=-cxux
1489
+ - ;;
1490
+ - nindy960)
1491
+ - basic_machine=i960-intel
1492
+ - os=-nindy
1493
+ - ;;
1494
+ - mon960)
1495
+ - basic_machine=i960-intel
1496
+ - os=-mon960
1497
+ - ;;
1498
+ - nonstopux)
1499
+ - basic_machine=mips-compaq
1500
+ - os=-nonstopux
1501
+ - ;;
1502
+ np1)
1503
+ - basic_machine=np1-gould
1504
+ - ;;
1505
+ - neo-tandem)
1506
+ - basic_machine=neo-tandem
1507
+ - ;;
1508
+ - nse-tandem)
1509
+ - basic_machine=nse-tandem
1510
+ - ;;
1511
+ - nsr-tandem)
1512
+ - basic_machine=nsr-tandem
1513
+ - ;;
1514
+ - nsv-tandem)
1515
+ - basic_machine=nsv-tandem
1516
+ - ;;
1517
+ - nsx-tandem)
1518
+ - basic_machine=nsx-tandem
1519
+ + cpu=np1
1520
+ + vendor=gould
1521
+ ;;
824
1522
  op50n-* | op60c-*)
825
- cpu=hppa1.1
826
- vendor=oki
827
- - os=proelf
1523
+ - basic_machine=hppa1.1-oki
1524
+ - os=-proelf
1525
+ - ;;
1526
+ - openrisc | openrisc-*)
1527
+ - basic_machine=or32-unknown
1528
+ - ;;
1529
+ - os400)
1530
+ - basic_machine=powerpc-ibm
1531
+ - os=-os400
1532
+ - ;;
1533
+ - OSE68000 | ose68000)
1534
+ - basic_machine=m68000-ericsson
1535
+ - os=-ose
1536
+ - ;;
1537
+ - os68k)
1538
+ - basic_machine=m68k-none
1539
+ - os=-os68k
1540
+ + cpu=hppa1.1
1541
+ + vendor=oki
828
1542
  + basic_os=proelf
829
1543
  ;;
830
1544
  pa-hitachi)
831
- cpu=hppa1.1
832
- vendor=hitachi
833
- - os=hiuxwe2
1545
+ - basic_machine=hppa1.1-hitachi
1546
+ - os=-hiuxwe2
1547
+ - ;;
1548
+ - paragon)
1549
+ - basic_machine=i860-intel
1550
+ - os=-osf
1551
+ - ;;
1552
+ - parisc)
1553
+ - basic_machine=hppa-unknown
1554
+ - os=-linux
1555
+ - ;;
1556
+ - parisc-*)
1557
+ - basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1558
+ - os=-linux
1559
+ + cpu=hppa1.1
1560
+ + vendor=hitachi
834
1561
  + basic_os=hiuxwe2
835
1562
  ;;
836
1563
  pbd)
837
- cpu=sparc
838
- @@ -880,12 +883,12 @@
839
- sde)
840
- cpu=mipsisa32
841
- vendor=sde
842
- - os=${os:-elf}
1564
+ - basic_machine=sparc-tti
1565
+ + cpu=sparc
1566
+ + vendor=tti
1567
+ ;;
1568
+ pbb)
1569
+ - basic_machine=m68k-tti
1570
+ + cpu=m68k
1571
+ + vendor=tti
1572
+ ;;
1573
+ - pc532 | pc532-*)
1574
+ - basic_machine=ns32k-pc532
1575
+ + pc532)
1576
+ + cpu=ns32k
1577
+ + vendor=pc532
1578
+ ;;
1579
+ - pc98)
1580
+ - basic_machine=i386-pc
1581
+ + pn)
1582
+ + cpu=pn
1583
+ + vendor=gould
1584
+ ;;
1585
+ - pc98-*)
1586
+ - basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1587
+ + power)
1588
+ + cpu=power
1589
+ + vendor=ibm
1590
+ ;;
1591
+ - pentium | p5 | k5 | k6 | nexgen | viac3)
1592
+ - basic_machine=i586-pc
1593
+ + ps2)
1594
+ + cpu=i386
1595
+ + vendor=ibm
1596
+ ;;
1597
+ - pentiumpro | p6 | 6x86 | athlon | athlon_*)
1598
+ - basic_machine=i686-pc
1599
+ + rm[46]00)
1600
+ + cpu=mips
1601
+ + vendor=siemens
1602
+ ;;
1603
+ - pentiumii | pentium2 | pentiumiii | pentium3)
1604
+ - basic_machine=i686-pc
1605
+ + rtpc | rtpc-*)
1606
+ + cpu=romp
1607
+ + vendor=ibm
1608
+ ;;
1609
+ - pentium4)
1610
+ - basic_machine=i786-pc
1611
+ + sde)
1612
+ + cpu=mipsisa32
1613
+ + vendor=sde
843
1614
  + basic_os=${basic_os:-elf}
844
1615
  ;;
845
- simso-wrs)
846
- cpu=sparclite
847
- vendor=wrs
848
- - os=vxworks
1616
+ - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
1617
+ - basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1618
+ + simso-wrs)
1619
+ + cpu=sparclite
1620
+ + vendor=wrs
849
1621
  + basic_os=vxworks
850
1622
  ;;
851
- tower | tower-32)
852
- cpu=m68k
853
- @@ -902,7 +905,7 @@
854
- w89k-*)
855
- cpu=hppa1.1
856
- vendor=winbond
857
- - os=proelf
1623
+ - pentiumpro-* | p6-* | 6x86-* | athlon-*)
1624
+ - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1625
+ + tower | tower-32)
1626
+ + cpu=m68k
1627
+ + vendor=ncr
1628
+ ;;
1629
+ - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
1630
+ - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1631
+ + vpp*|vx|vx-*)
1632
+ + cpu=f301
1633
+ + vendor=fujitsu
1634
+ ;;
1635
+ - pentium4-*)
1636
+ - basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1637
+ + w65)
1638
+ + cpu=w65
1639
+ + vendor=wdc
1640
+ ;;
1641
+ - pn)
1642
+ - basic_machine=pn-gould
1643
+ + w89k-*)
1644
+ + cpu=hppa1.1
1645
+ + vendor=winbond
858
1646
  + basic_os=proelf
859
1647
  ;;
860
- none)
861
- cpu=none
862
- @@ -914,11 +917,12 @@
863
- ;;
864
- leon-*|leon[3-9]-*)
865
- cpu=sparc
866
- - vendor=`echo "$basic_machine" | sed 's/-.*//'`
1648
+ - power) basic_machine=power-ibm
1649
+ + none)
1650
+ + cpu=none
1651
+ + vendor=none
1652
+ ;;
1653
+ - ppc | ppcbe) basic_machine=powerpc-unknown
1654
+ + leon|leon[3-9])
1655
+ + cpu=sparc
1656
+ + vendor=$basic_machine
1657
+ ;;
1658
+ - ppc-* | ppcbe-*)
1659
+ - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1660
+ + leon-*|leon[3-9]-*)
1661
+ + cpu=sparc
867
1662
  + vendor=$(echo "$basic_machine" | sed 's/-.*//')
868
1663
  ;;
869
-
870
- *-*)
871
- - IFS="-" read -r cpu vendor <<EOF
1664
+ - ppcle | powerpclittle)
1665
+ - basic_machine=powerpcle-unknown
1666
+ +
1667
+ + *-*)
872
1668
  + # shellcheck disable=SC2162
873
1669
  + IFS="-" read cpu vendor <<EOF
874
- $basic_machine
875
- EOF
1670
+ +$basic_machine
1671
+ +EOF
876
1672
  ;;
877
- @@ -950,15 +954,15 @@
878
-
879
- # Decode basic machines in the full and proper CPU-Company form.
880
- case $cpu-$vendor in
881
- - # Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
1673
+ - ppcle-* | powerpclittle-*)
1674
+ - basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1675
+ + # We use `pc' rather than `unknown'
1676
+ + # because (1) that's what they normally are, and
1677
+ + # (2) the word "unknown" tends to confuse beginning users.
1678
+ + i*86 | x86_64)
1679
+ + cpu=$basic_machine
1680
+ + vendor=pc
1681
+ ;;
1682
+ - ppc64) basic_machine=powerpc64-unknown
1683
+ + # These rules are duplicated from below for sake of the special case above;
1684
+ + # i.e. things that normalized to x86 arches should also default to "pc"
1685
+ + pc98)
1686
+ + cpu=i386
1687
+ + vendor=pc
1688
+ ;;
1689
+ - ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1690
+ + x64 | amd64)
1691
+ + cpu=x86_64
1692
+ + vendor=pc
1693
+ ;;
1694
+ - ppc64le | powerpc64little)
1695
+ - basic_machine=powerpc64le-unknown
1696
+ + # Recognize the basic CPU types without company name.
1697
+ + *)
1698
+ + cpu=$basic_machine
1699
+ + vendor=unknown
1700
+ ;;
1701
+ - ppc64le-* | powerpc64little-*)
1702
+ - basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1703
+ +esac
1704
+ +
1705
+ +unset -v basic_machine
1706
+ +
1707
+ +# Decode basic machines in the full and proper CPU-Company form.
1708
+ +case $cpu-$vendor in
882
1709
  + # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
883
- # some cases the only manufacturer, in others, it is the most popular.
884
- craynv-unknown)
885
- vendor=cray
886
- - os=${os:-unicosmp}
1710
+ + # some cases the only manufacturer, in others, it is the most popular.
1711
+ + craynv-unknown)
1712
+ + vendor=cray
887
1713
  + basic_os=${basic_os:-unicosmp}
888
1714
  ;;
889
- c90-unknown | c90-cray)
890
- vendor=cray
891
- - os=${os:-unicos}
1715
+ - ps2)
1716
+ - basic_machine=i386-ibm
1717
+ + c90-unknown | c90-cray)
1718
+ + vendor=cray
892
1719
  + basic_os=${Basic_os:-unicos}
893
1720
  ;;
894
- fx80-unknown)
895
- vendor=alliant
896
- @@ -1002,7 +1006,7 @@
897
- dpx20-unknown | dpx20-bull)
898
- cpu=rs6000
899
- vendor=bull
900
- - os=${os:-bosx}
1721
+ - pw32)
1722
+ - basic_machine=i586-unknown
1723
+ - os=-pw32
1724
+ - ;;
1725
+ - rdos | rdos64)
1726
+ - basic_machine=x86_64-pc
1727
+ - os=-rdos
1728
+ - ;;
1729
+ - rdos32)
1730
+ - basic_machine=i386-pc
1731
+ - os=-rdos
1732
+ - ;;
1733
+ - rom68k)
1734
+ - basic_machine=m68k-rom68k
1735
+ - os=-coff
1736
+ + fx80-unknown)
1737
+ + vendor=alliant
1738
+ ;;
1739
+ - rm[46]00)
1740
+ - basic_machine=mips-siemens
1741
+ + romp-unknown)
1742
+ + vendor=ibm
1743
+ ;;
1744
+ - rtpc | rtpc-*)
1745
+ - basic_machine=romp-ibm
1746
+ + mmix-unknown)
1747
+ + vendor=knuth
1748
+ ;;
1749
+ - s390 | s390-*)
1750
+ - basic_machine=s390-ibm
1751
+ + microblaze-unknown | microblazeel-unknown)
1752
+ + vendor=xilinx
1753
+ ;;
1754
+ - s390x | s390x-*)
1755
+ - basic_machine=s390x-ibm
1756
+ + rs6000-unknown)
1757
+ + vendor=ibm
1758
+ ;;
1759
+ - sa29200)
1760
+ - basic_machine=a29k-amd
1761
+ - os=-udi
1762
+ + vax-unknown)
1763
+ + vendor=dec
1764
+ ;;
1765
+ - sb1)
1766
+ - basic_machine=mipsisa64sb1-unknown
1767
+ + pdp11-unknown)
1768
+ + vendor=dec
1769
+ ;;
1770
+ - sb1el)
1771
+ - basic_machine=mipsisa64sb1el-unknown
1772
+ + we32k-unknown)
1773
+ + vendor=att
1774
+ ;;
1775
+ - sde)
1776
+ - basic_machine=mipsisa32-sde
1777
+ - os=-elf
1778
+ + cydra-unknown)
1779
+ + vendor=cydrome
1780
+ ;;
1781
+ - sei)
1782
+ - basic_machine=mips-sei
1783
+ - os=-seiux
1784
+ + i370-ibm*)
1785
+ + vendor=ibm
1786
+ ;;
1787
+ - sequent)
1788
+ - basic_machine=i386-sequent
1789
+ + orion-unknown)
1790
+ + vendor=highlevel
1791
+ ;;
1792
+ - sh5el)
1793
+ - basic_machine=sh5le-unknown
1794
+ + xps-unknown | xps100-unknown)
1795
+ + cpu=xps100
1796
+ + vendor=honeywell
1797
+ ;;
1798
+ - simso-wrs)
1799
+ - basic_machine=sparclite-wrs
1800
+ - os=-vxworks
1801
+ +
1802
+ + # Here we normalize CPU types with a missing or matching vendor
1803
+ + dpx20-unknown | dpx20-bull)
1804
+ + cpu=rs6000
1805
+ + vendor=bull
901
1806
  + basic_os=${basic_os:-bosx}
902
1807
  ;;
903
-
904
- # Here we normalize CPU types irrespective of the vendor
905
- @@ -1011,7 +1015,7 @@
906
- ;;
907
- blackfin-*)
908
- cpu=bfin
909
- - os=linux
1808
+ - sps7)
1809
+ - basic_machine=m68k-bull
1810
+ - os=-sysv2
1811
+ - ;;
1812
+ - spur)
1813
+ - basic_machine=spur-unknown
1814
+ - ;;
1815
+ - st2000)
1816
+ - basic_machine=m68k-tandem
1817
+ - ;;
1818
+ - stratus)
1819
+ - basic_machine=i860-stratus
1820
+ - os=-sysv4
1821
+ +
1822
+ + # Here we normalize CPU types irrespective of the vendor
1823
+ + amd64-*)
1824
+ + cpu=x86_64
1825
+ ;;
1826
+ - strongarm-* | thumb-*)
1827
+ - basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1828
+ + blackfin-*)
1829
+ + cpu=bfin
910
1830
  + basic_os=linux
911
1831
  ;;
912
- c54x-*)
913
- cpu=tic54x
914
- @@ -1024,7 +1028,7 @@
915
- ;;
916
- e500v[12]-*)
917
- cpu=powerpc
918
- - os=$os"spe"
1832
+ - sun2)
1833
+ - basic_machine=m68000-sun
1834
+ + c54x-*)
1835
+ + cpu=tic54x
1836
+ ;;
1837
+ - sun2os3)
1838
+ - basic_machine=m68000-sun
1839
+ - os=-sunos3
1840
+ + c55x-*)
1841
+ + cpu=tic55x
1842
+ ;;
1843
+ - sun2os4)
1844
+ - basic_machine=m68000-sun
1845
+ - os=-sunos4
1846
+ + c6x-*)
1847
+ + cpu=tic6x
1848
+ ;;
1849
+ - sun3os3)
1850
+ - basic_machine=m68k-sun
1851
+ - os=-sunos3
1852
+ + e500v[12]-*)
1853
+ + cpu=powerpc
919
1854
  + basic_os=${basic_os}"spe"
920
1855
  ;;
921
- mips3*-*)
922
- cpu=mips64
923
- @@ -1034,7 +1038,7 @@
924
- ;;
925
- m68knommu-*)
926
- cpu=m68k
927
- - os=linux
1856
+ - sun3os4)
1857
+ - basic_machine=m68k-sun
1858
+ - os=-sunos4
1859
+ + mips3*-*)
1860
+ + cpu=mips64
1861
+ ;;
1862
+ - sun4os3)
1863
+ - basic_machine=sparc-sun
1864
+ - os=-sunos3
1865
+ + ms1-*)
1866
+ + cpu=mt
1867
+ ;;
1868
+ - sun4os4)
1869
+ - basic_machine=sparc-sun
1870
+ - os=-sunos4
1871
+ + m68knommu-*)
1872
+ + cpu=m68k
928
1873
  + basic_os=linux
929
1874
  ;;
930
- m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
931
- cpu=s12z
932
- @@ -1044,7 +1048,7 @@
933
- ;;
934
- parisc-*)
935
- cpu=hppa
936
- - os=linux
1875
+ - sun4sol2)
1876
+ - basic_machine=sparc-sun
1877
+ - os=-solaris2
1878
+ + m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
1879
+ + cpu=s12z
1880
+ ;;
1881
+ - sun3 | sun3-*)
1882
+ - basic_machine=m68k-sun
1883
+ + openrisc-*)
1884
+ + cpu=or32
1885
+ ;;
1886
+ - sun4)
1887
+ - basic_machine=sparc-sun
1888
+ + parisc-*)
1889
+ + cpu=hppa
937
1890
  + basic_os=linux
938
1891
  ;;
939
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
940
- cpu=i586
941
- @@ -1080,7 +1084,7 @@
942
- cpu=mipsisa64sb1el
943
- ;;
944
- sh5e[lb]-*)
945
- - cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
1892
+ - sun386 | sun386i | roadrunner)
1893
+ - basic_machine=i386-sun
1894
+ + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
1895
+ + cpu=i586
1896
+ ;;
1897
+ - sv1)
1898
+ - basic_machine=sv1-cray
1899
+ - os=-unicos
1900
+ + pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
1901
+ + cpu=i686
1902
+ ;;
1903
+ - symmetry)
1904
+ - basic_machine=i386-sequent
1905
+ - os=-dynix
1906
+ + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
1907
+ + cpu=i686
1908
+ ;;
1909
+ - t3e)
1910
+ - basic_machine=alphaev5-cray
1911
+ - os=-unicos
1912
+ + pentium4-*)
1913
+ + cpu=i786
1914
+ ;;
1915
+ - t90)
1916
+ - basic_machine=t90-cray
1917
+ - os=-unicos
1918
+ + pc98-*)
1919
+ + cpu=i386
1920
+ ;;
1921
+ - tile*)
1922
+ - basic_machine=$basic_machine-unknown
1923
+ - os=-linux-gnu
1924
+ + ppc-* | ppcbe-*)
1925
+ + cpu=powerpc
1926
+ ;;
1927
+ - tx39)
1928
+ - basic_machine=mipstx39-unknown
1929
+ + ppcle-* | powerpclittle-*)
1930
+ + cpu=powerpcle
1931
+ ;;
1932
+ - tx39el)
1933
+ - basic_machine=mipstx39el-unknown
1934
+ + ppc64-*)
1935
+ + cpu=powerpc64
1936
+ ;;
1937
+ - toad1)
1938
+ - basic_machine=pdp10-xkl
1939
+ - os=-tops20
1940
+ + ppc64le-* | powerpc64little-*)
1941
+ + cpu=powerpc64le
1942
+ ;;
1943
+ - tower | tower-32)
1944
+ - basic_machine=m68k-ncr
1945
+ + sb1-*)
1946
+ + cpu=mipsisa64sb1
1947
+ ;;
1948
+ - tpf)
1949
+ - basic_machine=s390x-ibm
1950
+ - os=-tpf
1951
+ - ;;
1952
+ - udi29k)
1953
+ - basic_machine=a29k-amd
1954
+ - os=-udi
1955
+ - ;;
1956
+ - ultra3)
1957
+ - basic_machine=a29k-nyu
1958
+ - os=-sym1
1959
+ - ;;
1960
+ - v810 | necv810)
1961
+ - basic_machine=v810-nec
1962
+ - os=-none
1963
+ - ;;
1964
+ - vaxv)
1965
+ - basic_machine=vax-dec
1966
+ - os=-sysv
1967
+ - ;;
1968
+ - vms)
1969
+ - basic_machine=vax-dec
1970
+ - os=-vms
1971
+ + sb1el-*)
1972
+ + cpu=mipsisa64sb1el
1973
+ ;;
1974
+ - vpp*|vx|vx-*)
1975
+ - basic_machine=f301-fujitsu
1976
+ + sh5e[lb]-*)
946
1977
  + cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/')
947
1978
  ;;
948
- spur-*)
949
- cpu=spur
950
- @@ -1098,13 +1102,16 @@
951
- cpu=x86_64
1979
+ - vxworks960)
1980
+ - basic_machine=i960-wrs
1981
+ - os=-vxworks
1982
+ - ;;
1983
+ - vxworks68)
1984
+ - basic_machine=m68k-wrs
1985
+ - os=-vxworks
1986
+ - ;;
1987
+ - vxworks29k)
1988
+ - basic_machine=a29k-wrs
1989
+ - os=-vxworks
1990
+ - ;;
1991
+ - w65*)
1992
+ - basic_machine=w65-wdc
1993
+ - os=-none
1994
+ + spur-*)
1995
+ + cpu=spur
1996
+ ;;
1997
+ - w89k-*)
1998
+ - basic_machine=hppa1.1-winbond
1999
+ - os=-proelf
2000
+ + strongarm-* | thumb-*)
2001
+ + cpu=arm
2002
+ ;;
2003
+ - x64)
2004
+ - basic_machine=x86_64-pc
2005
+ + tx39-*)
2006
+ + cpu=mipstx39
2007
+ ;;
2008
+ - xbox)
2009
+ - basic_machine=i686-pc
2010
+ - os=-mingw32
2011
+ + tx39el-*)
2012
+ + cpu=mipstx39el
2013
+ ;;
2014
+ - xps | xps100)
2015
+ - basic_machine=xps100-honeywell
2016
+ + x64-*)
2017
+ + cpu=x86_64
952
2018
  ;;
953
2019
  xscale-* | xscalee[bl]-*)
954
- - cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
2020
+ - basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
955
2021
  + cpu=$(echo "$cpu" | sed 's/^xscale/arm/')
956
- + ;;
2022
+ ;;
2023
+ - ymp)
2024
+ - basic_machine=ymp-cray
2025
+ - os=-unicos
2026
+ - ;;
2027
+ - none)
2028
+ - basic_machine=none-none
2029
+ - os=-none
957
2030
  + arm64-*)
958
2031
  + cpu=aarch64
959
2032
  ;;
960
2033
 
961
- - # Recognize the cannonical CPU Types that limit and/or modify the
2034
+ -# Here we handle the default manufacturer of certain CPU types. It is in
2035
+ -# some cases the only manufacturer, in others, it is the most popular.
2036
+ - w89k)
2037
+ - basic_machine=hppa1.1-winbond
2038
+ - ;;
2039
+ - op50n)
2040
+ - basic_machine=hppa1.1-oki
2041
+ - ;;
2042
+ - op60c)
2043
+ - basic_machine=hppa1.1-oki
962
2044
  + # Recognize the canonical CPU Types that limit and/or modify the
963
- # company names they are paired with.
964
- cr16-*)
965
- - os=${os:-elf}
2045
+ + # company names they are paired with.
2046
+ + cr16-*)
966
2047
  + basic_os=${basic_os:-elf}
967
2048
  ;;
968
- crisv32-* | etraxfs*-*)
969
- cpu=crisv32
970
- @@ -1115,7 +1122,7 @@
971
- vendor=axis
972
- ;;
973
- crx-*)
974
- - os=${os:-elf}
2049
+ - romp)
2050
+ - basic_machine=romp-ibm
2051
+ + crisv32-* | etraxfs*-*)
2052
+ + cpu=crisv32
2053
+ + vendor=axis
2054
+ ;;
2055
+ - mmix)
2056
+ - basic_machine=mmix-knuth
2057
+ + cris-* | etrax*-*)
2058
+ + cpu=cris
2059
+ + vendor=axis
2060
+ ;;
2061
+ - rs6000)
2062
+ - basic_machine=rs6000-ibm
2063
+ + crx-*)
975
2064
  + basic_os=${basic_os:-elf}
976
2065
  ;;
977
- neo-tandem)
978
- cpu=neo
979
- @@ -1137,20 +1144,16 @@
980
- cpu=nsx
981
- vendor=tandem
982
- ;;
983
- - s390-*)
984
- - cpu=s390
985
- - vendor=ibm
2066
+ - vax)
2067
+ - basic_machine=vax-dec
986
2068
  - ;;
987
- - s390x-*)
988
- - cpu=s390x
989
- - vendor=ibm
2069
+ - pdp11)
2070
+ - basic_machine=pdp11-dec
2071
+ - ;;
2072
+ - we32k)
2073
+ - basic_machine=we32k-att
2074
+ - ;;
2075
+ - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
2076
+ - basic_machine=sh-unknown
2077
+ + neo-tandem)
2078
+ + cpu=neo
2079
+ + vendor=tandem
2080
+ ;;
2081
+ - cydra)
2082
+ - basic_machine=cydra-cydrome
2083
+ + nse-tandem)
2084
+ + cpu=nse
2085
+ + vendor=tandem
2086
+ ;;
2087
+ - orion)
2088
+ - basic_machine=orion-highlevel
2089
+ + nsr-tandem)
2090
+ + cpu=nsr
2091
+ + vendor=tandem
2092
+ ;;
2093
+ - orion105)
2094
+ - basic_machine=clipper-highlevel
2095
+ + nsv-tandem)
2096
+ + cpu=nsv
2097
+ + vendor=tandem
2098
+ ;;
2099
+ - mac | mpw | mac-mpw)
2100
+ - basic_machine=m68k-apple
2101
+ + nsx-tandem)
2102
+ + cpu=nsx
2103
+ + vendor=tandem
2104
+ ;;
2105
+ - pmac | pmac-mpw)
2106
+ - basic_machine=powerpc-apple
990
2107
  + mipsallegrexel-sony)
991
2108
  + cpu=mipsallegrexel
992
2109
  + vendor=sony
993
2110
  ;;
994
- tile*-*)
995
- - os=${os:-linux-gnu}
2111
+ - *-unknown)
2112
+ - # Make sure to match an already-canonicalized machine name.
2113
+ + tile*-*)
996
2114
  + basic_os=${basic_os:-linux-gnu}
997
2115
  ;;
998
-
2116
+ +
999
2117
  *)
1000
- - # Recognize the cannonical CPU types that are allowed with any
2118
+ - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
2119
+ - exit 1
1001
2120
  + # Recognize the canonical CPU types that are allowed with any
1002
- # company name.
1003
- case $cpu in
1004
- 1750a | 580 \
1005
- @@ -1161,13 +1164,14 @@
1006
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
1007
- | alphapca5[67] | alpha64pca5[67] \
1008
- | am33_2.0 \
2121
+ + # company name.
2122
+ + case $cpu in
2123
+ + 1750a | 580 \
2124
+ + | a29k \
2125
+ + | aarch64 | aarch64_be \
2126
+ + | abacus \
2127
+ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
2128
+ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
2129
+ + | alphapca5[67] | alpha64pca5[67] \
2130
+ + | am33_2.0 \
1009
2131
  + | amdgcn \
1010
- | arc | arceb \
1011
- - | arm | arm[lb]e | arme[lb] | armv* \
2132
+ + | arc | arceb \
1012
2133
  + | arm | arm[lb]e | arme[lb] | armv* \
1013
- | avr | avr32 \
1014
- | asmjs \
1015
- | ba \
1016
- | be32 | be64 \
1017
- - | bfin | bs2000 \
2134
+ + | avr | avr32 \
2135
+ + | asmjs \
2136
+ + | ba \
2137
+ + | be32 | be64 \
1018
2138
  + | bfin | bpf | bs2000 \
1019
- | c[123]* | c30 | [cjt]90 | c4x \
1020
- | c8051 | clipper | craynv | csky | cydra \
1021
- | d10v | d30v | dlx | dsp16xx \
1022
- @@ -1182,13 +1186,13 @@
1023
- | le32 | le64 \
1024
- | lm32 \
1025
- | m32c | m32r | m32rle \
1026
- - | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
1027
- - | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
2139
+ + | c[123]* | c30 | [cjt]90 | c4x \
2140
+ + | c8051 | clipper | craynv | csky | cydra \
2141
+ + | d10v | d30v | dlx | dsp16xx \
2142
+ + | e2k | elxsi | epiphany \
2143
+ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
2144
+ + | h8300 | h8500 \
2145
+ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
2146
+ + | hexagon \
2147
+ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \
2148
+ + | ip2k | iq2000 \
2149
+ + | k1om \
2150
+ + | le32 | le64 \
2151
+ + | lm32 \
2152
+ + | m32c | m32r | m32rle \
1028
2153
  + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
1029
2154
  + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
1030
- | m88110 | m88k | maxq | mb | mcore | mep | metag \
1031
- | microblaze | microblazeel \
1032
- | mips | mipsbe | mipseb | mipsel | mipsle \
1033
- | mips16 \
1034
- - | mips64 | mips64el \
2155
+ + | m88110 | m88k | maxq | mb | mcore | mep | metag \
2156
+ + | microblaze | microblazeel \
2157
+ + | mips | mipsbe | mipseb | mipsel | mipsle \
2158
+ + | mips16 \
1035
2159
  + | mips64 | mips64eb | mips64el \
1036
- | mips64octeon | mips64octeonel \
1037
- | mips64orion | mips64orionel \
1038
- | mips64r5900 | mips64r5900el \
1039
- @@ -1215,19 +1219,22 @@
1040
- | nds32 | nds32le | nds32be \
1041
- | nfp \
1042
- | nios | nios2 | nios2eb | nios2el \
1043
- - | none | np1 | ns16k | ns32k \
2160
+ + | mips64octeon | mips64octeonel \
2161
+ + | mips64orion | mips64orionel \
2162
+ + | mips64r5900 | mips64r5900el \
2163
+ + | mips64vr | mips64vrel \
2164
+ + | mips64vr4100 | mips64vr4100el \
2165
+ + | mips64vr4300 | mips64vr4300el \
2166
+ + | mips64vr5000 | mips64vr5000el \
2167
+ + | mips64vr5900 | mips64vr5900el \
2168
+ + | mipsisa32 | mipsisa32el \
2169
+ + | mipsisa32r2 | mipsisa32r2el \
2170
+ + | mipsisa32r6 | mipsisa32r6el \
2171
+ + | mipsisa64 | mipsisa64el \
2172
+ + | mipsisa64r2 | mipsisa64r2el \
2173
+ + | mipsisa64r6 | mipsisa64r6el \
2174
+ + | mipsisa64sb1 | mipsisa64sb1el \
2175
+ + | mipsisa64sr71k | mipsisa64sr71kel \
2176
+ + | mipsr5900 | mipsr5900el \
2177
+ + | mipstx39 | mipstx39el \
2178
+ + | mmix \
2179
+ + | mn10200 | mn10300 \
2180
+ + | moxie \
2181
+ + | mt \
2182
+ + | msp430 \
2183
+ + | nds32 | nds32le | nds32be \
2184
+ + | nfp \
2185
+ + | nios | nios2 | nios2eb | nios2el \
1044
2186
  + | none | np1 | ns16k | ns32k | nvptx \
1045
- | open8 \
1046
- | or1k* \
1047
- | or32 \
1048
- | orion \
2187
+ + | open8 \
2188
+ + | or1k* \
2189
+ + | or32 \
2190
+ + | orion \
1049
2191
  + | picochip \
1050
- | pdp10 | pdp11 | pj | pjl | pn | power \
1051
- | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
1052
- | pru \
1053
- | pyramid \
1054
- | riscv | riscv32 | riscv64 \
1055
- | rl78 | romp | rs6000 | rx \
2192
+ + | pdp10 | pdp11 | pj | pjl | pn | power \
2193
+ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
2194
+ + | pru \
2195
+ + | pyramid \
2196
+ + | riscv | riscv32 | riscv64 \
2197
+ + | rl78 | romp | rs6000 | rx \
1056
2198
  + | s390 | s390x \
1057
- | score \
1058
- - | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
2199
+ + | score \
1059
2200
  + | sh | shl \
1060
2201
  + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
1061
- | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
1062
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
1063
- | sparclite \
1064
- @@ -1237,10 +1244,11 @@
1065
- | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
1066
- | tron \
1067
- | ubicom32 \
1068
- - | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
2202
+ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
2203
+ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
2204
+ + | sparclite \
2205
+ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
2206
+ + | spu \
2207
+ + | tahoe \
2208
+ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
2209
+ + | tron \
2210
+ + | ubicom32 \
1069
2211
  + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
1070
- | vax \
1071
- | visium \
1072
- - | wasm32 \
2212
+ + | vax \
2213
+ + | visium \
1073
2214
  + | w65 \
1074
2215
  + | wasm32 | wasm64 \
1075
- | we32k \
1076
- | x86 | x86_64 | xc16x | xgate | xps100 \
1077
- | xstormy16 | xtensa* \
1078
- @@ -1270,8 +1278,47 @@
2216
+ + | we32k \
2217
+ + | x86 | x86_64 | xc16x | xgate | xps100 \
2218
+ + | xstormy16 | xtensa* \
2219
+ + | ymp \
2220
+ + | z8k | z80)
2221
+ + ;;
2222
+ +
2223
+ + *)
2224
+ + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
2225
+ + exit 1
2226
+ + ;;
2227
+ + esac
2228
+ ;;
2229
+ esac
2230
+
2231
+ # Here we canonicalize certain aliases for manufacturers.
2232
+ -case $basic_machine in
2233
+ - *-digital*)
2234
+ - basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
2235
+ +case $vendor in
2236
+ + digital*)
2237
+ + vendor=dec
2238
+ ;;
2239
+ - *-commodore*)
2240
+ - basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
2241
+ + commodore*)
2242
+ + vendor=cbm
2243
+ ;;
2244
+ *)
2245
+ ;;
2246
+ @@ -1334,203 +1278,213 @@
1079
2247
 
1080
2248
  # Decode manufacturer-specific aliases for certain operating systems.
1081
2249
 
1082
- -if [ x$os != x ]
2250
+ -if [ x"$os" != x"" ]
1083
2251
  +if test x$basic_os != x
1084
2252
  then
1085
2253
  +
@@ -1124,184 +2292,301 @@ aarch64/arm64/M1 can compile.
1124
2292
  case $os in
1125
2293
  # First match some system type aliases that might get confused
1126
2294
  # with valid system types.
1127
- @@ -1283,7 +1330,7 @@
1128
- os=cnk
1129
- ;;
1130
- solaris1 | solaris1.*)
2295
+ - # -solaris* is a basic system type, with this one exception.
2296
+ - -auroraux)
2297
+ - os=-auroraux
2298
+ + # solaris* is a basic system type, with this one exception.
2299
+ + auroraux)
2300
+ + os=auroraux
2301
+ ;;
2302
+ - -solaris1 | -solaris1.*)
1131
2303
  - os=`echo $os | sed -e 's|solaris1|sunos4|'`
2304
+ + bluegene*)
2305
+ + os=cnk
2306
+ ;;
2307
+ - -solaris)
2308
+ - os=-solaris2
2309
+ + solaris1 | solaris1.*)
1132
2310
  + os=$(echo $os | sed -e 's|solaris1|sunos4|')
1133
2311
  ;;
1134
- solaris)
1135
- os=solaris2
1136
- @@ -1291,9 +1338,6 @@
1137
- unixware*)
1138
- os=sysv4.2uw
2312
+ - -unixware*)
2313
+ - os=-sysv4.2uw
2314
+ + solaris)
2315
+ + os=solaris2
1139
2316
  ;;
1140
- - gnu/linux*)
2317
+ - -gnu/linux*)
1141
2318
  - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1142
- - ;;
1143
- # es1800 is here to avoid being matched by es* (a different OS)
1144
- es1800*)
1145
- os=ose
1146
- @@ -1315,12 +1359,9 @@
1147
- os=sco3.2v4
1148
- ;;
1149
- sco3.2.[4-9]*)
1150
- - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
1151
- - ;;
1152
- - sco3.2v[4-9]* | sco5v6*)
1153
- - # Don't forget version if it is 3.2v4 or newer.
1154
- + os=$(echo $os | sed -e 's/sco3.2./sco3.2v/')
2319
+ + unixware*)
2320
+ + os=sysv4.2uw
1155
2321
  ;;
1156
- - scout)
1157
- + sco*v* | scout)
1158
- # Don't match below
1159
- ;;
1160
- sco*)
1161
- @@ -1329,78 +1370,26 @@
1162
- psos*)
1163
- os=psos
2322
+ # es1800 is here to avoid being matched by es* (a different OS)
2323
+ - -es1800*)
2324
+ - os=-ose
2325
+ + es1800*)
2326
+ + os=ose
1164
2327
  ;;
1165
2328
  - # Now accept the basic system types.
1166
2329
  - # The portable systems comes first.
1167
2330
  - # Each alternative MUST end in a * to match a version number.
1168
- - # sysv* is not here because it comes later, after sysvr4.
1169
- - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
1170
- - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
1171
- - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
1172
- - | sym* | kopensolaris* | plan9* \
1173
- - | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
1174
- - | aos* | aros* | cloudabi* | sortix* \
1175
- - | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
1176
- - | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
1177
- - | knetbsd* | mirbsd* | netbsd* \
1178
- - | bitrig* | openbsd* | solidbsd* | libertybsd* \
1179
- - | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
1180
- - | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
1181
- - | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
1182
- - | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
1183
- - | chorusrdb* | cegcc* | glidix* \
1184
- - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
1185
- - | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
1186
- - | linux-newlib* | linux-musl* | linux-uclibc* \
1187
- - | uxpv* | beos* | mpeix* | udk* | moxiebox* \
1188
- - | interix* | uwin* | mks* | rhapsody* | darwin* \
1189
- - | openstep* | oskit* | conix* | pw32* | nonstopux* \
1190
- - | storm-chaos* | tops10* | tenex* | tops20* | its* \
1191
- - | os2* | vos* | palmos* | uclinux* | nucleus* \
1192
- - | morphos* | superux* | rtmk* | windiss* \
1193
- - | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
1194
- - | skyos* | haiku* | rdos* | toppers* | drops* | es* \
1195
- - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
1196
- - | midnightbsd*)
2331
+ - # -sysv* is not here because it comes later, after sysvr4.
2332
+ - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
2333
+ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
2334
+ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
2335
+ - | -sym* | -kopensolaris* | -plan9* \
2336
+ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
2337
+ - | -aos* | -aros* | -cloudabi* | -sortix* \
2338
+ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
2339
+ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
2340
+ - | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
2341
+ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
2342
+ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
2343
+ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
2344
+ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
2345
+ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
2346
+ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
2347
+ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
2348
+ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
2349
+ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \
2350
+ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
2351
+ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
2352
+ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
2353
+ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
2354
+ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
2355
+ - | -morphos* | -superux* | -rtmk* | -windiss* \
2356
+ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
2357
+ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
2358
+ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
2359
+ - | -midnightbsd*)
1197
2360
  - # Remember, each alternative MUST END IN *, to match a version number.
1198
2361
  - ;;
1199
- qnx*)
1200
- - case $cpu in
1201
- - x86 | i*86)
2362
+ - -qnx*)
2363
+ - case $basic_machine in
2364
+ - x86-* | i*86-*)
1202
2365
  - ;;
1203
2366
  - *)
1204
- - os=nto-$os
2367
+ - os=-nto$os
1205
2368
  - ;;
1206
2369
  - esac
1207
- + os=qnx
2370
+ + # Some version numbers need modification
2371
+ + chorusos*)
2372
+ + os=chorusos
1208
2373
  ;;
1209
- hiux*)
1210
- os=hiuxwe2
2374
+ - -nto-qnx*)
2375
+ + isc)
2376
+ + os=isc2.2
1211
2377
  ;;
1212
- - nto-qnx*)
1213
- - ;;
1214
- - nto*)
2378
+ - -nto*)
1215
2379
  - os=`echo $os | sed -e 's|nto|nto-qnx|'`
1216
- - ;;
1217
- - sim | xray | os68k* | v88r* \
1218
- - | windows* | osx | abug | netware* | os9* \
1219
- - | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
1220
- - ;;
1221
- - linux-dietlibc)
1222
- - os=linux-dietlibc
1223
- - ;;
1224
- - linux*)
2380
+ + sco6)
2381
+ + os=sco5v6
2382
+ ;;
2383
+ - -sim | -xray | -os68k* | -v88r* \
2384
+ - | -windows* | -osx | -abug | -netware* | -os9* \
2385
+ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
2386
+ + sco5)
2387
+ + os=sco3.2v5
2388
+ ;;
2389
+ - -mac*)
2390
+ - os=`echo "$os" | sed -e 's|mac|macos|'`
2391
+ + sco4)
2392
+ + os=sco3.2v4
2393
+ ;;
2394
+ - -linux-dietlibc)
2395
+ - os=-linux-dietlibc
2396
+ + sco3.2.[4-9]*)
2397
+ + os=$(echo $os | sed -e 's/sco3.2./sco3.2v/')
2398
+ ;;
2399
+ - -linux*)
1225
2400
  - os=`echo $os | sed -e 's|linux|linux-gnu|'`
1226
- - ;;
1227
- lynx*178)
1228
- os=lynxos178
2401
+ + sco*v* | scout)
2402
+ + # Don't match below
2403
+ ;;
2404
+ - -sunos5*)
2405
+ - os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
2406
+ + sco*)
2407
+ + os=sco3.2v2
2408
+ ;;
2409
+ - -sunos6*)
2410
+ - os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
2411
+ + psos*)
2412
+ + os=psos
1229
2413
  ;;
1230
- lynx*5)
1231
- os=lynxos5
2414
+ - -opened*)
2415
+ - os=-openedition
2416
+ + qnx*)
2417
+ + os=qnx
2418
+ ;;
2419
+ - -os400*)
2420
+ - os=-os400
2421
+ + hiux*)
2422
+ + os=hiuxwe2
2423
+ ;;
2424
+ - -wince*)
2425
+ - os=-wince
2426
+ + lynx*178)
2427
+ + os=lynxos178
2428
+ ;;
2429
+ - -utek*)
2430
+ - os=-bsd
2431
+ + lynx*5)
2432
+ + os=lynxos5
1232
2433
  ;;
2434
+ - -dynix*)
2435
+ - os=-bsd
1233
2436
  + lynxos*)
1234
2437
  + # don't get caught up in next wildcard
1235
- + ;;
1236
- lynx*)
1237
- os=lynxos
1238
2438
  ;;
1239
- - mac*)
1240
- - os=`echo "$os" | sed -e 's|mac|macos|'`
2439
+ - -acis*)
2440
+ - os=-aos
2441
+ + lynx*)
2442
+ + os=lynxos
2443
+ ;;
2444
+ - -atheos*)
2445
+ - os=-atheos
1241
2446
  + mac[0-9]*)
1242
2447
  + os=$(echo "$os" | sed -e 's|mac|macos|')
1243
2448
  ;;
1244
- opened*)
1245
- os=openedition
1246
- @@ -1409,10 +1398,10 @@
1247
- os=os400
2449
+ - -syllable*)
2450
+ - os=-syllable
2451
+ + opened*)
2452
+ + os=openedition
1248
2453
  ;;
1249
- sunos5*)
1250
- - os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
2454
+ - -386bsd)
2455
+ - os=-bsd
2456
+ + os400*)
2457
+ + os=os400
2458
+ ;;
2459
+ - -ctix* | -uts*)
2460
+ - os=-sysv
2461
+ + sunos5*)
1251
2462
  + os=$(echo "$os" | sed -e 's|sunos5|solaris2|')
1252
2463
  ;;
1253
- sunos6*)
1254
- - os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
2464
+ - -nova*)
2465
+ - os=-rtmk-nova
2466
+ + sunos6*)
1255
2467
  + os=$(echo "$os" | sed -e 's|sunos6|solaris3|')
1256
2468
  ;;
1257
- wince*)
1258
- os=wince
1259
- @@ -1444,12 +1433,9 @@
1260
- ns2)
1261
- os=nextstep2
2469
+ - -ns2)
2470
+ - os=-nextstep2
2471
+ + wince*)
2472
+ + os=wince
1262
2473
  ;;
1263
- - nsk*)
1264
- - os=nsk
1265
- - ;;
1266
- # Preserve the version number of sinix5.
1267
- sinix5.*)
2474
+ - -nsk*)
2475
+ - os=-nsk
2476
+ + utek*)
2477
+ + os=bsd
2478
+ ;;
2479
+ - # Preserve the version number of sinix5.
2480
+ - -sinix5.*)
1268
2481
  - os=`echo $os | sed -e 's|sinix|sysv|'`
2482
+ + dynix*)
2483
+ + os=bsd
2484
+ + ;;
2485
+ + acis*)
2486
+ + os=aos
2487
+ + ;;
2488
+ + atheos*)
2489
+ + os=atheos
2490
+ + ;;
2491
+ + syllable*)
2492
+ + os=syllable
2493
+ + ;;
2494
+ + 386bsd)
2495
+ + os=bsd
2496
+ + ;;
2497
+ + ctix* | uts*)
2498
+ + os=sysv
2499
+ ;;
2500
+ - -sinix*)
2501
+ - os=-sysv4
2502
+ + nova*)
2503
+ + os=rtmk-nova
2504
+ ;;
2505
+ - -tpf*)
2506
+ - os=-tpf
2507
+ + ns2)
2508
+ + os=nextstep2
2509
+ ;;
2510
+ - -triton*)
2511
+ - os=-sysv3
2512
+ + # Preserve the version number of sinix5.
2513
+ + sinix5.*)
1269
2514
  + os=$(echo $os | sed -e 's|sinix|sysv|')
1270
2515
  ;;
1271
- sinix*)
1272
- os=sysv4
1273
- @@ -1472,18 +1458,12 @@
1274
- sysvr4)
1275
- os=sysv4
1276
- ;;
1277
- - # This must come after sysvr4.
1278
- - sysv*)
1279
- - ;;
1280
- ose*)
1281
- os=ose
1282
- ;;
1283
- *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
1284
- os=mint
1285
- ;;
1286
- - zvmoe)
1287
- - os=zvmoe
1288
- - ;;
1289
- dicos*)
1290
- os=dicos
1291
- ;;
1292
- @@ -1500,19 +1480,11 @@
2516
+ - -oss*)
2517
+ - os=-sysv3
2518
+ + sinix*)
2519
+ + os=sysv4
2520
+ ;;
2521
+ - -svr4*)
2522
+ - os=-sysv4
2523
+ + tpf*)
2524
+ + os=tpf
2525
+ ;;
2526
+ - -svr3)
2527
+ - os=-sysv3
2528
+ + triton*)
2529
+ + os=sysv3
2530
+ ;;
2531
+ - -sysvr4)
2532
+ - os=-sysv4
2533
+ + oss*)
2534
+ + os=sysv3
2535
+ ;;
2536
+ - # This must come after -sysvr4.
2537
+ - -sysv*)
2538
+ + svr4*)
2539
+ + os=sysv4
2540
+ ;;
2541
+ - -ose*)
2542
+ - os=-ose
2543
+ + svr3)
2544
+ + os=sysv3
2545
+ ;;
2546
+ - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
2547
+ - os=-mint
2548
+ + sysvr4)
2549
+ + os=sysv4
2550
+ ;;
2551
+ - -zvmoe)
2552
+ - os=-zvmoe
2553
+ + ose*)
2554
+ + os=ose
2555
+ ;;
2556
+ - -dicos*)
2557
+ - os=-dicos
2558
+ + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
2559
+ + os=mint
2560
+ ;;
2561
+ - -pikeos*)
2562
+ + dicos*)
2563
+ + os=dicos
2564
+ + ;;
2565
+ + pikeos*)
2566
+ # Until real need of OS specific support for
2567
+ # particular features comes up, bare metal
2568
+ # configurations are quite functional.
2569
+ - case $basic_machine in
2570
+ + case $cpu in
2571
+ arm*)
2572
+ - os=-eabi
2573
+ + os=eabi
2574
+ ;;
2575
+ *)
2576
+ - os=-elf
2577
+ + os=elf
1293
2578
  ;;
1294
2579
  esac
1295
2580
  ;;
1296
- - nacl*)
2581
+ - -nacl*)
1297
2582
  - ;;
1298
- - ios)
1299
- - ;;
1300
- - none)
2583
+ - -ios)
1301
2584
  - ;;
1302
- - *-eabi)
2585
+ - -none)
1303
2586
  - ;;
1304
2587
  *)
2588
+ - # Get rid of the `-' at the beginning of $os.
2589
+ - os=`echo $os | sed 's/[^-]*-//'`
1305
2590
  - echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
1306
2591
  - exit 1
1307
2592
  + # No normalization, but not necessarily accepted, that comes below.
@@ -1311,26 +2596,244 @@ aarch64/arm64/M1 can compile.
1311
2596
  else
1312
2597
 
1313
2598
  # Here we handle the default operating systems that come with various machines.
1314
- @@ -1525,6 +1497,7 @@
2599
+ @@ -1543,258 +1497,356 @@
1315
2600
  # will signal an error saying that MANUFACTURER isn't an operating
1316
2601
  # system, and we'll never get to this point.
1317
2602
 
2603
+ -case $basic_machine in
1318
2604
  +kernel=
1319
- case $cpu-$vendor in
2605
+ +case $cpu-$vendor in
1320
2606
  score-*)
1321
- os=elf
1322
- @@ -1536,7 +1509,8 @@
1323
- os=riscix1.2
2607
+ - os=-elf
2608
+ + os=elf
2609
+ ;;
2610
+ spu-*)
2611
+ - os=-elf
2612
+ + os=elf
2613
+ ;;
2614
+ *-acorn)
2615
+ - os=-riscix1.2
2616
+ + os=riscix1.2
1324
2617
  ;;
1325
2618
  arm*-rebel)
1326
- - os=linux
2619
+ - os=-linux
1327
2620
  + kernel=linux
1328
2621
  + os=gnu
1329
2622
  ;;
1330
2623
  arm*-semi)
1331
- os=aout
1332
- @@ -1702,84 +1676,173 @@
1333
- os=none
2624
+ - os=-aout
2625
+ + os=aout
2626
+ ;;
2627
+ c4x-* | tic4x-*)
2628
+ - os=-coff
2629
+ + os=coff
2630
+ ;;
2631
+ c8051-*)
2632
+ - os=-elf
2633
+ + os=elf
2634
+ + ;;
2635
+ + clipper-intergraph)
2636
+ + os=clix
2637
+ ;;
2638
+ hexagon-*)
2639
+ - os=-elf
2640
+ + os=elf
2641
+ ;;
2642
+ tic54x-*)
2643
+ - os=-coff
2644
+ + os=coff
2645
+ ;;
2646
+ tic55x-*)
2647
+ - os=-coff
2648
+ + os=coff
2649
+ ;;
2650
+ tic6x-*)
2651
+ - os=-coff
2652
+ + os=coff
2653
+ ;;
2654
+ # This must come before the *-dec entry.
2655
+ pdp10-*)
2656
+ - os=-tops20
2657
+ + os=tops20
2658
+ ;;
2659
+ pdp11-*)
2660
+ - os=-none
2661
+ + os=none
2662
+ ;;
2663
+ *-dec | vax-*)
2664
+ - os=-ultrix4.2
2665
+ + os=ultrix4.2
2666
+ ;;
2667
+ m68*-apollo)
2668
+ - os=-domain
2669
+ + os=domain
2670
+ ;;
2671
+ i386-sun)
2672
+ - os=-sunos4.0.2
2673
+ + os=sunos4.0.2
2674
+ ;;
2675
+ m68000-sun)
2676
+ - os=-sunos3
2677
+ + os=sunos3
2678
+ ;;
2679
+ m68*-cisco)
2680
+ - os=-aout
2681
+ + os=aout
2682
+ ;;
2683
+ mep-*)
2684
+ - os=-elf
2685
+ + os=elf
2686
+ ;;
2687
+ mips*-cisco)
2688
+ - os=-elf
2689
+ + os=elf
2690
+ ;;
2691
+ mips*-*)
2692
+ - os=-elf
2693
+ + os=elf
2694
+ ;;
2695
+ or32-*)
2696
+ - os=-coff
2697
+ + os=coff
2698
+ ;;
2699
+ *-tti) # must be before sparc entry or we get the wrong os.
2700
+ - os=-sysv3
2701
+ + os=sysv3
2702
+ ;;
2703
+ sparc-* | *-sun)
2704
+ - os=-sunos4.1.1
2705
+ + os=sunos4.1.1
2706
+ ;;
2707
+ pru-*)
2708
+ - os=-elf
2709
+ + os=elf
2710
+ ;;
2711
+ *-be)
2712
+ - os=-beos
2713
+ + os=beos
2714
+ ;;
2715
+ *-ibm)
2716
+ - os=-aix
2717
+ + os=aix
2718
+ ;;
2719
+ *-knuth)
2720
+ - os=-mmixware
2721
+ + os=mmixware
2722
+ ;;
2723
+ *-wec)
2724
+ - os=-proelf
2725
+ + os=proelf
2726
+ ;;
2727
+ *-winbond)
2728
+ - os=-proelf
2729
+ + os=proelf
2730
+ ;;
2731
+ *-oki)
2732
+ - os=-proelf
2733
+ + os=proelf
2734
+ ;;
2735
+ *-hp)
2736
+ - os=-hpux
2737
+ + os=hpux
2738
+ ;;
2739
+ *-hitachi)
2740
+ - os=-hiux
2741
+ + os=hiux
2742
+ ;;
2743
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
2744
+ - os=-sysv
2745
+ + os=sysv
2746
+ ;;
2747
+ *-cbm)
2748
+ - os=-amigaos
2749
+ + os=amigaos
2750
+ ;;
2751
+ *-dg)
2752
+ - os=-dgux
2753
+ + os=dgux
2754
+ ;;
2755
+ *-dolphin)
2756
+ - os=-sysv3
2757
+ + os=sysv3
2758
+ ;;
2759
+ m68k-ccur)
2760
+ - os=-rtu
2761
+ + os=rtu
2762
+ ;;
2763
+ m88k-omron*)
2764
+ - os=-luna
2765
+ + os=luna
2766
+ ;;
2767
+ *-next)
2768
+ - os=-nextstep
2769
+ + os=nextstep
2770
+ ;;
2771
+ *-sequent)
2772
+ - os=-ptx
2773
+ + os=ptx
2774
+ ;;
2775
+ *-crds)
2776
+ - os=-unos
2777
+ + os=unos
2778
+ ;;
2779
+ *-ns)
2780
+ - os=-genix
2781
+ + os=genix
2782
+ ;;
2783
+ i370-*)
2784
+ - os=-mvs
2785
+ + os=mvs
2786
+ ;;
2787
+ *-gould)
2788
+ - os=-sysv
2789
+ + os=sysv
2790
+ ;;
2791
+ *-highlevel)
2792
+ - os=-bsd
2793
+ + os=bsd
2794
+ ;;
2795
+ *-encore)
2796
+ - os=-bsd
2797
+ + os=bsd
2798
+ ;;
2799
+ *-sgi)
2800
+ - os=-irix
2801
+ + os=irix
2802
+ ;;
2803
+ *-siemens)
2804
+ - os=-sysv4
2805
+ + os=sysv4
2806
+ ;;
2807
+ *-masscomp)
2808
+ - os=-rtu
2809
+ + os=rtu
2810
+ ;;
2811
+ f30[01]-fujitsu | f700-fujitsu)
2812
+ - os=-uxpv
2813
+ + os=uxpv
2814
+ ;;
2815
+ *-rom68k)
2816
+ - os=-coff
2817
+ + os=coff
2818
+ ;;
2819
+ *-*bug)
2820
+ - os=-coff
2821
+ + os=coff
2822
+ ;;
2823
+ *-apple)
2824
+ - os=-macos
2825
+ + os=macos
2826
+ ;;
2827
+ *-atari*)
2828
+ - os=-mint
2829
+ + os=mint
2830
+ + ;;
2831
+ + *-wrs)
2832
+ + os=vxworks
2833
+ ;;
2834
+ *)
2835
+ - os=-none
2836
+ + os=none
1334
2837
  ;;
1335
2838
  esac
1336
2839
  +
@@ -1423,1089 +2926,115 @@ aarch64/arm64/M1 can compile.
1423
2926
  +
1424
2927
  # Here we handle the case where we know the os, and the CPU type, but not the
1425
2928
  # manufacturer. We pick the logical manufacturer.
1426
- case $vendor in
1427
- unknown)
2929
+ -vendor=unknown
2930
+ -case $basic_machine in
2931
+ - *-unknown)
1428
2932
  - case $os in
1429
- - riscix*)
2933
+ - -riscix*)
2934
+ +case $vendor in
2935
+ + unknown)
1430
2936
  + case $cpu-$os in
1431
2937
  + *-riscix*)
1432
2938
  vendor=acorn
1433
2939
  ;;
1434
- - sunos*)
2940
+ - -sunos*)
1435
2941
  + *-sunos*)
1436
2942
  vendor=sun
1437
2943
  ;;
1438
- - cnk*|-aix*)
2944
+ - -cnk*|-aix*)
1439
2945
  + *-cnk* | *-aix*)
1440
2946
  vendor=ibm
1441
2947
  ;;
1442
- - beos*)
2948
+ - -beos*)
1443
2949
  + *-beos*)
1444
2950
  vendor=be
1445
2951
  ;;
1446
- - hpux*)
2952
+ - -hpux*)
1447
2953
  + *-hpux*)
1448
2954
  vendor=hp
1449
2955
  ;;
1450
- - mpeix*)
2956
+ - -mpeix*)
1451
2957
  + *-mpeix*)
1452
2958
  vendor=hp
1453
2959
  ;;
1454
- - hiux*)
2960
+ - -hiux*)
1455
2961
  + *-hiux*)
1456
2962
  vendor=hitachi
1457
2963
  ;;
1458
- - unos*)
2964
+ - -unos*)
1459
2965
  + *-unos*)
1460
2966
  vendor=crds
1461
2967
  ;;
1462
- - dgux*)
2968
+ - -dgux*)
1463
2969
  + *-dgux*)
1464
2970
  vendor=dg
1465
2971
  ;;
1466
- - luna*)
2972
+ - -luna*)
1467
2973
  + *-luna*)
1468
2974
  vendor=omron
1469
2975
  ;;
1470
- - genix*)
2976
+ - -genix*)
1471
2977
  + *-genix*)
1472
2978
  vendor=ns
1473
2979
  ;;
1474
- - clix*)
2980
+ - -mvs* | -opened*)
1475
2981
  + *-clix*)
1476
- vendor=intergraph
1477
- ;;
1478
- - mvs* | opened*)
2982
+ + vendor=intergraph
2983
+ + ;;
1479
2984
  + *-mvs* | *-opened*)
1480
2985
  + vendor=ibm
1481
2986
  + ;;
1482
2987
  + *-os400*)
1483
2988
  vendor=ibm
1484
2989
  ;;
1485
- - os400*)
2990
+ - -os400*)
1486
2991
  + s390-* | s390x-*)
1487
2992
  vendor=ibm
1488
2993
  ;;
1489
- - ptx*)
2994
+ - -ptx*)
1490
2995
  + *-ptx*)
1491
2996
  vendor=sequent
1492
2997
  ;;
1493
- - tpf*)
2998
+ - -tpf*)
1494
2999
  + *-tpf*)
1495
3000
  vendor=ibm
1496
3001
  ;;
1497
- - vxsim* | vxworks* | windiss*)
3002
+ - -vxsim* | -vxworks* | -windiss*)
1498
3003
  + *-vxsim* | *-vxworks* | *-windiss*)
1499
3004
  vendor=wrs
1500
3005
  ;;
1501
- - aux*)
3006
+ - -aux*)
1502
3007
  + *-aux*)
1503
3008
  vendor=apple
1504
3009
  ;;
1505
- - hms*)
3010
+ - -hms*)
1506
3011
  + *-hms*)
1507
3012
  vendor=hitachi
1508
3013
  ;;
1509
- - mpw* | macos*)
3014
+ - -mpw* | -macos*)
1510
3015
  + *-mpw* | *-macos*)
1511
3016
  vendor=apple
1512
3017
  ;;
1513
- - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
3018
+ - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1514
3019
  + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
1515
3020
  vendor=atari
1516
3021
  ;;
1517
- - vos*)
3022
+ - -vos*)
1518
3023
  + *-vos*)
1519
3024
  vendor=stratus
1520
3025
  ;;
1521
3026
  esac
3027
+ - basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
1522
3028
  ;;
1523
3029
  esac
1524
3030
 
1525
- -echo "$cpu-$vendor-$os"
3031
+ -echo "$basic_machine$os"
1526
3032
  +echo "$cpu-$vendor-${kernel:+$kernel-}$os"
1527
3033
  exit
1528
3034
 
1529
3035
  # Local variables:
1530
- --- a/config.guess
1531
- +++ b/config.guess
1532
- @@ -1,8 +1,8 @@
1533
- #! /bin/sh
1534
- # Attempt to guess a canonical system name.
1535
- -# Copyright 1992-2018 Free Software Foundation, Inc.
1536
- +# Copyright 1992-2020 Free Software Foundation, Inc.
1537
-
1538
- -timestamp='2018-08-29'
1539
- +timestamp='2020-11-07'
1540
-
1541
- # This file is free software; you can redistribute it and/or modify it
1542
- # under the terms of the GNU General Public License as published by
1543
- @@ -32,7 +32,7 @@
1544
- # Please send patches to <config-patches@gnu.org>.
1545
-
1546
-
1547
- -me=`echo "$0" | sed -e 's,.*/,,'`
1548
- +me=$(echo "$0" | sed -e 's,.*/,,')
1549
-
1550
- usage="\
1551
- Usage: $0 [OPTION]
1552
- @@ -50,7 +50,7 @@
1553
- GNU config.guess ($timestamp)
1554
-
1555
- Originally written by Per Bothner.
1556
- -Copyright 1992-2018 Free Software Foundation, Inc.
1557
- +Copyright 1992-2020 Free Software Foundation, Inc.
1558
-
1559
- This is free software; see the source for copying conditions. There is NO
1560
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1561
- @@ -96,13 +96,14 @@
1562
-
1563
- tmp=
1564
- # shellcheck disable=SC2172
1565
- -trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
1566
- -trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
1567
- +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
1568
-
1569
- set_cc_for_build() {
1570
- + # prevent multiple calls if $tmp is already set
1571
- + test "$tmp" && return 0
1572
- : "${TMPDIR=/tmp}"
1573
- # shellcheck disable=SC2039
1574
- - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
1575
- + { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } ||
1576
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
1577
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
1578
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
1579
- @@ -130,10 +131,10 @@
1580
- PATH=$PATH:/.attbin ; export PATH
1581
- fi
1582
-
1583
- -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
1584
- -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
1585
- -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
1586
- -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
1587
- +UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown
1588
- +UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown
1589
- +UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown
1590
- +UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown
1591
-
1592
- case "$UNAME_SYSTEM" in
1593
- Linux|GNU|GNU/*)
1594
- @@ -149,17 +150,15 @@
1595
- #elif defined(__dietlibc__)
1596
- LIBC=dietlibc
1597
- #else
1598
- + #include <stdarg.h>
1599
- + #ifdef __DEFINED_va_list
1600
- + LIBC=musl
1601
- + #else
1602
- LIBC=gnu
1603
- #endif
1604
- + #endif
1605
- EOF
1606
- - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
1607
- -
1608
- - # If ldd exists, use it to detect musl libc.
1609
- - if command -v ldd >/dev/null && \
1610
- - ldd --version 2>&1 | grep -q ^musl
1611
- - then
1612
- - LIBC=musl
1613
- - fi
1614
- + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')"
1615
- ;;
1616
- esac
1617
-
1618
- @@ -178,19 +177,20 @@
1619
- # Note: NetBSD doesn't particularly care about the vendor
1620
- # portion of the name. We always set it to "unknown".
1621
- sysctl="sysctl -n hw.machine_arch"
1622
- - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
1623
- + UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \
1624
- "/sbin/$sysctl" 2>/dev/null || \
1625
- "/usr/sbin/$sysctl" 2>/dev/null || \
1626
- - echo unknown)`
1627
- + echo unknown))
1628
- case "$UNAME_MACHINE_ARCH" in
1629
- + aarch64eb) machine=aarch64_be-unknown ;;
1630
- armeb) machine=armeb-unknown ;;
1631
- arm*) machine=arm-unknown ;;
1632
- sh3el) machine=shl-unknown ;;
1633
- sh3eb) machine=sh-unknown ;;
1634
- sh5el) machine=sh5le-unknown ;;
1635
- earmv*)
1636
- - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
1637
- - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
1638
- + arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,')
1639
- + endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p')
1640
- machine="${arch}${endian}"-unknown
1641
- ;;
1642
- *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
1643
- @@ -221,7 +221,7 @@
1644
- case "$UNAME_MACHINE_ARCH" in
1645
- earm*)
1646
- expr='s/^earmv[0-9]/-eabi/;s/eb$//'
1647
- - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
1648
- + abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr")
1649
- ;;
1650
- esac
1651
- # The OS release
1652
- @@ -234,7 +234,7 @@
1653
- release='-gnu'
1654
- ;;
1655
- *)
1656
- - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
1657
- + release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2)
1658
- ;;
1659
- esac
1660
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
1661
- @@ -243,15 +243,15 @@
1662
- echo "$machine-${os}${release}${abi-}"
1663
- exit ;;
1664
- *:Bitrig:*:*)
1665
- - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
1666
- + UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//')
1667
- echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
1668
- exit ;;
1669
- *:OpenBSD:*:*)
1670
- - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
1671
- + UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//')
1672
- echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
1673
- exit ;;
1674
- *:LibertyBSD:*:*)
1675
- - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
1676
- + UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//')
1677
- echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
1678
- exit ;;
1679
- *:MidnightBSD:*:*)
1680
- @@ -263,6 +263,9 @@
1681
- *:SolidBSD:*:*)
1682
- echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
1683
- exit ;;
1684
- + *:OS108:*:*)
1685
- + echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
1686
- + exit ;;
1687
- macppc:MirBSD:*:*)
1688
- echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
1689
- exit ;;
1690
- @@ -272,26 +275,29 @@
1691
- *:Sortix:*:*)
1692
- echo "$UNAME_MACHINE"-unknown-sortix
1693
- exit ;;
1694
- + *:Twizzler:*:*)
1695
- + echo "$UNAME_MACHINE"-unknown-twizzler
1696
- + exit ;;
1697
- *:Redox:*:*)
1698
- echo "$UNAME_MACHINE"-unknown-redox
1699
- exit ;;
1700
- mips:OSF1:*.*)
1701
- - echo mips-dec-osf1
1702
- - exit ;;
1703
- + echo mips-dec-osf1
1704
- + exit ;;
1705
- alpha:OSF1:*:*)
1706
- case $UNAME_RELEASE in
1707
- *4.0)
1708
- - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
1709
- + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}')
1710
- ;;
1711
- *5.*)
1712
- - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
1713
- + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}')
1714
- ;;
1715
- esac
1716
- # According to Compaq, /usr/sbin/psrinfo has been available on
1717
- # OSF/1 and Tru64 systems produced since 1995. I hope that
1718
- # covers most systems running today. This code pipes the CPU
1719
- # types through head -n 1, so we only detect the type of CPU 0.
1720
- - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
1721
- + ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1)
1722
- case "$ALPHA_CPU_TYPE" in
1723
- "EV4 (21064)")
1724
- UNAME_MACHINE=alpha ;;
1725
- @@ -329,7 +335,7 @@
1726
- # A Tn.n version is a released field test version.
1727
- # A Xn.n version is an unreleased experimental baselevel.
1728
- # 1.2 uses "1.2" for uname -r.
1729
- - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
1730
- + echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)"
1731
- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
1732
- exitcode=$?
1733
- trap '' 0
1734
- @@ -363,7 +369,7 @@
1735
- exit ;;
1736
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
1737
- # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
1738
- - if test "`(/bin/universe) 2>/dev/null`" = att ; then
1739
- + if test "$( (/bin/universe) 2>/dev/null)" = att ; then
1740
- echo pyramid-pyramid-sysv3
1741
- else
1742
- echo pyramid-pyramid-bsd
1743
- @@ -376,54 +382,59 @@
1744
- echo sparc-icl-nx6
1745
- exit ;;
1746
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
1747
- - case `/usr/bin/uname -p` in
1748
- + case $(/usr/bin/uname -p) in
1749
- sparc) echo sparc-icl-nx7; exit ;;
1750
- esac ;;
1751
- s390x:SunOS:*:*)
1752
- - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
1753
- + echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
1754
- exit ;;
1755
- sun4H:SunOS:5.*:*)
1756
- - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
1757
- + echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
1758
- exit ;;
1759
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
1760
- - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
1761
- + echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
1762
- exit ;;
1763
- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
1764
- echo i386-pc-auroraux"$UNAME_RELEASE"
1765
- exit ;;
1766
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
1767
- - UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
1768
- - case `isainfo -b` in
1769
- - 32)
1770
- - echo i386-pc-solaris2"$UNAME_REL"
1771
- - ;;
1772
- - 64)
1773
- - echo x86_64-pc-solaris2"$UNAME_REL"
1774
- - ;;
1775
- - esac
1776
- + set_cc_for_build
1777
- + SUN_ARCH=i386
1778
- + # If there is a compiler, see if it is configured for 64-bit objects.
1779
- + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
1780
- + # This test works for both compilers.
1781
- + if test "$CC_FOR_BUILD" != no_compiler_found; then
1782
- + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
1783
- + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1784
- + grep IS_64BIT_ARCH >/dev/null
1785
- + then
1786
- + SUN_ARCH=x86_64
1787
- + fi
1788
- + fi
1789
- + echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
1790
- exit ;;
1791
- sun4*:SunOS:6*:*)
1792
- # According to config.sub, this is the proper way to canonicalize
1793
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
1794
- # it's likely to be more like Solaris than SunOS4.
1795
- - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
1796
- + echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
1797
- exit ;;
1798
- sun4*:SunOS:*:*)
1799
- - case "`/usr/bin/arch -k`" in
1800
- + case "$(/usr/bin/arch -k)" in
1801
- Series*|S4*)
1802
- - UNAME_RELEASE=`uname -v`
1803
- + UNAME_RELEASE=$(uname -v)
1804
- ;;
1805
- esac
1806
- # Japanese Language versions have a version number like `4.1.3-JL'.
1807
- - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
1808
- + echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')"
1809
- exit ;;
1810
- sun3*:SunOS:*:*)
1811
- echo m68k-sun-sunos"$UNAME_RELEASE"
1812
- exit ;;
1813
- sun*:*:4.2BSD:*)
1814
- - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
1815
- + UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null)
1816
- test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
1817
- - case "`/bin/arch`" in
1818
- + case "$(/bin/arch)" in
1819
- sun3)
1820
- echo m68k-sun-sunos"$UNAME_RELEASE"
1821
- ;;
1822
- @@ -503,8 +514,8 @@
1823
- }
1824
- EOF
1825
- $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
1826
- - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
1827
- - SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
1828
- + dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') &&
1829
- + SYSTEM_NAME=$("$dummy" "$dummyarg") &&
1830
- { echo "$SYSTEM_NAME"; exit; }
1831
- echo mips-mips-riscos"$UNAME_RELEASE"
1832
- exit ;;
1833
- @@ -531,11 +542,11 @@
1834
- exit ;;
1835
- AViiON:dgux:*:*)
1836
- # DG/UX returns AViiON for all architectures
1837
- - UNAME_PROCESSOR=`/usr/bin/uname -p`
1838
- - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
1839
- + UNAME_PROCESSOR=$(/usr/bin/uname -p)
1840
- + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
1841
- then
1842
- - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
1843
- - [ "$TARGET_BINARY_INTERFACE"x = x ]
1844
- + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
1845
- + test "$TARGET_BINARY_INTERFACE"x = x
1846
- then
1847
- echo m88k-dg-dgux"$UNAME_RELEASE"
1848
- else
1849
- @@ -559,17 +570,17 @@
1850
- echo m68k-tektronix-bsd
1851
- exit ;;
1852
- *:IRIX*:*:*)
1853
- - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
1854
- + echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')"
1855
- exit ;;
1856
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
1857
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
1858
- - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
1859
- + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX '
1860
- i*86:AIX:*:*)
1861
- echo i386-ibm-aix
1862
- exit ;;
1863
- ia64:AIX:*:*)
1864
- - if [ -x /usr/bin/oslevel ] ; then
1865
- - IBM_REV=`/usr/bin/oslevel`
1866
- + if test -x /usr/bin/oslevel ; then
1867
- + IBM_REV=$(/usr/bin/oslevel)
1868
- else
1869
- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
1870
- fi
1871
- @@ -589,7 +600,7 @@
1872
- exit(0);
1873
- }
1874
- EOF
1875
- - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
1876
- + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy")
1877
- then
1878
- echo "$SYSTEM_NAME"
1879
- else
1880
- @@ -602,15 +613,15 @@
1881
- fi
1882
- exit ;;
1883
- *:AIX:*:[4567])
1884
- - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
1885
- + IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }')
1886
- if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
1887
- IBM_ARCH=rs6000
1888
- else
1889
- IBM_ARCH=powerpc
1890
- fi
1891
- - if [ -x /usr/bin/lslpp ] ; then
1892
- - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
1893
- - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
1894
- + if test -x /usr/bin/lslpp ; then
1895
- + IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc |
1896
- + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/)
1897
- else
1898
- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
1899
- fi
1900
- @@ -638,14 +649,14 @@
1901
- echo m68k-hp-bsd4.4
1902
- exit ;;
1903
- 9000/[34678]??:HP-UX:*:*)
1904
- - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
1905
- + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
1906
- case "$UNAME_MACHINE" in
1907
- 9000/31?) HP_ARCH=m68000 ;;
1908
- 9000/[34]??) HP_ARCH=m68k ;;
1909
- 9000/[678][0-9][0-9])
1910
- - if [ -x /usr/bin/getconf ]; then
1911
- - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
1912
- - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
1913
- + if test -x /usr/bin/getconf; then
1914
- + sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null)
1915
- + sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null)
1916
- case "$sc_cpu_version" in
1917
- 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
1918
- 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
1919
- @@ -657,7 +668,7 @@
1920
- esac ;;
1921
- esac
1922
- fi
1923
- - if [ "$HP_ARCH" = "" ]; then
1924
- + if test "$HP_ARCH" = ""; then
1925
- set_cc_for_build
1926
- sed 's/^ //' << EOF > "$dummy.c"
1927
-
1928
- @@ -692,11 +703,11 @@
1929
- exit (0);
1930
- }
1931
- EOF
1932
- - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
1933
- + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy")
1934
- test -z "$HP_ARCH" && HP_ARCH=hppa
1935
- fi ;;
1936
- esac
1937
- - if [ "$HP_ARCH" = hppa2.0w ]
1938
- + if test "$HP_ARCH" = hppa2.0w
1939
- then
1940
- set_cc_for_build
1941
-
1942
- @@ -720,7 +731,7 @@
1943
- echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
1944
- exit ;;
1945
- ia64:HP-UX:*:*)
1946
- - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
1947
- + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
1948
- echo ia64-hp-hpux"$HPUX_REV"
1949
- exit ;;
1950
- 3050*:HI-UX:*:*)
1951
- @@ -750,7 +761,7 @@
1952
- exit (0);
1953
- }
1954
- EOF
1955
- - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
1956
- + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") &&
1957
- { echo "$SYSTEM_NAME"; exit; }
1958
- echo unknown-hitachi-hiuxwe2
1959
- exit ;;
1960
- @@ -770,7 +781,7 @@
1961
- echo hppa1.0-hp-osf
1962
- exit ;;
1963
- i*86:OSF1:*:*)
1964
- - if [ -x /usr/sbin/sysversion ] ; then
1965
- + if test -x /usr/sbin/sysversion ; then
1966
- echo "$UNAME_MACHINE"-unknown-osf1mk
1967
- else
1968
- echo "$UNAME_MACHINE"-unknown-osf1
1969
- @@ -819,14 +830,14 @@
1970
- echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
1971
- exit ;;
1972
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
1973
- - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
1974
- - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
1975
- - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
1976
- + FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
1977
- + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///')
1978
- + FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/')
1979
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
1980
- exit ;;
1981
- 5000:UNIX_System_V:4.*:*)
1982
- - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
1983
- - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
1984
- + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///')
1985
- + FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/')
1986
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
1987
- exit ;;
1988
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
1989
- @@ -839,25 +850,25 @@
1990
- echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
1991
- exit ;;
1992
- arm:FreeBSD:*:*)
1993
- - UNAME_PROCESSOR=`uname -p`
1994
- + UNAME_PROCESSOR=$(uname -p)
1995
- set_cc_for_build
1996
- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
1997
- | grep -q __ARM_PCS_VFP
1998
- then
1999
- - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
2000
- + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
2001
- else
2002
- - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
2003
- + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
2004
- fi
2005
- exit ;;
2006
- *:FreeBSD:*:*)
2007
- - UNAME_PROCESSOR=`/usr/bin/uname -p`
2008
- + UNAME_PROCESSOR=$(/usr/bin/uname -p)
2009
- case "$UNAME_PROCESSOR" in
2010
- amd64)
2011
- UNAME_PROCESSOR=x86_64 ;;
2012
- i386)
2013
- UNAME_PROCESSOR=i586 ;;
2014
- esac
2015
- - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
2016
- + echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
2017
- exit ;;
2018
- i*:CYGWIN*:*)
2019
- echo "$UNAME_MACHINE"-pc-cygwin
2020
- @@ -890,18 +901,18 @@
2021
- echo "$UNAME_MACHINE"-pc-uwin
2022
- exit ;;
2023
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
2024
- - echo x86_64-unknown-cygwin
2025
- + echo x86_64-pc-cygwin
2026
- exit ;;
2027
- prep*:SunOS:5.*:*)
2028
- - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
2029
- + echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
2030
- exit ;;
2031
- *:GNU:*:*)
2032
- # the GNU system
2033
- - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
2034
- + echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
2035
- exit ;;
2036
- *:GNU/*:*:*)
2037
- # other systems with GNU libc and userland
2038
- - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
2039
- + echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC"
2040
- exit ;;
2041
- *:Minix:*:*)
2042
- echo "$UNAME_MACHINE"-unknown-minix
2043
- @@ -914,7 +925,7 @@
2044
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
2045
- exit ;;
2046
- alpha:Linux:*:*)
2047
- - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
2048
- + case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in
2049
- EV5) UNAME_MACHINE=alphaev5 ;;
2050
- EV56) UNAME_MACHINE=alphaev56 ;;
2051
- PCA56) UNAME_MACHINE=alphapca56 ;;
2052
- @@ -981,22 +992,50 @@
2053
- exit ;;
2054
- mips:Linux:*:* | mips64:Linux:*:*)
2055
- set_cc_for_build
2056
- + IS_GLIBC=0
2057
- + test x"${LIBC}" = xgnu && IS_GLIBC=1
2058
- sed 's/^ //' << EOF > "$dummy.c"
2059
- #undef CPU
2060
- - #undef ${UNAME_MACHINE}
2061
- - #undef ${UNAME_MACHINE}el
2062
- + #undef mips
2063
- + #undef mipsel
2064
- + #undef mips64
2065
- + #undef mips64el
2066
- + #if ${IS_GLIBC} && defined(_ABI64)
2067
- + LIBCABI=gnuabi64
2068
- + #else
2069
- + #if ${IS_GLIBC} && defined(_ABIN32)
2070
- + LIBCABI=gnuabin32
2071
- + #else
2072
- + LIBCABI=${LIBC}
2073
- + #endif
2074
- + #endif
2075
- +
2076
- + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
2077
- + CPU=mipsisa64r6
2078
- + #else
2079
- + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
2080
- + CPU=mipsisa32r6
2081
- + #else
2082
- + #if defined(__mips64)
2083
- + CPU=mips64
2084
- + #else
2085
- + CPU=mips
2086
- + #endif
2087
- + #endif
2088
- + #endif
2089
- +
2090
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
2091
- - CPU=${UNAME_MACHINE}el
2092
- + MIPS_ENDIAN=el
2093
- #else
2094
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
2095
- - CPU=${UNAME_MACHINE}
2096
- + MIPS_ENDIAN=
2097
- #else
2098
- - CPU=
2099
- + MIPS_ENDIAN=
2100
- #endif
2101
- #endif
2102
- EOF
2103
- - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
2104
- - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
2105
- + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')"
2106
- + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
2107
- ;;
2108
- mips64el:Linux:*:*)
2109
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
2110
- @@ -1015,7 +1054,7 @@
2111
- exit ;;
2112
- parisc:Linux:*:* | hppa:Linux:*:*)
2113
- # Look for CPU level
2114
- - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
2115
- + case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in
2116
- PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
2117
- PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
2118
- *) echo hppa-unknown-linux-"$LIBC" ;;
2119
- @@ -1055,7 +1094,17 @@
2120
- echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
2121
- exit ;;
2122
- x86_64:Linux:*:*)
2123
- - echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
2124
- + set_cc_for_build
2125
- + LIBCABI=$LIBC
2126
- + if test "$CC_FOR_BUILD" != no_compiler_found; then
2127
- + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
2128
- + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
2129
- + grep IS_X32 >/dev/null
2130
- + then
2131
- + LIBCABI="$LIBC"x32
2132
- + fi
2133
- + fi
2134
- + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
2135
- exit ;;
2136
- xtensa*:Linux:*:*)
2137
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
2138
- @@ -1095,7 +1144,7 @@
2139
- echo "$UNAME_MACHINE"-pc-msdosdjgpp
2140
- exit ;;
2141
- i*86:*:4.*:*)
2142
- - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
2143
- + UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//')
2144
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
2145
- echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
2146
- else
2147
- @@ -1104,19 +1153,19 @@
2148
- exit ;;
2149
- i*86:*:5:[678]*)
2150
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
2151
- - case `/bin/uname -X | grep "^Machine"` in
2152
- + case $(/bin/uname -X | grep "^Machine") in
2153
- *486*) UNAME_MACHINE=i486 ;;
2154
- *Pentium) UNAME_MACHINE=i586 ;;
2155
- *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
2156
- esac
2157
- - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
2158
- + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
2159
- exit ;;
2160
- i*86:*:3.2:*)
2161
- if test -f /usr/options/cb.name; then
2162
- - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
2163
- + UNAME_REL=$(sed -n 's/.*Version //p' </usr/options/cb.name)
2164
- echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
2165
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
2166
- - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
2167
- + UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //'))
2168
- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
2169
- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
2170
- && UNAME_MACHINE=i586
2171
- @@ -1166,7 +1215,7 @@
2172
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
2173
- OS_REL=''
2174
- test -r /etc/.relid \
2175
- - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
2176
- + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid)
2177
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
2178
- && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
2179
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
2180
- @@ -1177,7 +1226,7 @@
2181
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
2182
- OS_REL='.3'
2183
- test -r /etc/.relid \
2184
- - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
2185
- + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid)
2186
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
2187
- && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
2188
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
2189
- @@ -1210,7 +1259,7 @@
2190
- exit ;;
2191
- *:SINIX-*:*:*)
2192
- if uname -p 2>/dev/null >/dev/null ; then
2193
- - UNAME_MACHINE=`(uname -p) 2>/dev/null`
2194
- + UNAME_MACHINE=$( (uname -p) 2>/dev/null)
2195
- echo "$UNAME_MACHINE"-sni-sysv4
2196
- else
2197
- echo ns32k-sni-sysv
2198
- @@ -1244,7 +1293,7 @@
2199
- echo mips-sony-newsos6
2200
- exit ;;
2201
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
2202
- - if [ -d /usr/nec ]; then
2203
- + if test -d /usr/nec; then
2204
- echo mips-nec-sysv"$UNAME_RELEASE"
2205
- else
2206
- echo mips-unknown-sysv"$UNAME_RELEASE"
2207
- @@ -1292,44 +1341,48 @@
2208
- *:Rhapsody:*:*)
2209
- echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
2210
- exit ;;
2211
- + arm64:Darwin:*:*)
2212
- + echo aarch64-apple-darwin"$UNAME_RELEASE"
2213
- + exit ;;
2214
- *:Darwin:*:*)
2215
- - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
2216
- - set_cc_for_build
2217
- - if test "$UNAME_PROCESSOR" = unknown ; then
2218
- - UNAME_PROCESSOR=powerpc
2219
- + UNAME_PROCESSOR=$(uname -p)
2220
- + case $UNAME_PROCESSOR in
2221
- + unknown) UNAME_PROCESSOR=powerpc ;;
2222
- + esac
2223
- + if command -v xcode-select > /dev/null 2> /dev/null && \
2224
- + ! xcode-select --print-path > /dev/null 2> /dev/null ; then
2225
- + # Avoid executing cc if there is no toolchain installed as
2226
- + # cc will be a stub that puts up a graphical alert
2227
- + # prompting the user to install developer tools.
2228
- + CC_FOR_BUILD=no_compiler_found
2229
- + else
2230
- + set_cc_for_build
2231
- fi
2232
- - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
2233
- - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
2234
- - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
2235
- - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
2236
- - grep IS_64BIT_ARCH >/dev/null
2237
- - then
2238
- - case $UNAME_PROCESSOR in
2239
- - i386) UNAME_PROCESSOR=x86_64 ;;
2240
- - powerpc) UNAME_PROCESSOR=powerpc64 ;;
2241
- - esac
2242
- - fi
2243
- - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
2244
- - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
2245
- - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
2246
- - grep IS_PPC >/dev/null
2247
- - then
2248
- - UNAME_PROCESSOR=powerpc
2249
- - fi
2250
- + if test "$CC_FOR_BUILD" != no_compiler_found; then
2251
- + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
2252
- + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
2253
- + grep IS_64BIT_ARCH >/dev/null
2254
- + then
2255
- + case $UNAME_PROCESSOR in
2256
- + i386) UNAME_PROCESSOR=x86_64 ;;
2257
- + powerpc) UNAME_PROCESSOR=powerpc64 ;;
2258
- + esac
2259
- + fi
2260
- + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
2261
- + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
2262
- + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
2263
- + grep IS_PPC >/dev/null
2264
- + then
2265
- + UNAME_PROCESSOR=powerpc
2266
- fi
2267
- elif test "$UNAME_PROCESSOR" = i386 ; then
2268
- - # Avoid executing cc on OS X 10.9, as it ships with a stub
2269
- - # that puts up a graphical alert prompting to install
2270
- - # developer tools. Any system running Mac OS X 10.7 or
2271
- - # later (Darwin 11 and later) is required to have a 64-bit
2272
- - # processor. This is not true of the ARM version of Darwin
2273
- - # that Apple uses in portable devices.
2274
- - UNAME_PROCESSOR=x86_64
2275
- + # uname -m returns i386 or x86_64
2276
- + UNAME_PROCESSOR=$UNAME_MACHINE
2277
- fi
2278
- echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
2279
- exit ;;
2280
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
2281
- - UNAME_PROCESSOR=`uname -p`
2282
- + UNAME_PROCESSOR=$(uname -p)
2283
- if test "$UNAME_PROCESSOR" = x86; then
2284
- UNAME_PROCESSOR=i386
2285
- UNAME_MACHINE=pc
2286
- @@ -1397,10 +1450,10 @@
2287
- echo mips-sei-seiux"$UNAME_RELEASE"
2288
- exit ;;
2289
- *:DragonFly:*:*)
2290
- - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
2291
- + echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
2292
- exit ;;
2293
- *:*VMS:*:*)
2294
- - UNAME_MACHINE=`(uname -p) 2>/dev/null`
2295
- + UNAME_MACHINE=$( (uname -p) 2>/dev/null)
2296
- case "$UNAME_MACHINE" in
2297
- A*) echo alpha-dec-vms ; exit ;;
2298
- I*) echo ia64-dec-vms ; exit ;;
2299
- @@ -1410,7 +1463,7 @@
2300
- echo i386-pc-xenix
2301
- exit ;;
2302
- i*86:skyos:*:*)
2303
- - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
2304
- + echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')"
2305
- exit ;;
2306
- i*86:rdos:*:*)
2307
- echo "$UNAME_MACHINE"-pc-rdos
2308
- @@ -1424,8 +1477,148 @@
2309
- amd64:Isilon\ OneFS:*:*)
2310
- echo x86_64-unknown-onefs
2311
- exit ;;
2312
- + *:Unleashed:*:*)
2313
- + echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
2314
- + exit ;;
2315
- esac
2316
-
2317
- +# No uname command or uname output not recognized.
2318
- +set_cc_for_build
2319
- +cat > "$dummy.c" <<EOF
2320
- +#ifdef _SEQUENT_
2321
- +#include <sys/types.h>
2322
- +#include <sys/utsname.h>
2323
- +#endif
2324
- +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
2325
- +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
2326
- +#include <signal.h>
2327
- +#if defined(_SIZE_T_) || defined(SIGLOST)
2328
- +#include <sys/utsname.h>
2329
- +#endif
2330
- +#endif
2331
- +#endif
2332
- +main ()
2333
- +{
2334
- +#if defined (sony)
2335
- +#if defined (MIPSEB)
2336
- + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
2337
- + I don't know.... */
2338
- + printf ("mips-sony-bsd\n"); exit (0);
2339
- +#else
2340
- +#include <sys/param.h>
2341
- + printf ("m68k-sony-newsos%s\n",
2342
- +#ifdef NEWSOS4
2343
- + "4"
2344
- +#else
2345
- + ""
2346
- +#endif
2347
- + ); exit (0);
2348
- +#endif
2349
- +#endif
2350
- +
2351
- +#if defined (NeXT)
2352
- +#if !defined (__ARCHITECTURE__)
2353
- +#define __ARCHITECTURE__ "m68k"
2354
- +#endif
2355
- + int version;
2356
- + version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null);
2357
- + if (version < 4)
2358
- + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
2359
- + else
2360
- + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
2361
- + exit (0);
2362
- +#endif
2363
- +
2364
- +#if defined (MULTIMAX) || defined (n16)
2365
- +#if defined (UMAXV)
2366
- + printf ("ns32k-encore-sysv\n"); exit (0);
2367
- +#else
2368
- +#if defined (CMU)
2369
- + printf ("ns32k-encore-mach\n"); exit (0);
2370
- +#else
2371
- + printf ("ns32k-encore-bsd\n"); exit (0);
2372
- +#endif
2373
- +#endif
2374
- +#endif
2375
- +
2376
- +#if defined (__386BSD__)
2377
- + printf ("i386-pc-bsd\n"); exit (0);
2378
- +#endif
2379
- +
2380
- +#if defined (sequent)
2381
- +#if defined (i386)
2382
- + printf ("i386-sequent-dynix\n"); exit (0);
2383
- +#endif
2384
- +#if defined (ns32000)
2385
- + printf ("ns32k-sequent-dynix\n"); exit (0);
2386
- +#endif
2387
- +#endif
2388
- +
2389
- +#if defined (_SEQUENT_)
2390
- + struct utsname un;
2391
- +
2392
- + uname(&un);
2393
- + if (strncmp(un.version, "V2", 2) == 0) {
2394
- + printf ("i386-sequent-ptx2\n"); exit (0);
2395
- + }
2396
- + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
2397
- + printf ("i386-sequent-ptx1\n"); exit (0);
2398
- + }
2399
- + printf ("i386-sequent-ptx\n"); exit (0);
2400
- +#endif
2401
- +
2402
- +#if defined (vax)
2403
- +#if !defined (ultrix)
2404
- +#include <sys/param.h>
2405
- +#if defined (BSD)
2406
- +#if BSD == 43
2407
- + printf ("vax-dec-bsd4.3\n"); exit (0);
2408
- +#else
2409
- +#if BSD == 199006
2410
- + printf ("vax-dec-bsd4.3reno\n"); exit (0);
2411
- +#else
2412
- + printf ("vax-dec-bsd\n"); exit (0);
2413
- +#endif
2414
- +#endif
2415
- +#else
2416
- + printf ("vax-dec-bsd\n"); exit (0);
2417
- +#endif
2418
- +#else
2419
- +#if defined(_SIZE_T_) || defined(SIGLOST)
2420
- + struct utsname un;
2421
- + uname (&un);
2422
- + printf ("vax-dec-ultrix%s\n", un.release); exit (0);
2423
- +#else
2424
- + printf ("vax-dec-ultrix\n"); exit (0);
2425
- +#endif
2426
- +#endif
2427
- +#endif
2428
- +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
2429
- +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
2430
- +#if defined(_SIZE_T_) || defined(SIGLOST)
2431
- + struct utsname *un;
2432
- + uname (&un);
2433
- + printf ("mips-dec-ultrix%s\n", un.release); exit (0);
2434
- +#else
2435
- + printf ("mips-dec-ultrix\n"); exit (0);
2436
- +#endif
2437
- +#endif
2438
- +#endif
2439
- +
2440
- +#if defined (alliant) && defined (i860)
2441
- + printf ("i860-alliant-bsd\n"); exit (0);
2442
- +#endif
2443
- +
2444
- + exit (1);
2445
- +}
2446
- +EOF
2447
- +
2448
- +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) &&
2449
- + { echo "$SYSTEM_NAME"; exit; }
2450
- +
2451
- +# Apollos put the system type in the environment.
2452
- +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
2453
- +
2454
- echo "$0: unable to guess system type" >&2
2455
-
2456
- case "$UNAME_MACHINE:$UNAME_SYSTEM" in
2457
- @@ -1448,6 +1641,12 @@
2458
- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
2459
- and
2460
- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
2461
- +EOF
2462
- +
2463
- +year=$(echo $timestamp | sed 's,-.*,,')
2464
- +# shellcheck disable=SC2003
2465
- +if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then
2466
- + cat >&2 <<EOF
2467
-
2468
- If $0 has already been updated, send the following data and any
2469
- information you think might be pertinent to config-patches@gnu.org to
2470
- @@ -1455,26 +1654,27 @@
2471
-
2472
- config.guess timestamp = $timestamp
2473
-
2474
- -uname -m = `(uname -m) 2>/dev/null || echo unknown`
2475
- -uname -r = `(uname -r) 2>/dev/null || echo unknown`
2476
- -uname -s = `(uname -s) 2>/dev/null || echo unknown`
2477
- -uname -v = `(uname -v) 2>/dev/null || echo unknown`
2478
- -
2479
- -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
2480
- -/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
2481
- -
2482
- -hostinfo = `(hostinfo) 2>/dev/null`
2483
- -/bin/universe = `(/bin/universe) 2>/dev/null`
2484
- -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
2485
- -/bin/arch = `(/bin/arch) 2>/dev/null`
2486
- -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
2487
- -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
2488
- +uname -m = $( (uname -m) 2>/dev/null || echo unknown)
2489
- +uname -r = $( (uname -r) 2>/dev/null || echo unknown)
2490
- +uname -s = $( (uname -s) 2>/dev/null || echo unknown)
2491
- +uname -v = $( (uname -v) 2>/dev/null || echo unknown)
2492
- +
2493
- +/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null)
2494
- +/bin/uname -X = $( (/bin/uname -X) 2>/dev/null)
2495
- +
2496
- +hostinfo = $( (hostinfo) 2>/dev/null)
2497
- +/bin/universe = $( (/bin/universe) 2>/dev/null)
2498
- +/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null)
2499
- +/bin/arch = $( (/bin/arch) 2>/dev/null)
2500
- +/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null)
2501
- +/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null)
2502
-
2503
- UNAME_MACHINE = "$UNAME_MACHINE"
2504
- UNAME_RELEASE = "$UNAME_RELEASE"
2505
- UNAME_SYSTEM = "$UNAME_SYSTEM"
2506
- UNAME_VERSION = "$UNAME_VERSION"
2507
- EOF
2508
- +fi
2509
-
2510
- exit 1
2511
-
3036
+ -# eval: (add-hook 'write-file-functions 'time-stamp)
3037
+ +# eval: (add-hook 'before-save-hook 'time-stamp)
3038
+ # time-stamp-start: "timestamp='"
3039
+ # time-stamp-format: "%:y-%02m-%02d"
3040
+ # time-stamp-end: "'"