Commit upstream/8.0 - virt-viewer

New upstream version 8.0 Guido Günther 4 years ago

65 changed file(s) with 3717 addition(s) and 1697 deletion(s). Raw diff Collapse all Expand all

-0

AUTHORS less more

10	10
11	11	With additional patches & translations from:
12	12
	13	Andrea Bolognani <abologna@redhat.com>
	14	Ben Mathews <beniam@yahoo.com>
13	15	Charles Arnold <carnold@suse.com>
14	16	Christophe Fergeau <cfergeau@redhat.com>
15	17	Christophe de Dinechin <cdupontd@redhat.com>

31	33	Marc-André Lureau <marcandre.lureau@redhat.com>
32	34	Martin Kletzander <mkletzan@redhat.com>
33	35	Michal Privoznik <mprivozn@redhat.com>
	36	Paul Donohue <virt-tools@PaulSD.com>
34	37	Pavel Grunt <pgrunt@redhat.com>
35	38	Pavel Hrdina <phrdina@redhat.com>
36	39	Pavel Raiskup <praiskup@redhat.com>
	40	Qiu Wenbo <qiuwenbo@kylinos.com.cn>
37	41	Rex Dieter <rdieter@math.unl.edu>
38	42	Richard W.M. Jones <rjones@redhat.com>
39	43	Ronnie Sahlberg <ronniesahlberg@gmail.com>

+536

-0

ChangeLog less more

	0	2019-03-01 Daniel P. Berrangé <berrange@redhat.com>
	1
	2	Update NEWS for 8.0 release
	3
	4	rpm: use the mingw hicolor icon theme not native
	5
	6	Add glib2-devel for mingw build
	7	The native glib2-devel package is needed for mingw builds in order to
	8	get the glib-compile-schemas binary.
	9
	10	2019-02-22 Eduardo Lima (Etrunko) <etrunko@redhat.com>
	11
	12	iso-dialog: Move type definitions from header to source file
	13	There is no reason for this object to define a private structure, so it
	14	is fine to make everything private to the dialog itself.
	15
	16	Update usage of GObject private structures
	17	New functions and macros have been added in glib 2.38 to better handle
	18	this case.
	19
	20	https://gitlab.gnome.org/GNOME/glib/blob/c8de2b11bbbf5705ee20bf68d0c11e455b441312/NEWS
	21
	22	The old method is being deprecated as of version 2.58.
	23
	24	https://gitlab.gnome.org/GNOME/glib/merge_requests/7/commits
	25
	26	2019-02-19 Daniel P. Berrangé <berrange@redhat.com>
	27
	28	msi: record full build environment in MSI installer
	29	For proper compliance with the GPL and other licenses we need to be
	30	clear about exactly what toolchain and dependent packages we used in
	31	order to build the MSI installer we distribute.
	32
	33	Historically we've done this by including a "deps.txt" file which
	34	provides a list of all the mingw{32,64}-* RPMs on the host system.
	35
	36	This is not sufficient information, however, because the build system
	37	will in fact use various native packages too from the toolchain too,
	38	notably including any program run by "configure" which covers various
	39	shell utilities, and pkg-config, and then of course make & msitools
	40	itself.
	41
	42	Rather than try to figure out which subset of host RPMs are used,
	43	just list every single host RPM that is installed.
	44
	45	A key implication of this is that formal release builds should always
	46	be done in a pristine build root populated with the minimal content
	47	required for the build.
	48
	49	Declare VirtViewerFile variable at start of method
	50	virt_viewer_session_vnc_auth_credential uses gotos which jump over the
	51	declaration of 'file', meaning its contents are uninitialized in the
	52	jump target.
	53
	54	Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
	55
	56	Fix prototype of function with no arguments
	57	Modern C standard requires the function to be "void"
	58
	59	Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
	60
	61	Fix signed/unsigned mixup in format args
	62	Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
	63
	64	2019-02-13 Eduardo Lima (Etrunko) <etrunko@redhat.com>
	65
	66	window: Use proper define from glib for ignoring deprecated warning
	67	Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
	68
	69	2019-02-12 Daniel P. Berrangé <berrange@redhat.com>
	70
	71	Disable deprecation warnings for gtk_window_fullscreen_on_monitor
	72	We use GLIB_VERSION_MAX_ALLOWED to prevent use of functions from
	73	GTK >= 3.12. When we do conditional compilation based on a GTK
	74	version check, we must thus suppress the warning:
	75
	76	CC libvirt_viewer_la-virt-viewer-window.lo
	77	../../src/virt-viewer-window.c: In function 'virt_viewer_window_enter_fullscreen':
	78	../../src/virt-viewer-window.c:608:9: error: 'gtk_window_fullscreen_on_monitor' is deprecated: Not available before 3.18 [-Werror=deprecated-declarations]
	79	gtk_window_fullscreen_on_monitor(GTK_WINDOW(priv->window),
	80	^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	81	In file included from /usr/include/gtk-3.0/gtk/gtkdialog.h:32,
	82	from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:30,
	83	from /usr/include/gtk-3.0/gtk/gtk.h:31,
	84	from ../../src/virt-viewer-window.c:28:
	85	/usr/include/gtk-3.0/gtk/gtkwindow.h:391:10: note: declared here
	86	void gtk_window_fullscreen_on_monitor(GtkWindow *window,
	87	^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	88	cc1: all warnings being treated as errors
	89
	90	2019-02-04 Marc-André Lureau <marcandre.lureau@redhat.com>
	91
	92	build-sys: lower spice-gtk requirement to 0.35 again
	93	Compile out QMP channel support if spice-gtk version < 0.36.
	94
	95	(note: I didn't bother adding configure switch to enable it
	96	explicitly, this could be added later if necessary)
	97
	98	Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
	99
	100	2019-02-01 Paul Donohue <virt-tools@PaulSD.com>
	101
	102	Report gtk_accel_map_change_entry() failures
	103	Message-Id: <1533340753-24176-2-git-send-email-virt-tools@PaulSD.com>
	104	Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
	105
	106	2019-02-01 Marc-André Lureau <marcandre.lureau@redhat.com>
	107
	108	spice: hook into QMP port
	109	If the "org.qemu.monitor.qmp.0" port is available:
	110	- enable the VM UI
	111	- get and follow the VM state
	112	- send the requested VM actions
	113
	114	This requires spice-gtk version 0.36 with SpiceQmpPort helper.
	115
	116	Acked-by: Victor Toso <victortoso@redhat.com>
	117
	118	spice: hook into port channel to create VTE terminals
	119	QEMU defines a few Spice port channel names in
	120	docs/spice-port-fqdn.txt that can be interacted with a terminal.
	121
	122	Create VirtViewerDisplayVte display for all known terminal channel,
	123	and redirect read/write signals.
	124
	125	Note that if VTE support is disabled, or if the VTE console isn't
	126	shown, spice-gtk will still process those port channels (discarding
	127	the read if VTE is disabled).
	128
	129	Acked-by: Victor Toso <victortoso@redhat.com>
	130
	131	session: do not take VTE display into account for geometry changes
	132	Acked-by: Victor Toso <victortoso@redhat.com>
	133
	134	2019-01-28 Jonathon Jongsma <jjongsma@redhat.com>
	135
	136	Fix regression when showing disconnect error
	137	Commit 65ef66e42 introduced a regression due to lack of type-safety on
	138	signals. We mistakenly passed a GError rather than a string error
	139	message to the signal.
	140
	141	Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
	142
	143	2019-01-18 Eduardo Lima (Etrunko) <etrunko@redhat.com>
	144
	145	Add missing G_MODULE_EXPORT to signal handler
	146	Fixes the Windows case where the dialog fails to show with the following
	147	message:
	148
	149	warning: "Could not find signal handler 'virt_viewer_window_menu_change_cd_activate'"
	150
	151	2018-12-21 Daniel P. Berrangé <berrange@redhat.com>
	152
	153	Add src/virt-viewer-display-vte.c to POTFILES
	154
	155	2018-12-21 Marc-André Lureau <marcandre.lureau@redhat.com>
	156
	157	app: add "vm-running" property
	158	Add "vm-running" property and modify "menu-vm-pause" check button
	159	state when the running state changes.
	160
	161	Acked-by: Victor Toso <victortoso@redhat.com>
	162
	163	app: add "machine" UI
	164	Add a new "Machine" menu, which allows to Pause/Reset/Power Down a VM.
	165
	166	The menu is only visible if "vm-ui" app property is set.
	167
	168	When the application quits, it will also send a quit action to the VM.
	169
	170	This is a similar behaviour/UI as qemu -display gtk.
	171
	172	Acked-by: Victor Toso <victortoso@redhat.com>
	173
	174	app: create a window for VTE displays
	175	virt_viewer_app_display_added() now handles VTE displays. They should
	176	be skipped for monitor configuration, and they don't emit "show-hint".
	177
	178	(a VTE display has a monitor nth == -1, which is now a valid value)
	179
	180	The associated window will be hidden when virt-viewer is started.
	181
	182	Acked-by: Victor Toso <victortoso@redhat.com>
	183
	184	spice: add unix-path in .vv file support
	185	This will allow to connect to a Spice server using a unix socket path,
	186	for example:
	187
	188	[virt-viewer]
	189	type=spice
	190	unix-path=/var/run/user/1000/qemu/test/spice.sock
	191
	192	Reviewed-by: Christophe Fergeau <cfergeau@redhat.com>
	193
	194	display: allow display without associated monitor number
	195	The VTE display will have monitor id -1.
	196
	197	Eventually, having a base "console" class without monitor id could
	198	avoid this allowance.
	199
	200	Acked-by: Victor Toso <victortoso@redhat.com>
	201
	202	app: append VTE consoles to display submenu
	203	Acked-by: Victor Toso <victortoso@redhat.com>
	204
	205	app: set subtitle using VTE name
	206	Currently, subtitle indicate the monitor number, ex: "Fedora (1)".
	207
	208	Custom subtitle use %d to place the monitor number.
	209
	210	Let's make this placeholder more generic to place the name of the
	211	console, ex: "Fedora (Serial)".
	212
	213	Acked-by: Victor Toso <victortoso@redhat.com>
	214
	215	session: skip monitor changes if there is no sized monitors
	216	spice-gtk discards configurations without any sized monitors.
	217
	218	Also shuts extra warnings when shifting the monitors.
	219
	220	Acked-by: Victor Toso <victortoso@redhat.com>
	221
	222	display: ignore display that do not have toplevel window
	223	virt_viewer_display_get_preferred_monitor_geometry() may be called
	224	during application initialization (when the VTE console is being
	225	shown, virt_viewer_session_update_displays_geometry() is called when
	226	the visibility menu item is toggled). But the other displays may not
	227	yet be associated with a window, ignore them.
	228
	229	Acked-by: Victor Toso <victortoso@redhat.com>
	230
	231	window/zoom: deal with VTE display differently
	232	VTE display doesn't use the desktop / window aspect ratio, let's just
	233	call directly the functions handling zoom.
	234
	235	Acked-by: Victor Toso <victortoso@redhat.com>
	236
	237	Add a VirtViewerDisplayVte display kind
	238	This is not a graphical display, so the application will have to deal
	239	with it with care.
	240
	241	You may argue that we need a large refactoring to introduce a more
	242	generic "console" object, that could be either graphical or textual.
	243	For now, this does work well enough for me.
	244
	245	Acked-by: Victor Toso <victortoso@redhat.com>
	246
	247	build-sys: check for VTE library
	248	Acked-by: Victor Toso <victortoso@redhat.com>
	249
	250	window: set sensitivity based on display capability
	251	A following patch is adding a new display (VTE) that won't have the
	252	send_key() or screenshot() callbacks. Activating those menu/actions
	253	would lead to nothing or a crash. I chose to keep the UI consistent
	254	for all display, but disable the menu sensitivity.
	255
	256	Acked-by: Victor Toso <victortoso@redhat.com>
	257
	258	window: do not reset sensitivity of menu-send in rebuild
	259	The sensitivy of "menu-send" is getting more complex in the following
	260	patch. Let's have the logic in a single place,
	261	virt_viewer_window_set_menus_sensitive().
	262
	263	rebuild_combo_menu() is called in 2 cases:
	264
	265	1. notify::enable-accel: there is no need to update the sensitivy of
	266	"menu-send"
	267
	268	2. on construction: default to false since display == NULL. It will be
	269	later updated when virt_viewer_window_set_menus_sensitive(). The
	270	default sensitivity is covered by previous .ui patch change.
	271
	272	Acked-by: Victor Toso <victortoso@redhat.com>
	273
	274	2018-12-06 Christophe Fergeau <cfergeau@redhat.com>
	275
	276	ovirt: Fix initial connection
	277	After commit df42f78d46 "remote-viewer: factor our
	278	remote_viewer_initial_connect()", the initial connection code only gets
	279	run in the !ovirt case. When ovirt is in use, the initial connection
	280	never happens, meaning all we get when using ovirt:// is a blank
	281	virt-viewer window.
	282
	283	This commit fixes that by moving creation of the ovirt session to
	284	remote_viewer_initial_connect, and unconditionnally calling the
	285	remote_viewer_initial_connect rather than only doing it in the !ovirt
	286	case.
	287
	288	https://bugzilla.redhat.com/show_bug.cgi?id=1655537
	289
	290	2018-12-05 Ben Mathews <beniam@yahoo.com>
	291
	292	Set window title to VM name
	293	The attached patch address an issue with virt-view not setting the
	294	titlebar text to be the title of the VM (previously discussed on:
	295	https://www.redhat.com/archives/virt-tools-list/2018-September/msg00064.html).
	296
	297	2018-12-04 Jonathon Jongsma <jjongsma@redhat.com>
	298
	299	Silence coverity warning about dead code
	300	For some reason, coverity was complaining that the definition of
	301	cred_type_to_str was dead code, even though it wasn't. Changing the
	302	storage to static silences the warning. Since that's a benficial change
	303	anyway, let's change it. At the same time, make the pointer constant as
	304	well and move it outside of the loop since it doesn't need to be inside
	305	the loop.
	306
	307	Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
	308
	309	Avoid potential memory leak in spice session
	310	If j == -1, the memory allocated for rect will leak. So move the
	311	allocation after the test.
	312
	313	Acked-by: Victor Toso <victortoso@redhat.com>
	314
	315	2018-11-13 Andrea Bolognani <abologna@redhat.com>
	316
	317	spec: Drop %{extra_release}
	318	It was mainly meant to be used for automatic builds through
	319	Test::AutoBuild, so it can be removed now.
	320
	321	prepare-release: Drop references to Test::AutoBuild
	322	They are misleading, and no longer relevant anyway.
	323
	324	maint: Rename autobuild.sh to prepare-release.sh
	325	The script was originally used by the Test::AutoBuild
	326	project to perform periodic automatic builds; however, that
	327	effort has been abandoned a long time ago, and these days
	328	virt-viewer CI builds are happening on the Jenkins-based
	329	CentOS CI environment under the libvirt umbrella[1], where
	330	build recipes are maintained separately from the projects
	331	themselves.
	332
	333	The script is still used to prepare releases, so it can't
	334	be dropped from the repository: rename it so that its
	335	purpose is more clearly communicated instead.
	336
	337	[1] https://ci.centos.org/view/libvirt/
	338
	339	2018-11-09 Jonathon Jongsma <jjongsma@redhat.com>
	340
	341	Relax Gtk+ requirement slightly
	342	We previously bumped the gtk+ requirement to 3.18 for the function
	343	gtk_window_fullscreen_on_monitor(). But this function is only necessary
	344	in Wayland. So add some preprocessor version checks to allow it to
	345	compile on older distributions if they don't care about wayland support.
	346
	347	Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
	348
	349	2018-10-16 Qiu Wenbo <qiuwenbo@kylinos.com.cn>
	350
	351	win32: fix command line encoding on windows platform
	352	On Windows, the arguments we get in GApplication::ocal_command_line
	353	come from g_win32_get_command_line(), and g_option_context_parse_strv()
	354	documentation says:
	355	« On Windows, the strings are expected to be in UTF-8. This is in
	356	contrast to g_option_context_parse() which expects them to be in the
	357	system codepage, which is how they are passed as argv to main(). See
	358	g_win32_get_command_line() for a solution. »
	359
	360	This was causing issues on Windows when running:
	361	remote-viewer -t "你好" spice://<target-host>:5900
	362
	363	2018-10-15 Jonathon Jongsma <jjongsma@redhat.com>
	364
	365	Fullscreen displays on wrong monitors in Wayland
	366	In fullscreen mode, we attempt to enable a guest display for each client
	367	monitor and then place a fullscreen window for each display on the
	368	appropriate monitor. Previously, we were using gtk_window_move() to move
	369	the window to the proper monitor, and then calling
	370	gtk_window_fullscreen() to enter fullscreen mode on that monitor.
	371	However, under wayland, gtk_window_move() no longer has any effect for
	372	toplevel windows, so all displays were showing up on top of eachother on
	373	the same client monitor.
	374
	375	Fortunately, Gtk+ 3.18 added a new gtk_window_fullscreen_on_monitor()
	376	API that works on Wayland. In theory this allows us to remove the call
	377	to gtk_window_move() from the code. But to avoid potentially changing
	378	behavior on xorg or older systems, I left the existing logic.
	379
	380	This requires a dependency bump for gtk+ from 3.12 to 3.18. Gtk 3.18 is
	381	provided by the following distributions (or newer):
	382	- RHEL 7.4
	383	- Fedora 23
	384	- Ubuntu 16.04LTS
	385
	386	Resolves: rhbz#1584561
	387
	388	Acked-by: Christophe Fergeau <cfergeau@redhat.com>
	389
	390	2018-09-25 Marc-André Lureau <marcandre.lureau@redhat.com>
	391
	392	display: make klass->close() optional
	393	Spice and VTE display do not need to implement it.
	394
	395	Acked-by: Victor Toso <victortoso@redhat.com>
	396
	397	window: move default sensitivity in .ui
	398	Instead of modifying it in object initialization.
	399
	400	Acked-by: Victor Toso <victortoso@redhat.com>
	401
	402	window: use virt_viewer_window_set_menus_sensitive()
	403	virt_viewer_window_set_menus_sensitive() is the common function to set
	404	sensitivity on menu items.
	405
	406	It was lacking "toolbar_send_key", so add it there too.
	407
	408	Acked-by: Victor Toso <victortoso@redhat.com>
	409
	410	app: simplify toggling visibility
	411	There is a hack to maintain the toggle state to a desired state within
	412	the "toggled" handler.
	413
	414	However it is only necessary for the ask-quit case. In this case, we
	415	want to maintain the item active, which is simpler to handle than the
	416	general case. Simplify the code by folding
	417	virt_viewer_app_window_set_visible() and removing the static
	418	"reentering" hack, only maintaining "active" on the last item.
	419
	420	Note that the hack was needed since there is no way to hook a signal
	421	handler on "clicked" before "toggled" is emitted and handled by Gtk,
	422	to avoid the recursion.
	423
	424	Acked-by: Victor Toso <victortoso@redhat.com>
	425
	426	Remove class signal handlers
	427	We don't use class signal handlers, remove the extra pointers.
	428
	429	g_signal_override_class_handler() could be used instead when needed.
	430
	431	Acked-by: Victor Toso <victortoso@redhat.com>
	432
	433	remote-viewer: add handling of spice+unix and spice+tls schemes
	434	- spice+unix:// was added in spice-gtk v0.28
	435	- spice+tls:// was added in spice-gtk v0.35
	436
	437	This allows launchers to start remote-viewer when they encounter a
	438	Spice URI with +unix or +tls.
	439
	440	Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
	441	Acked-by: Victor Toso <victortoso@redhat.com>
	442
	443	2018-09-18 Jonathon Jongsma <jjongsma@redhat.com>
	444
	445	Spice: listen for new 'SpiceSession::disconnected' signal
	446	Previously we were emitting the VirtViewerSession::session-disconnected
	447	when we got the Spice::session::channel-destroy signal for the last
	448	channel. However, since the channels are still valid at this point, and
	449	because VirtViewerApp quits the application in response to the
	450	session-disconnected signal, that means that the channels were never
	451	being properly freed. This was particularly problematic for the usbredir
	452	channel, which must disconnect any connected USB devices as part of its
	453	destruction. By using the new SpiceSession::disconnected signal instead,
	454	we can ensure that all channels have been disconnected and properly
	455	destroyed before quitting the application.
	456
	457	2018-09-12 Eduardo Lima (Etrunko) <etrunko@redhat.com>
	458
	459	ovirt-foreign-menu: New function storage_domain_validate()
	460	It may be useful to know why the storage domain has not been listed,
	461	given that there are different reasons for that. To make it easier to
	462	provide more detailed debug messages, we move code from the callback
	463	function to this new one.
	464
	465	Acked-by: Christophe Fergeau <cfergeau@redhat.com>
	466
	467	build: Update govirt and rest requirements
	468	With these new values, 0.3.3 for libgovirt and 0.8 for librest, we can
	469	remove checks for OVIRT_REST_CALL_ERROR_CANCELLED and correspondent
	470	rest_proxy_auth_cancel().
	471
	472	Distros that already ship these versions, such as Fedora, RHEL 7.4
	473	onwards, and Ubuntu since 17.10.
	474
	475	Acked-by: Christophe Fergeau <cfergeau@redhat.com>
	476
	477	2018-09-03 Victor Toso <me@victortoso.com>
	478
	479	app: Always add guest name comment
	480	Even when the user adds comments, we should place the guest's name
	481	unless it is present already.
	482
	483	Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1623756
	484
	485	Acked-by: Christophe Fergeau <cfergeau@redhat.com>
	486
	487	2018-08-31 Christophe Fergeau <cfergeau@redhat.com>
	488
	489	ovirt: Filter everything which does not end in .iso
	490	oVirt REST API does not provide a way to know what is a valid ISO image
	491	which can be assigned to a running VM. I've seen floppy disk images
	492	(.vfd) in a domain, which is already filtered. Now I've seen an ISO
	493	domain with .qcow2 files in it, which can't be assigned to a VM either.
	494	This commit filters every file which does not have a .iso extension as
	495	it's unlikely to be possible to use it.
	496
	497	Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
	498
	499	2018-08-07 Christophe Fergeau <cfergeau@redhat.com>
	500
	501	ovirt: Improve handling of g_strv_contains()
	502	The ovirt code uses g_strv_contains() with fallback code in
	503	glib-compat.h when we are using a glib version where it's not available.
	504	However, when we use a glib version where g_strv_contains is available,
	505	we get a compilation warning since we are compiling GLIB_VERSION_MAX_ALLOWED
	506	set to 2.38.
	507
	508	This commit wraps both the compat code and the g_strv_contains() call in
	509	a strv_contains() helper where we can hide the magic needed to avoid
	510	deprecation warnings.
	511
	512	Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
	513
	514	window: Adjust get_image_format() prototype
	515	This adds an unused parameter, but lets us get rid of this new warning
	516	with gcc 8:
	517
	518	virt-viewer-window.c: In function 'get_image_format':
	519	virt-viewer-window.c:930:33: warning: cast between incompatible function types from 'GHashTable * ()(void)' {aka 'struct _GHashTable ()(void)'} to 'void ()(void )' [-Wcast-function-type]
	520	g_once(&image_formats_once, (GThreadFunc)init_image_formats, NULL);
	521
	522	Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
	523
	524	2018-08-06 Christophe Fergeau <cfergeau@redhat.com>
	525
	526	app: Remove VirtViewerApp::has-focus
	527	This is no longer needed since 140cb84
	528	'remote-viewer: remove --spice-controller'
	529
	530	Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
	531
0	532	2018-07-27 Daniel P. Berrangé <berrange@redhat.com>
	533
	534	rpm: import spec changes from fedora
	535
	536	Post release version bump to 8.0
1	537
2	538	Add NEWS for 7.0 release
3	539

+16

-11

Makefile.in less more

0		# Makefile.in generated by automake 1.15.1 from Makefile.am.
	0	# Makefile.in generated by automake 1.16.1 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994-2017 Free Software Foundation, Inc.
	3	# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4	4
5	5	# This Makefile.in is free software; the Free Software Foundation
6	6	# gives unlimited permission to copy and/or distribute it,

88	88	host_triplet = @host@
89	89	subdir = .
90	90	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
91		am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
92		$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
93		$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
94		$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
95		$(top_srcdir)/configure.ac
	91	am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
	92	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
	93	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
	94	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
96	95	am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
97	96	$(ACLOCAL_M4)
98	97	DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \

137	136	$(RECURSIVE_CLEAN_TARGETS) \
138	137	$(am__extra_recursive_targets)
139	138	AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
140		cscope distdir dist dist-all distcheck
	139	cscope distdir distdir-am dist dist-all distcheck
141	140	am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
142	141	$(LISP)config.h.in
143	142	# Read a list of newline-separated strings from the standard input,

322	321	PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
323	322	PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
324	323	RANLIB = @RANLIB@
	324	REST_REQUIRED = @REST_REQUIRED@
325	325	SED = @SED@
326	326	SET_MAKE = @SET_MAKE@
327	327	SHELL = @SHELL@

335	335	UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@
336	336	USE_NLS = @USE_NLS@
337	337	VERSION = @VERSION@
	338	VTE_CFLAGS = @VTE_CFLAGS@
	339	VTE_LIBS = @VTE_LIBS@
338	340	WARN_CFLAGS = @WARN_CFLAGS@
339	341	WINDOWS_PRODUCTVERSION = @WINDOWS_PRODUCTVERSION@
340	342	WINDRES = @WINDRES@

455	457	echo ' $(SHELL) ./config.status'; \
456	458	$(SHELL) ./config.status;; \
457	459	*) \
458		echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
459		cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
	460	echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
	461	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
460	462	esac;
461	463
462	464	$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

602	604	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
603	605	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
604	606
605		distdir: $(DISTFILES)
	607	distdir: $(BUILT_SOURCES)
	608	$(MAKE) $(AM_MAKEFLAGS) distdir-am
	609
	610	distdir-am: $(DISTFILES)
606	611	$(am__remove_distdir)
607	612	test -d "$(distdir)" \|\| mkdir "$(distdir)"
608	613	@srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \

+16

-0

NEWS less more

0	0	Virt Viewer News
1	1	================
	2
	3	8.0: Mar 1, 2019
	4	-----------------
	5
	6	- Fix warnings with latest GCC versions
	7	- More strictly filter out non-ISO images in ovirt menu
	8	- Require libgovirt >= 0.3.3
	9	- Require librest >= 0.8
	10	- Support UNIX and TLS URI schemes for spice
	11	- Fix full screen monitor placement under wayland
	12	- Fix command line encoding on Windows
	13	- Ensure VM name is set in window title
	14	- Support unix-path in .vv files
	15	- Support text console windows via VTE
	16	- Add machine power control menu options
	17	- Record full build env in MSI installer
2	18
3	19	7.0: Jul 27, 2018
4	20	-----------------

+277

-105

aclocal.m4 less more

0		# generated automatically by aclocal 1.15.1 -- Autoconf --
1
2		# Copyright (C) 1996-2017 Free Software Foundation, Inc.
	0	# generated automatically by aclocal 1.16.1 -- Autoconf --
	1
	2	# Copyright (C) 1996-2018 Free Software Foundation, Inc.
3	3
4	4	# This file is free software; the Free Software Foundation
5	5	# gives unlimited permission to copy and/or distribute it,

506	506	fi])
507	507
508	508
	509
	510	dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
	511	# serial 42 IT_PROG_INTLTOOL
	512	AC_DEFUN([IT_PROG_INTLTOOL], [
	513	AC_PREREQ([2.50])dnl
	514	AC_REQUIRE([AM_NLS])dnl
	515
	516	case "$am__api_version" in
	517	1.[01234])
	518	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
	519	;;
	520	*)
	521	;;
	522	esac
	523
	524	INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 \| awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
	525	INTLTOOL_APPLIED_VERSION=`intltool-update --version \| head -1 \| cut -d" " -f3`
	526	INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION \| awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
	527	if test -n "$1"; then
	528	AC_MSG_CHECKING([for intltool >= $1])
	529	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
	530	test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" \|\|
	531	AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
	532	fi
	533
	534	AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
	535	AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
	536	AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
	537	if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
	538	AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
	539	fi
	540
	541	if test -z "$AM_DEFAULT_VERBOSITY"; then
	542	AM_DEFAULT_VERBOSITY=1
	543	fi
	544	AC_SUBST([AM_DEFAULT_VERBOSITY])
	545
	546	INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
	547	INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
	548	INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
	549	AC_SUBST(INTLTOOL_V_MERGE)
	550	AC_SUBST(INTLTOOL__v_MERGE_)
	551	AC_SUBST(INTLTOOL__v_MERGE_0)
	552
	553	INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
	554	intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
	555	intltool__v_merge_options_0='-q'
	556	AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
	557	AC_SUBST(intltool__v_merge_options_)
	558	AC_SUBST(intltool__v_merge_options_0)
	559
	560	INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	561	INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	562	INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	563	INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	564	INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
	565	INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	566	INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	567	INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	568	INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	569	INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	570	INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	571	if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
	572	INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
	573	else
	574	INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
	575	fi
	576	INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	577	INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	578	INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	579	INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	580	INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	581	INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	582	INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
	583
	584	_IT_SUBST(INTLTOOL_DESKTOP_RULE)
	585	_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
	586	_IT_SUBST(INTLTOOL_KEYS_RULE)
	587	_IT_SUBST(INTLTOOL_PROP_RULE)
	588	_IT_SUBST(INTLTOOL_OAF_RULE)
	589	_IT_SUBST(INTLTOOL_PONG_RULE)
	590	_IT_SUBST(INTLTOOL_SERVER_RULE)
	591	_IT_SUBST(INTLTOOL_SHEET_RULE)
	592	_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
	593	_IT_SUBST(INTLTOOL_UI_RULE)
	594	_IT_SUBST(INTLTOOL_XAM_RULE)
	595	_IT_SUBST(INTLTOOL_KBD_RULE)
	596	_IT_SUBST(INTLTOOL_XML_RULE)
	597	_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
	598	_IT_SUBST(INTLTOOL_CAVES_RULE)
	599	_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
	600	_IT_SUBST(INTLTOOL_THEME_RULE)
	601	_IT_SUBST(INTLTOOL_SERVICE_RULE)
	602	_IT_SUBST(INTLTOOL_POLICY_RULE)
	603
	604	# Check the gettext tools to make sure they are GNU
	605	AC_PATH_PROG(XGETTEXT, xgettext)
	606	AC_PATH_PROG(MSGMERGE, msgmerge)
	607	AC_PATH_PROG(MSGFMT, msgfmt)
	608	AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
	609	if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
	610	AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
	611	fi
	612	xgversion="`$XGETTEXT --version\|grep '(GNU ' 2> /dev/null`"
	613	mmversion="`$MSGMERGE --version\|grep '(GNU ' 2> /dev/null`"
	614	mfversion="`$MSGFMT --version\|grep '(GNU ' 2> /dev/null`"
	615	if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
	616	AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
	617	fi
	618
	619	AC_PATH_PROG(INTLTOOL_PERL, perl)
	620	if test -z "$INTLTOOL_PERL"; then
	621	AC_MSG_ERROR([perl not found])
	622	fi
	623	AC_MSG_CHECKING([for perl >= 5.8.1])
	624	$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
	625	if test $? -ne 0; then
	626	AC_MSG_ERROR([perl 5.8.1 is required for intltool])
	627	else
	628	IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
	629	AC_MSG_RESULT([$IT_PERL_VERSION])
	630	fi
	631	if test "x$2" != "xno-xml"; then
	632	AC_MSG_CHECKING([for XML::Parser])
	633	if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
	634	AC_MSG_RESULT([ok])
	635	else
	636	AC_MSG_ERROR([XML::Parser perl module is required for intltool])
	637	fi
	638	fi
	639
	640	# Substitute ALL_LINGUAS so we can use it in po/Makefile
	641	AC_SUBST(ALL_LINGUAS)
	642
	643	IT_PO_SUBDIR([po])
	644
	645	])
	646
	647
	648	# IT_PO_SUBDIR(DIRNAME)
	649	# ---------------------
	650	# All po subdirs have to be declared with this macro; the subdir "po" is
	651	# declared by IT_PROG_INTLTOOL.
	652	#
	653	AC_DEFUN([IT_PO_SUBDIR],
	654	[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
	655	dnl
	656	dnl The following CONFIG_COMMANDS should be executed at the very end
	657	dnl of config.status.
	658	AC_CONFIG_COMMANDS_PRE([
	659	AC_CONFIG_COMMANDS([$1/stamp-it], [
	660	if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
	661	AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
	662	fi
	663	rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
	664	>"$1/stamp-it.tmp"
	665	[sed '/^#/d
	666	s/^[[].] //
	667	/^[ ]*$/d
	668	'"s\|^\| $ac_top_srcdir/\|" \
	669	"$srcdir/$1/POTFILES.in" \| sed '$!s/$/ \\/' >"$1/POTFILES"
	670	]
	671	[sed '/^POTFILES =/,/[^\\]$/ {
	672	/^POTFILES =/!d
	673	r $1/POTFILES
	674	}
	675	' "$1/Makefile.in" >"$1/Makefile"]
	676	rm -f "$1/Makefile.tmp"
	677	mv "$1/stamp-it.tmp" "$1/stamp-it"
	678	])
	679	])dnl
	680	])
	681
	682	# _IT_SUBST(VARIABLE)
	683	# -------------------
	684	# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
	685	#
	686	AC_DEFUN([_IT_SUBST],
	687	[
	688	AC_SUBST([$1])
	689	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
	690	]
	691	)
	692
	693	# deprecated macros
	694	AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
	695	# A hint is needed for aclocal from Automake <= 1.9.4:
	696	# AC_DEFUN([AC_PROG_INTLTOOL], ...)
	697
	698
509	699	# nls.m4 serial 5 (gettext-0.18)
510	700	dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
511	701	dnl Foundation, Inc.

883	1073	[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
884	1074	])dnl PKG_HAVE_DEFINE_WITH_MODULES
885	1075
886		# Copyright (C) 2002-2017 Free Software Foundation, Inc.
	1076	# Copyright (C) 2002-2018 Free Software Foundation, Inc.
887	1077	#
888	1078	# This file is free software; the Free Software Foundation
889	1079	# gives unlimited permission to copy and/or distribute it,

895	1085	# generated from the m4 files accompanying Automake X.Y.
896	1086	# (This private macro should not be called outside this file.)
897	1087	AC_DEFUN([AM_AUTOMAKE_VERSION],
898		[am__api_version='1.15'
	1088	[am__api_version='1.16'
899	1089	dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
900	1090	dnl require some minimum version. Point them to the right macro.
901		m4_if([$1], [1.15.1], [],
	1091	m4_if([$1], [1.16.1], [],
902	1092	[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
903	1093	])
904	1094

914	1104	# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
915	1105	# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
916	1106	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
917		[AM_AUTOMAKE_VERSION([1.15.1])dnl
	1107	[AM_AUTOMAKE_VERSION([1.16.1])dnl
918	1108	m4_ifndef([AC_AUTOCONF_VERSION],
919	1109	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
920	1110	_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
921	1111
922	1112	# AM_AUX_DIR_EXPAND -- Autoconf --
923	1113
924		# Copyright (C) 2001-2017 Free Software Foundation, Inc.
	1114	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
925	1115	#
926	1116	# This file is free software; the Free Software Foundation
927	1117	# gives unlimited permission to copy and/or distribute it,

973	1163
974	1164	# AM_CONDITIONAL -- Autoconf --
975	1165
976		# Copyright (C) 1997-2017 Free Software Foundation, Inc.
	1166	# Copyright (C) 1997-2018 Free Software Foundation, Inc.
977	1167	#
978	1168	# This file is free software; the Free Software Foundation
979	1169	# gives unlimited permission to copy and/or distribute it,

1004	1194	Usually this means the macro was only invoked conditionally.]])
1005	1195	fi])])
1006	1196
1007		# Copyright (C) 1999-2017 Free Software Foundation, Inc.
	1197	# Copyright (C) 1999-2018 Free Software Foundation, Inc.
1008	1198	#
1009	1199	# This file is free software; the Free Software Foundation
1010	1200	# gives unlimited permission to copy and/or distribute it,

1195	1385
1196	1386	# Generate code to set up dependency tracking. -- Autoconf --
1197	1387
1198		# Copyright (C) 1999-2017 Free Software Foundation, Inc.
	1388	# Copyright (C) 1999-2018 Free Software Foundation, Inc.
1199	1389	#
1200	1390	# This file is free software; the Free Software Foundation
1201	1391	# gives unlimited permission to copy and/or distribute it,
1202	1392	# with or without modifications, as long as this notice is preserved.
1203
1204	1393
1205	1394	# _AM_OUTPUT_DEPENDENCY_COMMANDS
1206	1395	# ------------------------------

1209	1398	# Older Autoconf quotes --file arguments for eval, but not when files
1210	1399	# are listed without --file. Let's play safe and only enable the eval
1211	1400	# if we detect the quoting.
1212		case $CONFIG_FILES in
1213		\') eval set x "$CONFIG_FILES" ;;
1214		*) set x $CONFIG_FILES ;;
1215		esac
	1401	# TODO: see whether this extra hack can be removed once we start
	1402	# requiring Autoconf 2.70 or later.
	1403	AS_CASE([$CONFIG_FILES],
	1404	[\'], [eval set x "$CONFIG_FILES"],
	1405	[*], [set x $CONFIG_FILES])
1216	1406	shift
1217		for mf
	1407	# Used to flag and report bootstrapping failures.
	1408	am_rc=0
	1409	for am_mf
1218	1410	do
1219	1411	# Strip MF so we end up with the name of the file.
1220		mf=`echo "$mf" \| sed -e 's/:.*$//'`
1221		# Check whether this is an Automake generated Makefile or not.
1222		# We used to match only the files named 'Makefile.in', but
1223		# some people rename them; so instead we look at the file content.
1224		# Grep'ing the first line is not enough: some people post-process
1225		# each Makefile.in and add a new line on top of each file to say so.
1226		# Grep'ing the whole file is not good either: AIX grep has a line
	1412	am_mf=`AS_ECHO(["$am_mf"]) \| sed -e 's/:.*$//'`
	1413	# Check whether this is an Automake generated Makefile which includes
	1414	# dependency-tracking related rules and includes.
	1415	# Grep'ing the whole file directly is not great: AIX grep has a line
1227	1416	# limit of 2048, but all sed's we know have understand at least 4000.
1228		if sed -n 's,^#.generated by automake.,X,p' "$mf" \| grep X >/dev/null 2>&1; then
1229		dirpart=`AS_DIRNAME("$mf")`
1230		else
1231		continue
1232		fi
1233		# Extract the definition of DEPDIR, am__include, and am__quote
1234		# from the Makefile without running 'make'.
1235		DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
1236		test -z "$DEPDIR" && continue
1237		am__include=`sed -n 's/^am__include = //p' < "$mf"`
1238		test -z "$am__include" && continue
1239		am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
1240		# Find all dependency output files, they are included files with
1241		# $(DEPDIR) in their names. We invoke sed twice because it is the
1242		# simplest approach to changing $(DEPDIR) to its actual value in the
1243		# expansion.
1244		for file in `sed -n "
1245		s/^$am__include $am__quote$.(DEPDIR).$$am__quote"'$/\1/p' <"$mf" \| \
1246		sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
1247		# Make sure the directory exists.
1248		test -f "$dirpart/$file" && continue
1249		fdir=`AS_DIRNAME(["$file"])`
1250		AS_MKDIR_P([$dirpart/$fdir])
1251		# echo "creating $dirpart/$file"
1252		echo '# dummy' > "$dirpart/$file"
1253		done
	1417	sed -n 's,^am--depfiles:.*,X,p' "$am_mf" \| grep X >/dev/null 2>&1 \
	1418	\|\| continue
	1419	am_dirpart=`AS_DIRNAME(["$am_mf"])`
	1420	am_filepart=`AS_BASENAME(["$am_mf"])`
	1421	AM_RUN_LOG([cd "$am_dirpart" \
	1422	&& sed -e '/# am--include-marker/d' "$am_filepart" \
	1423	\| $MAKE -f - am--depfiles]) \|\| am_rc=$?
1254	1424	done
	1425	if test $am_rc -ne 0; then
	1426	AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
	1427	for automatic dependency tracking. Try re-running configure with the
	1428	'--disable-dependency-tracking' option to at least be able to build
	1429	the package (albeit without support for automatic dependency tracking).])
	1430	fi
	1431	AS_UNSET([am_dirpart])
	1432	AS_UNSET([am_filepart])
	1433	AS_UNSET([am_mf])
	1434	AS_UNSET([am_rc])
	1435	rm -f conftest-deps.mk
1255	1436	}
1256	1437	])# _AM_OUTPUT_DEPENDENCY_COMMANDS
1257	1438

1260	1441	# -----------------------------
1261	1442	# This macro should only be invoked once -- use via AC_REQUIRE.
1262	1443	#
1263		# This code is only required when automatic dependency tracking
1264		# is enabled. FIXME. This creates each '.P' file that we will
1265		# need in order to bootstrap the dependency handling code.
	1444	# This code is only required when automatic dependency tracking is enabled.
	1445	# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
	1446	# order to bootstrap the dependency handling code.
1266	1447	AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1267	1448	[AC_CONFIG_COMMANDS([depfiles],
1268	1449	[test x"$AMDEP_TRUE" != x"" \|\| _AM_OUTPUT_DEPENDENCY_COMMANDS],
1269		[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1270		])
	1450	[AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
1271	1451
1272	1452	# Do all the work for Automake. -- Autoconf --
1273	1453
1274		# Copyright (C) 1996-2017 Free Software Foundation, Inc.
	1454	# Copyright (C) 1996-2018 Free Software Foundation, Inc.
1275	1455	#
1276	1456	# This file is free software; the Free Software Foundation
1277	1457	# gives unlimited permission to copy and/or distribute it,

1358	1538	AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1359	1539	# For better backward compatibility. To be removed once Automake 1.9.x
1360	1540	# dies out for good. For more background, see:
1361		# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
1362		# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
	1541	# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
	1542	# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
1363	1543	AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
1364	1544	# We need awk for the "check" target (and possibly the TAP driver). The
1365	1545	# system "awk" is bad on some platforms.

1426	1606	Aborting the configuration process, to ensure you take notice of the issue.
1427	1607
1428	1608	You can download and install GNU coreutils to get an 'rm' implementation
1429		that behaves properly: <http://www.gnu.org/software/coreutils/>.
	1609	that behaves properly: <https://www.gnu.org/software/coreutils/>.
1430	1610
1431	1611	If you want to complete the configuration process using your problematic
1432	1612	'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM

1468	1648	done
1469	1649	echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1470	1650
1471		# Copyright (C) 2001-2017 Free Software Foundation, Inc.
	1651	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1472	1652	#
1473	1653	# This file is free software; the Free Software Foundation
1474	1654	# gives unlimited permission to copy and/or distribute it,

1489	1669	fi
1490	1670	AC_SUBST([install_sh])])
1491	1671
1492		# Copyright (C) 2003-2017 Free Software Foundation, Inc.
	1672	# Copyright (C) 2003-2018 Free Software Foundation, Inc.
1493	1673	#
1494	1674	# This file is free software; the Free Software Foundation
1495	1675	# gives unlimited permission to copy and/or distribute it,

1510	1690
1511	1691	# Check to see how 'make' treats includes. -- Autoconf --
1512	1692
1513		# Copyright (C) 2001-2017 Free Software Foundation, Inc.
	1693	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1514	1694	#
1515	1695	# This file is free software; the Free Software Foundation
1516	1696	# gives unlimited permission to copy and/or distribute it,

1518	1698
1519	1699	# AM_MAKE_INCLUDE()
1520	1700	# -----------------
1521		# Check to see how make treats includes.
	1701	# Check whether make has an 'include' directive that can support all
	1702	# the idioms we need for our automatic dependency tracking code.
1522	1703	AC_DEFUN([AM_MAKE_INCLUDE],
1523		[am_make=${MAKE-make}
1524		cat > confinc << 'END'
	1704	[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
	1705	cat > confinc.mk << 'END'
1525	1706	am__doit:
1526		@echo this is the am__doit target
	1707	@echo this is the am__doit target >confinc.out
1527	1708	.PHONY: am__doit
1528	1709	END
1529		# If we don't find an include directive, just comment out the code.
1530		AC_MSG_CHECKING([for style of include used by $am_make])
1531	1710	am__include="#"
1532	1711	am__quote=
1533		_am_result=none
1534		# First try GNU make style include.
1535		echo "include confinc" > confmf
1536		# Ignore all kinds of additional output from 'make'.
1537		case `$am_make -s -f confmf 2> /dev/null` in #(
1538		the\ am__doit\ target)
1539		am__include=include
1540		am__quote=
1541		_am_result=GNU
1542		;;
1543		esac
1544		# Now try BSD make style include.
1545		if test "$am__include" = "#"; then
1546		echo '.include "confinc"' > confmf
1547		case `$am_make -s -f confmf 2> /dev/null` in #(
1548		the\ am__doit\ target)
1549		am__include=.include
1550		am__quote="\""
1551		_am_result=BSD
1552		;;
1553		esac
1554		fi
1555		AC_SUBST([am__include])
1556		AC_SUBST([am__quote])
1557		AC_MSG_RESULT([$_am_result])
1558		rm -f confinc confmf
1559		])
	1712	# BSD make does it like this.
	1713	echo '.include "confinc.mk" # ignored' > confmf.BSD
	1714	# Other make implementations (GNU, Solaris 10, AIX) do it like this.
	1715	echo 'include confinc.mk # ignored' > confmf.GNU
	1716	_am_result=no
	1717	for s in GNU BSD; do
	1718	AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
	1719	AS_CASE([$?:`cat confinc.out 2>/dev/null`],
	1720	['0:this is the am__doit target'],
	1721	[AS_CASE([$s],
	1722	[BSD], [am__include='.include' am__quote='"'],
	1723	[am__include='include' am__quote=''])])
	1724	if test "$am__include" != "#"; then
	1725	_am_result="yes ($s style)"
	1726	break
	1727	fi
	1728	done
	1729	rm -f confinc.* confmf.*
	1730	AC_MSG_RESULT([${_am_result}])
	1731	AC_SUBST([am__include])])
	1732	AC_SUBST([am__quote])])
1560	1733
1561	1734	# Fake the existence of programs that GNU maintainers use. -- Autoconf --
1562	1735
1563		# Copyright (C) 1997-2017 Free Software Foundation, Inc.
	1736	# Copyright (C) 1997-2018 Free Software Foundation, Inc.
1564	1737	#
1565	1738	# This file is free software; the Free Software Foundation
1566	1739	# gives unlimited permission to copy and/or distribute it,

1599	1772
1600	1773	# Helper functions for option handling. -- Autoconf --
1601	1774
1602		# Copyright (C) 2001-2017 Free Software Foundation, Inc.
	1775	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1603	1776	#
1604	1777	# This file is free software; the Free Software Foundation
1605	1778	# gives unlimited permission to copy and/or distribute it,

1628	1801	AC_DEFUN([_AM_IF_OPTION],
1629	1802	[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1630	1803
1631		# Copyright (C) 1999-2017 Free Software Foundation, Inc.
	1804	# Copyright (C) 1999-2018 Free Software Foundation, Inc.
1632	1805	#
1633	1806	# This file is free software; the Free Software Foundation
1634	1807	# gives unlimited permission to copy and/or distribute it,

1675	1848	# For backward compatibility.
1676	1849	AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
1677	1850
1678		# Copyright (C) 2001-2017 Free Software Foundation, Inc.
	1851	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1679	1852	#
1680	1853	# This file is free software; the Free Software Foundation
1681	1854	# gives unlimited permission to copy and/or distribute it,

1694	1867
1695	1868	# Check to make sure that the build environment is sane. -- Autoconf --
1696	1869
1697		# Copyright (C) 1996-2017 Free Software Foundation, Inc.
	1870	# Copyright (C) 1996-2018 Free Software Foundation, Inc.
1698	1871	#
1699	1872	# This file is free software; the Free Software Foundation
1700	1873	# gives unlimited permission to copy and/or distribute it,

1775	1948	rm -f conftest.file
1776	1949	])
1777	1950
1778		# Copyright (C) 2009-2017 Free Software Foundation, Inc.
	1951	# Copyright (C) 2009-2018 Free Software Foundation, Inc.
1779	1952	#
1780	1953	# This file is free software; the Free Software Foundation
1781	1954	# gives unlimited permission to copy and/or distribute it,

1835	2008	_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1836	2009	])
1837	2010
1838		# Copyright (C) 2001-2017 Free Software Foundation, Inc.
	2011	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1839	2012	#
1840	2013	# This file is free software; the Free Software Foundation
1841	2014	# gives unlimited permission to copy and/or distribute it,

1863	2036	INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1864	2037	AC_SUBST([INSTALL_STRIP_PROGRAM])])
1865	2038
1866		# Copyright (C) 2006-2017 Free Software Foundation, Inc.
	2039	# Copyright (C) 2006-2018 Free Software Foundation, Inc.
1867	2040	#
1868	2041	# This file is free software; the Free Software Foundation
1869	2042	# gives unlimited permission to copy and/or distribute it,

1882	2055
1883	2056	# Check how to create a tarball. -- Autoconf --
1884	2057
1885		# Copyright (C) 2004-2017 Free Software Foundation, Inc.
	2058	# Copyright (C) 2004-2018 Free Software Foundation, Inc.
1886	2059	#
1887	2060	# This file is free software; the Free Software Foundation
1888	2061	# gives unlimited permission to copy and/or distribute it,

2013	2186	AC_SUBST([am__untar])
2014	2187	]) # _AM_PROG_TAR
2015	2188
2016		m4_include([m4/intltool.m4])
2017	2189	m4_include([m4/libtool.m4])
2018	2190	m4_include([m4/ltoptions.m4])
2019	2191	m4_include([m4/ltsugar.m4])

-6

build-aux/compile less more

0		#!/bin/sh
	0	#! /bin/sh
1	1	# Wrapper for compilers which do not understand '-c -o'.
2	2
3		scriptversion=2016-01-11.22; # UTC
4
5		# Copyright (C) 1999-2017 Free Software Foundation, Inc.
	3	scriptversion=2018-03-07.03; # UTC
	4
	5	# Copyright (C) 1999-2018 Free Software Foundation, Inc.
6	6	# Written by Tom Tromey <tromey@cygnus.com>.
7	7	#
8	8	# This program is free software; you can redistribute it and/or modify

16	16	# GNU General Public License for more details.
17	17	#
18	18	# You should have received a copy of the GNU General Public License
19		# along with this program. If not, see <http://www.gnu.org/licenses/>.
	19	# along with this program. If not, see <https://www.gnu.org/licenses/>.
20	20
21	21	# As a special exception to the GNU General Public License, if you
22	22	# distribute this file as part of a program that contains a

339	339	# Local Variables:
340	340	# mode: shell-script
341	341	# sh-indentation: 2
342		# eval: (add-hook 'write-file-hooks 'time-stamp)
	342	# eval: (add-hook 'before-save-hook 'time-stamp)
343	343	# time-stamp-start: "scriptversion="
344	344	# time-stamp-format: "%:y-%02m-%02d.%02H"
345	345	# time-stamp-time-zone: "UTC0"

+283

-283

build-aux/config.guess less more

0		#!/bin/sh
	0	#! /bin/sh
1	1	# Attempt to guess a canonical system name.
2		# Copyright 1992-2017 Free Software Foundation, Inc.
3
4		timestamp='2017-08-08'
	2	# Copyright 1992-2018 Free Software Foundation, Inc.
	3
	4	timestamp='2018-03-08'
5	5
6	6	# This file is free software; you can redistribute it and/or modify it
7	7	# under the terms of the GNU General Public License as published by

14	14	# General Public License for more details.
15	15	#
16	16	# You should have received a copy of the GNU General Public License
17		# along with this program; if not, see <http://www.gnu.org/licenses/>.
	17	# along with this program; if not, see <https://www.gnu.org/licenses/>.
18	18	#
19	19	# As a special exception to the GNU General Public License, if you
20	20	# distribute this file as part of a program that contains a

26	26	# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
27	27	#
28	28	# You can get the latest version of this script from:
29		# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
	29	# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
30	30	#
31	31	# Please send patches to <config-patches@gnu.org>.
32	32

38	38
39	39	Output the configuration name of the system \`$me' is run on.
40	40
41		Operation modes:
	41	Options:
42	42	-h, --help print this help, then exit
43	43	-t, --time-stamp print date of last modification, then exit
44	44	-v, --version print version number, then exit

49	49	GNU config.guess ($timestamp)
50	50
51	51	Originally written by Per Bothner.
52		Copyright 1992-2017 Free Software Foundation, Inc.
	52	Copyright 1992-2018 Free Software Foundation, Inc.
53	53
54	54	This is free software; see the source for copying conditions. There is NO
55	55	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

106	106	dummy=$tmp/dummy ;
107	107	tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
108	108	case $CC_FOR_BUILD,$HOST_CC,$CC in
109		,,) echo "int x;" > $dummy.c ;
	109	,,) echo "int x;" > "$dummy.c" ;
110	110	for c in cc gcc c89 c99 ; do
111		if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
	111	if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
112	112	CC_FOR_BUILD="$c"; break ;
113	113	fi ;
114	114	done ;

131	131	UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
132	132	UNAME_VERSION=`(uname -v) 2>/dev/null` \|\| UNAME_VERSION=unknown
133	133
134		case "${UNAME_SYSTEM}" in
	134	case "$UNAME_SYSTEM" in
135	135	Linux\|GNU\|GNU/*)
136	136	# If the system lacks a compiler, then just pick glibc.
137	137	# We could probably try harder.
138	138	LIBC=gnu
139	139
140		eval $set_cc_for_build
141		cat <<-EOF > $dummy.c
	140	eval "$set_cc_for_build"
	141	cat <<-EOF > "$dummy.c"
142	142	#include <features.h>
143	143	#if defined(__UCLIBC__)
144	144	LIBC=uclibc

148	148	LIBC=gnu
149	149	#endif
150	150	EOF
151		eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`
	151	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`"
	152
	153	# If ldd exists, use it to detect musl libc.
	154	if command -v ldd >/dev/null && \
	155	ldd --version 2>&1 \| grep -q ^musl
	156	then
	157	LIBC=musl
	158	fi
152	159	;;
153	160	esac
154	161
155	162	# Note: order is significant - the case branches are not exclusive.
156	163
157		case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
	164	case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
158	165	:NetBSD::*)
159	166	# NetBSD (nbsd) targets should (where applicable) match one or
160	167	# more of the tuples: --netbsdelf, --netbsdaout,

168	175	# portion of the name. We always set it to "unknown".
169	176	sysctl="sysctl -n hw.machine_arch"
170	177	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null \|\| \
171		/sbin/$sysctl 2>/dev/null \|\| \
172		/usr/sbin/$sysctl 2>/dev/null \|\| \
	178	"/sbin/$sysctl" 2>/dev/null \|\| \
	179	"/usr/sbin/$sysctl" 2>/dev/null \|\| \
173	180	echo unknown)`
174		case "${UNAME_MACHINE_ARCH}" in
	181	case "$UNAME_MACHINE_ARCH" in
175	182	armeb) machine=armeb-unknown ;;
176	183	arm*) machine=arm-unknown ;;
177	184	sh3el) machine=shl-unknown ;;
178	185	sh3eb) machine=sh-unknown ;;
179	186	sh5el) machine=sh5le-unknown ;;
180	187	earmv*)
181		arch=`echo ${UNAME_MACHINE_ARCH} \| sed -e 's,^e$armv[0-9]$.*$,\1,'`
182		endian=`echo ${UNAME_MACHINE_ARCH} \| sed -ne 's,^.*$eb$$,\1,p'`
183		machine=${arch}${endian}-unknown
	188	arch=`echo "$UNAME_MACHINE_ARCH" \| sed -e 's,^e$armv[0-9]$.*$,\1,'`
	189	endian=`echo "$UNAME_MACHINE_ARCH" \| sed -ne 's,^.*$eb$$,\1,p'`
	190	machine="${arch}${endian}"-unknown
184	191	;;
185		*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
	192	*) machine="$UNAME_MACHINE_ARCH"-unknown ;;
186	193	esac
187	194	# The Operating System including object format, if it has switched
188	195	# to ELF recently (or will in the future) and ABI.
189		case "${UNAME_MACHINE_ARCH}" in
	196	case "$UNAME_MACHINE_ARCH" in
190	197	earm*)
191	198	os=netbsdelf
192	199	;;
193	200	arm\|i386\|m68k\|ns32k\|sh3\|sparc\|vax)
194		eval $set_cc_for_build
	201	eval "$set_cc_for_build"
195	202	if echo __ELF__ \| $CC_FOR_BUILD -E - 2>/dev/null \
196	203	\| grep -q __ELF__
197	204	then

207	214	;;
208	215	esac
209	216	# Determine ABI tags.
210		case "${UNAME_MACHINE_ARCH}" in
	217	case "$UNAME_MACHINE_ARCH" in
211	218	earm*)
212	219	expr='s/^earmv[0-9]/-eabi/;s/eb$//'
213		abi=`echo ${UNAME_MACHINE_ARCH} \| sed -e "$expr"`
	220	abi=`echo "$UNAME_MACHINE_ARCH" \| sed -e "$expr"`
214	221	;;
215	222	esac
216	223	# The OS release

218	225	# thus, need a distinct triplet. However, they do not need
219	226	# kernel version information, so it can be replaced with a
220	227	# suitable tag, in the style of linux-gnu.
221		case "${UNAME_VERSION}" in
	228	case "$UNAME_VERSION" in
222	229	Debian*)
223	230	release='-gnu'
224	231	;;
225	232	*)
226		release=`echo ${UNAME_RELEASE} \| sed -e 's/[-_].*//' \| cut -d. -f1,2`
	233	release=`echo "$UNAME_RELEASE" \| sed -e 's/[-_].*//' \| cut -d. -f1,2`
227	234	;;
228	235	esac
229	236	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
230	237	# contains redundant information, the shorter form:
231	238	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
232		echo "${machine}-${os}${release}${abi}"
	239	echo "$machine-${os}${release}${abi}"
233	240	exit ;;
234	241	:Bitrig::*)
235	242	UNAME_MACHINE_ARCH=`arch \| sed 's/Bitrig.//'`
236		echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
	243	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
237	244	exit ;;
238	245	:OpenBSD::*)
239	246	UNAME_MACHINE_ARCH=`arch \| sed 's/OpenBSD.//'`
240		echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
	247	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
241	248	exit ;;
242	249	:LibertyBSD::*)
243	250	UNAME_MACHINE_ARCH=`arch \| sed 's/^.*BSD\.//'`
244		echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
	251	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
	252	exit ;;
	253	:MidnightBSD::*)
	254	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
245	255	exit ;;
246	256	:ekkoBSD::*)
247		echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
	257	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
248	258	exit ;;
249	259	:SolidBSD::*)
250		echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
	260	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
251	261	exit ;;
252	262	macppc:MirBSD::)
253		echo powerpc-unknown-mirbsd${UNAME_RELEASE}
	263	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
254	264	exit ;;
255	265	:MirBSD::*)
256		echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
	266	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
257	267	exit ;;
258	268	:Sortix::*)
259		echo ${UNAME_MACHINE}-unknown-sortix
	269	echo "$UNAME_MACHINE"-unknown-sortix
260	270	exit ;;
261	271	:Redox::*)
262		echo ${UNAME_MACHINE}-unknown-redox
263		exit ;;
	272	echo "$UNAME_MACHINE"-unknown-redox
	273	exit ;;
	274	mips:OSF1:.)
	275	echo mips-dec-osf1
	276	exit ;;
264	277	alpha:OSF1::)
265	278	case $UNAME_RELEASE in
266	279	*4.0)

312	325	# A Tn.n version is a released field test version.
313	326	# A Xn.n version is an unreleased experimental baselevel.
314	327	# 1.2 uses "1.2" for uname -r.
315		echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
	328	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
316	329	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
317	330	exitcode=$?
318	331	trap '' 0
319	332	exit $exitcode ;;
320		Alpha\ :Windows_NT:*)
321		# How do we know it's Interix rather than the generic POSIX subsystem?
322		# Should we change UNAME_MACHINE based on the output of uname instead
323		# of the specific Alpha model?
324		echo alpha-pc-interix
325		exit ;;
326		21064:Windows_NT:50:3)
327		echo alpha-dec-winnt3.5
328		exit ;;
329	333	Amiga:UNIX_System_V:4.0:)
330	334	echo m68k-unknown-sysv4
331	335	exit ;;
332	336	:[Aa]miga[Oo][Ss]::*)
333		echo ${UNAME_MACHINE}-unknown-amigaos
	337	echo "$UNAME_MACHINE"-unknown-amigaos
334	338	exit ;;
335	339	:[Mm]orph[Oo][Ss]::*)
336		echo ${UNAME_MACHINE}-unknown-morphos
	340	echo "$UNAME_MACHINE"-unknown-morphos
337	341	exit ;;
338	342	:OS/390::*)
339	343	echo i370-ibm-openedition

345	349	echo powerpc-ibm-os400
346	350	exit ;;
347	351	arm:RISC:1.[012]:\|arm:riscix:1.[012]:*)
348		echo arm-acorn-riscix${UNAME_RELEASE}
	352	echo arm-acorn-riscix"$UNAME_RELEASE"
349	353	exit ;;
350	354	arm:riscos::\|arm:RISCOS::)
351	355	echo arm-unknown-riscos

372	376	sparc) echo sparc-icl-nx7; exit ;;
373	377	esac ;;
374	378	s390x:SunOS::)
375		echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	379	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
376	380	exit ;;
377	381	sun4H:SunOS:5.:)
378		echo sparc-hal-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	382	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
379	383	exit ;;
380	384	sun4:SunOS:5.:* \| tadpole:SunOS:5.:*)
381		echo sparc-sun-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	385	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
382	386	exit ;;
383	387	i86pc:AuroraUX:5.: \| i86xen:AuroraUX:5.:)
384		echo i386-pc-auroraux${UNAME_RELEASE}
	388	echo i386-pc-auroraux"$UNAME_RELEASE"
385	389	exit ;;
386	390	i86pc:SunOS:5.: \| i86xen:SunOS:5.:)
387		eval $set_cc_for_build
	391	eval "$set_cc_for_build"
388	392	SUN_ARCH=i386
389	393	# If there is a compiler, see if it is configured for 64-bit objects.
390	394	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.

397	401	SUN_ARCH=x86_64
398	402	fi
399	403	fi
400		echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	404	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
401	405	exit ;;
402	406	sun4:SunOS:6:*)
403	407	# According to config.sub, this is the proper way to canonicalize
404	408	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
405	409	# it's likely to be more like Solaris than SunOS4.
406		echo sparc-sun-solaris3`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	410	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
407	411	exit ;;
408	412	sun4:SunOS::*)
409	413	case "`/usr/bin/arch -k`" in

412	416	;;
413	417	esac
414	418	# Japanese Language versions have a version number like `4.1.3-JL'.
415		echo sparc-sun-sunos`echo ${UNAME_RELEASE}\|sed -e 's/-/_/'`
	419	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"\|sed -e 's/-/_/'`"
416	420	exit ;;
417	421	sun3:SunOS::*)
418		echo m68k-sun-sunos${UNAME_RELEASE}
	422	echo m68k-sun-sunos"$UNAME_RELEASE"
419	423	exit ;;
420	424	sun::4.2BSD:*)
421	425	UNAME_RELEASE=`(sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null`
422		test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
	426	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
423	427	case "`/bin/arch`" in
424	428	sun3)
425		echo m68k-sun-sunos${UNAME_RELEASE}
	429	echo m68k-sun-sunos"$UNAME_RELEASE"
426	430	;;
427	431	sun4)
428		echo sparc-sun-sunos${UNAME_RELEASE}
	432	echo sparc-sun-sunos"$UNAME_RELEASE"
429	433	;;
430	434	esac
431	435	exit ;;
432	436	aushp:SunOS::)
433		echo sparc-auspex-sunos${UNAME_RELEASE}
	437	echo sparc-auspex-sunos"$UNAME_RELEASE"
434	438	exit ;;
435	439	# The situation for MiNT is a little confusing. The machine name
436	440	# can be virtually everything (everything which is not

441	445	# MiNT. But MiNT is downward compatible to TOS, so this should
442	446	# be no problem.
443	447	atarist[e]:MiNT::* \| atarist[e]:mint::* \| atarist[e]:TOS::*)
444		echo m68k-atari-mint${UNAME_RELEASE}
	448	echo m68k-atari-mint"$UNAME_RELEASE"
445	449	exit ;;
446	450	atari:MiNT:: \| atari:mint:: \| atarist[e]:TOS::*)
447		echo m68k-atari-mint${UNAME_RELEASE}
	451	echo m68k-atari-mint"$UNAME_RELEASE"
448	452	exit ;;
449	453	falcon:MiNT::* \| falcon:mint::* \| falcon:TOS::*)
450		echo m68k-atari-mint${UNAME_RELEASE}
	454	echo m68k-atari-mint"$UNAME_RELEASE"
451	455	exit ;;
452	456	milan:MiNT:: \| milan:mint:: \| milan:TOS::*)
453		echo m68k-milan-mint${UNAME_RELEASE}
	457	echo m68k-milan-mint"$UNAME_RELEASE"
454	458	exit ;;
455	459	hades:MiNT:: \| hades:mint:: \| hades:TOS::*)
456		echo m68k-hades-mint${UNAME_RELEASE}
	460	echo m68k-hades-mint"$UNAME_RELEASE"
457	461	exit ;;
458	462	:MiNT:: \| :mint:: \| :TOS::)
459		echo m68k-unknown-mint${UNAME_RELEASE}
	463	echo m68k-unknown-mint"$UNAME_RELEASE"
460	464	exit ;;
461	465	m68k:machten::)
462		echo m68k-apple-machten${UNAME_RELEASE}
	466	echo m68k-apple-machten"$UNAME_RELEASE"
463	467	exit ;;
464	468	powerpc:machten::)
465		echo powerpc-apple-machten${UNAME_RELEASE}
	469	echo powerpc-apple-machten"$UNAME_RELEASE"
466	470	exit ;;
467	471	RISC:Mach::*)
468	472	echo mips-dec-mach_bsd4.3
469	473	exit ;;
470	474	RISC:ULTRIX::*)
471		echo mips-dec-ultrix${UNAME_RELEASE}
	475	echo mips-dec-ultrix"$UNAME_RELEASE"
472	476	exit ;;
473	477	VAX:ULTRIX::)
474		echo vax-dec-ultrix${UNAME_RELEASE}
	478	echo vax-dec-ultrix"$UNAME_RELEASE"
475	479	exit ;;
476	480	2020:CLIX:: \| 2430:CLIX::)
477		echo clipper-intergraph-clix${UNAME_RELEASE}
	481	echo clipper-intergraph-clix"$UNAME_RELEASE"
478	482	exit ;;
479	483	mips:::UMIPS \| mips:::RISCos)
480		eval $set_cc_for_build
481		sed 's/^ //' << EOF >$dummy.c
	484	eval "$set_cc_for_build"
	485	sed 's/^ //' << EOF > "$dummy.c"
482	486	#ifdef __cplusplus
483	487	#include <stdio.h> /* for printf() prototype */
484	488	int main (int argc, char *argv[]) {

487	491	#endif
488	492	#if defined (host_mips) && defined (MIPSEB)
489	493	#if defined (SYSTYPE_SYSV)
490		printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
	494	printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
491	495	#endif
492	496	#if defined (SYSTYPE_SVR4)
493		printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
	497	printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
494	498	#endif
495	499	#if defined (SYSTYPE_BSD43) \|\| defined(SYSTYPE_BSD)
496		printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
	500	printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
497	501	#endif
498	502	#endif
499	503	exit (-1);
500	504	}
501	505	EOF
502		$CC_FOR_BUILD -o $dummy $dummy.c &&
503		dummyarg=`echo "${UNAME_RELEASE}" \| sed -n 's/$[0-9]$./\1/p'` &&
504		SYSTEM_NAME=`$dummy $dummyarg` &&
	506	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
	507	dummyarg=`echo "$UNAME_RELEASE" \| sed -n 's/$[0-9]$./\1/p'` &&
	508	SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
505	509	{ echo "$SYSTEM_NAME"; exit; }
506		echo mips-mips-riscos${UNAME_RELEASE}
	510	echo mips-mips-riscos"$UNAME_RELEASE"
507	511	exit ;;
508	512	Motorola:PowerMAX_OS::)
509	513	echo powerpc-motorola-powermax

529	533	AViiON:dgux::)
530	534	# DG/UX returns AViiON for all architectures
531	535	UNAME_PROCESSOR=`/usr/bin/uname -p`
532		if [ $UNAME_PROCESSOR = mc88100 ] \|\| [ $UNAME_PROCESSOR = mc88110 ]
	536	if [ "$UNAME_PROCESSOR" = mc88100 ] \|\| [ "$UNAME_PROCESSOR" = mc88110 ]
533	537	then
534		if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] \|\| \
535		[ ${TARGET_BINARY_INTERFACE}x = x ]
	538	if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] \|\| \
	539	[ "$TARGET_BINARY_INTERFACE"x = x ]
536	540	then
537		echo m88k-dg-dgux${UNAME_RELEASE}
	541	echo m88k-dg-dgux"$UNAME_RELEASE"
538	542	else
539		echo m88k-dg-dguxbcs${UNAME_RELEASE}
	543	echo m88k-dg-dguxbcs"$UNAME_RELEASE"
540	544	fi
541	545	else
542		echo i586-dg-dgux${UNAME_RELEASE}
	546	echo i586-dg-dgux"$UNAME_RELEASE"
543	547	fi
544	548	exit ;;
545	549	M88:DolphinOS::*) # DolphinOS (SVR3)

556	560	echo m68k-tektronix-bsd
557	561	exit ;;
558	562	:IRIX::)
559		echo mips-sgi-irix`echo ${UNAME_RELEASE}\|sed -e 's/-/_/g'`
	563	echo mips-sgi-irix"`echo "$UNAME_RELEASE"\|sed -e 's/-/_/g'`"
560	564	exit ;;
561	565	????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
562	566	echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id

568	572	if [ -x /usr/bin/oslevel ] ; then
569	573	IBM_REV=`/usr/bin/oslevel`
570	574	else
571		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
572		fi
573		echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
	575	IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
	576	fi
	577	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
574	578	exit ;;
575	579	*:AIX:2:3)
576	580	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
577		eval $set_cc_for_build
578		sed 's/^ //' << EOF >$dummy.c
	581	eval "$set_cc_for_build"
	582	sed 's/^ //' << EOF > "$dummy.c"
579	583	#include <sys/systemcfg.h>
580	584
581	585	main()

586	590	exit(0);
587	591	}
588	592	EOF
589		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
	593	if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
590	594	then
591	595	echo "$SYSTEM_NAME"
592	596	else

600	604	exit ;;
601	605	:AIX::[4567])
602	606	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }'`
603		if /usr/sbin/lsattr -El ${IBM_CPU_ID} \| grep ' POWER' >/dev/null 2>&1; then
	607	if /usr/sbin/lsattr -El "$IBM_CPU_ID" \| grep ' POWER' >/dev/null 2>&1; then
604	608	IBM_ARCH=rs6000
605	609	else
606	610	IBM_ARCH=powerpc

609	613	IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc \|
610	614	awk -F: '{ print $3 }' \| sed s/[0-9]*$/0/`
611	615	else
612		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
613		fi
614		echo ${IBM_ARCH}-ibm-aix${IBM_REV}
	616	IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
	617	fi
	618	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
615	619	exit ;;
616	620	:AIX::*)
617	621	echo rs6000-ibm-aix
618	622	exit ;;
619		ibmrt:4.4BSD:\|romp-ibm:BSD:)
	623	ibmrt:4.4BSD:\|romp-ibm:4.4BSD:)
620	624	echo romp-ibm-bsd4.4
621	625	exit ;;
622	626	ibmrt:BSD:\|romp-ibm:BSD:*) # covers RT/PC BSD and
623		echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
	627	echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
624	628	exit ;; # report: romp-ibm BSD 4.3
625	629	:BOSX::*)
626	630	echo rs6000-bull-bosx

635	639	echo m68k-hp-bsd4.4
636	640	exit ;;
637	641	9000/[34678]??:HP-UX::)
638		HPUX_REV=`echo ${UNAME_RELEASE}\|sed -e 's/[^.].[0B]//'`
639		case "${UNAME_MACHINE}" in
640		9000/31? ) HP_ARCH=m68000 ;;
641		9000/[34]?? ) HP_ARCH=m68k ;;
	642	HPUX_REV=`echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//'`
	643	case "$UNAME_MACHINE" in
	644	9000/31?) HP_ARCH=m68000 ;;
	645	9000/[34]??) HP_ARCH=m68k ;;
642	646	9000/[678][0-9][0-9])
643	647	if [ -x /usr/bin/getconf ]; then
644	648	sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
645	649	sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
646		case "${sc_cpu_version}" in
	650	case "$sc_cpu_version" in
647	651	523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
648	652	528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
649	653	532) # CPU_PA_RISC2_0
650		case "${sc_kernel_bits}" in
	654	case "$sc_kernel_bits" in
651	655	32) HP_ARCH=hppa2.0n ;;
652	656	64) HP_ARCH=hppa2.0w ;;
653	657	'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
654	658	esac ;;
655	659	esac
656	660	fi
657		if [ "${HP_ARCH}" = "" ]; then
658		eval $set_cc_for_build
659		sed 's/^ //' << EOF >$dummy.c
	661	if [ "$HP_ARCH" = "" ]; then
	662	eval "$set_cc_for_build"
	663	sed 's/^ //' << EOF > "$dummy.c"
660	664
661	665	#define _HPUX_SOURCE
662	666	#include <stdlib.h>

689	693	exit (0);
690	694	}
691	695	EOF
692		(CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
	696	(CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
693	697	test -z "$HP_ARCH" && HP_ARCH=hppa
694	698	fi ;;
695	699	esac
696		if [ ${HP_ARCH} = hppa2.0w ]
	700	if [ "$HP_ARCH" = hppa2.0w ]
697	701	then
698		eval $set_cc_for_build
	702	eval "$set_cc_for_build"
699	703
700	704	# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
701	705	# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler

714	718	HP_ARCH=hppa64
715	719	fi
716	720	fi
717		echo ${HP_ARCH}-hp-hpux${HPUX_REV}
	721	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
718	722	exit ;;
719	723	ia64:HP-UX::)
720		HPUX_REV=`echo ${UNAME_RELEASE}\|sed -e 's/[^.].[0B]//'`
721		echo ia64-hp-hpux${HPUX_REV}
	724	HPUX_REV=`echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//'`
	725	echo ia64-hp-hpux"$HPUX_REV"
722	726	exit ;;
723	727	3050:HI-UX::*)
724		eval $set_cc_for_build
725		sed 's/^ //' << EOF >$dummy.c
	728	eval "$set_cc_for_build"
	729	sed 's/^ //' << EOF > "$dummy.c"
726	730	#include <unistd.h>
727	731	int
728	732	main ()

747	751	exit (0);
748	752	}
749	753	EOF
750		$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
	754	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
751	755	{ echo "$SYSTEM_NAME"; exit; }
752	756	echo unknown-hitachi-hiuxwe2
753	757	exit ;;
754		9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd:: )
	758	9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd::)
755	759	echo hppa1.1-hp-bsd
756	760	exit ;;
757	761	9000/8??:4.3bsd::)

760	764	9??:MPE/iX:: \| 3000:MPE/iX::)
761	765	echo hppa1.0-hp-mpeix
762	766	exit ;;
763		hp7??:OSF1:: \| hp8?[79]:OSF1:: )
	767	hp7??:OSF1:: \| hp8?[79]:OSF1::)
764	768	echo hppa1.1-hp-osf
765	769	exit ;;
766	770	hp8??:OSF1::)

768	772	exit ;;
769	773	i86:OSF1::*)
770	774	if [ -x /usr/sbin/sysversion ] ; then
771		echo ${UNAME_MACHINE}-unknown-osf1mk
	775	echo "$UNAME_MACHINE"-unknown-osf1mk
772	776	else
773		echo ${UNAME_MACHINE}-unknown-osf1
	777	echo "$UNAME_MACHINE"-unknown-osf1
774	778	fi
775	779	exit ;;
776	780	parisc:Lites::)

795	799	echo c4-convex-bsd
796	800	exit ;;
797	801	CRAYY-MP:::)
798		echo ymp-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	802	echo ymp-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
799	803	exit ;;
800	804	CRAY[A-Z]90:::)
801		echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
	805	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
802	806	\| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
803	807	-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
804	808	-e 's/\.[^.]*$/.X/'
805	809	exit ;;
806	810	CRAYTS:::)
807		echo t90-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	811	echo t90-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
808	812	exit ;;
809	813	CRAYT3E:::)
810		echo alphaev5-cray-unicosmk${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	814	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
811	815	exit ;;
812	816	CRAYSV1:::)
813		echo sv1-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	817	echo sv1-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
814	818	exit ;;
815	819	:UNICOS/mp::*)
816		echo craynv-cray-unicosmp${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	820	echo craynv-cray-unicosmp"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
817	821	exit ;;
818	822	F30[01]:UNIX_System_V:: \| F700:UNIX_System_V::)
819	823	FUJITSU_PROC=`uname -m \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
820	824	FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
821		FUJITSU_REL=`echo ${UNAME_RELEASE} \| sed -e 's/ /_/'`
	825	FUJITSU_REL=`echo "$UNAME_RELEASE" \| sed -e 's/ /_/'`
822	826	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
823	827	exit ;;
824	828	5000:UNIX_System_V:4.:)
825	829	FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
826		FUJITSU_REL=`echo ${UNAME_RELEASE} \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/ /_/'`
	830	FUJITSU_REL=`echo "$UNAME_RELEASE" \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/ /_/'`
827	831	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
828	832	exit ;;
829	833	i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::*)
830		echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
	834	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
831	835	exit ;;
832	836	sparc:BSD/OS::*)
833		echo sparc-unknown-bsdi${UNAME_RELEASE}
	837	echo sparc-unknown-bsdi"$UNAME_RELEASE"
834	838	exit ;;
835	839	:BSD/OS::*)
836		echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
	840	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
837	841	exit ;;
838	842	:FreeBSD::*)
839	843	UNAME_PROCESSOR=`/usr/bin/uname -p`
840		case ${UNAME_PROCESSOR} in
	844	case "$UNAME_PROCESSOR" in
841	845	amd64)
842	846	UNAME_PROCESSOR=x86_64 ;;
843	847	i386)
844	848	UNAME_PROCESSOR=i586 ;;
845	849	esac
846		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`
	850	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//'`"
847	851	exit ;;
848	852	i:CYGWIN:*)
849		echo ${UNAME_MACHINE}-pc-cygwin
	853	echo "$UNAME_MACHINE"-pc-cygwin
850	854	exit ;;
851	855	:MINGW64:*)
852		echo ${UNAME_MACHINE}-pc-mingw64
	856	echo "$UNAME_MACHINE"-pc-mingw64
853	857	exit ;;
854	858	:MINGW:*)
855		echo ${UNAME_MACHINE}-pc-mingw32
	859	echo "$UNAME_MACHINE"-pc-mingw32
856	860	exit ;;
857	861	:MSYS:*)
858		echo ${UNAME_MACHINE}-pc-msys
859		exit ;;
860		i:windows32:*)
861		# uname -m includes "-pc" on this system.
862		echo ${UNAME_MACHINE}-mingw32
	862	echo "$UNAME_MACHINE"-pc-msys
863	863	exit ;;
864	864	i:PW:*)
865		echo ${UNAME_MACHINE}-pc-pw32
	865	echo "$UNAME_MACHINE"-pc-pw32
866	866	exit ;;
867	867	:Interix:*)
868		case ${UNAME_MACHINE} in
	868	case "$UNAME_MACHINE" in
869	869	x86)
870		echo i586-pc-interix${UNAME_RELEASE}
	870	echo i586-pc-interix"$UNAME_RELEASE"
871	871	exit ;;
872	872	authenticamd \| genuineintel \| EM64T)
873		echo x86_64-unknown-interix${UNAME_RELEASE}
	873	echo x86_64-unknown-interix"$UNAME_RELEASE"
874	874	exit ;;
875	875	IA64)
876		echo ia64-unknown-interix${UNAME_RELEASE}
	876	echo ia64-unknown-interix"$UNAME_RELEASE"
877	877	exit ;;
878	878	esac ;;
879		[345]86:Windows_95:* \| [345]86:Windows_98:* \| [345]86:Windows_NT:*)
880		echo i${UNAME_MACHINE}-pc-mks
881		exit ;;
882		8664:Windows_NT:*)
883		echo x86_64-pc-mks
884		exit ;;
885		i:Windows_NT:* \| Pentium:Windows_NT:*)
886		# How do we know it's Interix rather than the generic POSIX subsystem?
887		# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
888		# UNAME_MACHINE based on the output of uname instead of i386?
889		echo i586-pc-interix
890		exit ;;
891	879	i:UWIN:*)
892		echo ${UNAME_MACHINE}-pc-uwin
	880	echo "$UNAME_MACHINE"-pc-uwin
893	881	exit ;;
894	882	amd64:CYGWIN::* \| x86_64:CYGWIN::*)
895	883	echo x86_64-unknown-cygwin
896	884	exit ;;
897		p:CYGWIN:*)
898		echo powerpcle-unknown-cygwin
899		exit ;;
900	885	prep:SunOS:5.:*)
901		echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	886	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
902	887	exit ;;
903	888	:GNU::*)
904	889	# the GNU system
905		echo `echo ${UNAME_MACHINE}\|sed -e 's,[-/].$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}\|sed -e 's,/.$,,'`
	890	echo "`echo "$UNAME_MACHINE"\|sed -e 's,[-/].$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"\|sed -e 's,/.$,,'`"
906	891	exit ;;
907	892	:GNU/::)
908	893	# other systems with GNU libc and userland
909		echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} \| sed 's,^[^/]/,,' \| tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}\|sed -e 's/[-(].//'`-${LIBC}
	894	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" \| sed 's,^[^/]/,,' \| tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"\|sed -e 's/[-(].//'`-$LIBC"
910	895	exit ;;
911	896	i86:Minix::*)
912		echo ${UNAME_MACHINE}-pc-minix
	897	echo "$UNAME_MACHINE"-pc-minix
913	898	exit ;;
914	899	aarch64:Linux::)
915		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	900	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
916	901	exit ;;
917	902	aarch64_be:Linux::)
918	903	UNAME_MACHINE=aarch64_be
919		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	904	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
920	905	exit ;;
921	906	alpha:Linux::)
922	907	case `sed -n '/^cpu model/s/^.: $.$/\1/p' < /proc/cpuinfo` in

930	915	esac
931	916	objdump --private-headers /bin/sh \| grep -q ld.so.1
932	917	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
933		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	918	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
934	919	exit ;;
935	920	arc:Linux:: \| arceb:Linux::)
936		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	921	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
937	922	exit ;;
938	923	arm:Linux::*)
939		eval $set_cc_for_build
	924	eval "$set_cc_for_build"
940	925	if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \
941	926	\| grep -q __ARM_EABI__
942	927	then
943		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	928	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
944	929	else
945	930	if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
946	931	\| grep -q __ARM_PCS_VFP
947	932	then
948		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
	933	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
949	934	else
950		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
	935	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
951	936	fi
952	937	fi
953	938	exit ;;
954	939	avr32:Linux::*)
955		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	940	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
956	941	exit ;;
957	942	cris:Linux::)
958		echo ${UNAME_MACHINE}-axis-linux-${LIBC}
	943	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
959	944	exit ;;
960	945	crisv32:Linux::)
961		echo ${UNAME_MACHINE}-axis-linux-${LIBC}
	946	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
962	947	exit ;;
963	948	e2k:Linux::)
964		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	949	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
965	950	exit ;;
966	951	frv:Linux::)
967		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	952	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
968	953	exit ;;
969	954	hexagon:Linux::)
970		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	955	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
971	956	exit ;;
972	957	i86:Linux::*)
973		echo ${UNAME_MACHINE}-pc-linux-${LIBC}
	958	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
974	959	exit ;;
975	960	ia64:Linux::)
976		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	961	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
977	962	exit ;;
978	963	k1om:Linux::)
979		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	964	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
980	965	exit ;;
981	966	m32r:Linux::*)
982		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	967	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
983	968	exit ;;
984	969	m68:Linux::*)
985		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	970	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
986	971	exit ;;
987	972	mips:Linux:: \| mips64:Linux::)
988		eval $set_cc_for_build
989		sed 's/^ //' << EOF >$dummy.c
	973	eval "$set_cc_for_build"
	974	sed 's/^ //' << EOF > "$dummy.c"
990	975	#undef CPU
991	976	#undef ${UNAME_MACHINE}
992	977	#undef ${UNAME_MACHINE}el

1000	985	#endif
1001	986	#endif
1002	987	EOF
1003		eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep '^CPU'`
1004		test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
	988	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^CPU'`"
	989	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
1005	990	;;
1006	991	mips64el:Linux::)
1007		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	992	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1008	993	exit ;;
1009	994	openrisc:Linux::*)
1010		echo or1k-unknown-linux-${LIBC}
	995	echo or1k-unknown-linux-"$LIBC"
1011	996	exit ;;
1012	997	or32:Linux:: \| or1k:Linux::*)
1013		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	998	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1014	999	exit ;;
1015	1000	padre:Linux::)
1016		echo sparc-unknown-linux-${LIBC}
	1001	echo sparc-unknown-linux-"$LIBC"
1017	1002	exit ;;
1018	1003	parisc64:Linux:: \| hppa64:Linux::)
1019		echo hppa64-unknown-linux-${LIBC}
	1004	echo hppa64-unknown-linux-"$LIBC"
1020	1005	exit ;;
1021	1006	parisc:Linux:: \| hppa:Linux::)
1022	1007	# Look for CPU level
1023	1008	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null \| cut -d' ' -f2` in
1024		PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
1025		PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
1026		*) echo hppa-unknown-linux-${LIBC} ;;
	1009	PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
	1010	PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
	1011	*) echo hppa-unknown-linux-"$LIBC" ;;
1027	1012	esac
1028	1013	exit ;;
1029	1014	ppc64:Linux::)
1030		echo powerpc64-unknown-linux-${LIBC}
	1015	echo powerpc64-unknown-linux-"$LIBC"
1031	1016	exit ;;
1032	1017	ppc:Linux::)
1033		echo powerpc-unknown-linux-${LIBC}
	1018	echo powerpc-unknown-linux-"$LIBC"
1034	1019	exit ;;
1035	1020	ppc64le:Linux::)
1036		echo powerpc64le-unknown-linux-${LIBC}
	1021	echo powerpc64le-unknown-linux-"$LIBC"
1037	1022	exit ;;
1038	1023	ppcle:Linux::)
1039		echo powerpcle-unknown-linux-${LIBC}
	1024	echo powerpcle-unknown-linux-"$LIBC"
1040	1025	exit ;;
1041	1026	riscv32:Linux:: \| riscv64:Linux::)
1042		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	1027	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1043	1028	exit ;;
1044	1029	s390:Linux:: \| s390x:Linux::)
1045		echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
	1030	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
1046	1031	exit ;;
1047	1032	sh64:Linux::*)
1048		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	1033	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1049	1034	exit ;;
1050	1035	sh:Linux::*)
1051		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	1036	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1052	1037	exit ;;
1053	1038	sparc:Linux:: \| sparc64:Linux::)
1054		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	1039	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1055	1040	exit ;;
1056	1041	tile:Linux::*)
1057		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	1042	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1058	1043	exit ;;
1059	1044	vax:Linux::)
1060		echo ${UNAME_MACHINE}-dec-linux-${LIBC}
	1045	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1061	1046	exit ;;
1062	1047	x86_64:Linux::)
1063		echo ${UNAME_MACHINE}-pc-linux-${LIBC}
	1048	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1064	1049	exit ;;
1065	1050	xtensa:Linux::*)
1066		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
	1051	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1067	1052	exit ;;
1068	1053	i86:DYNIX/ptx:4:*)
1069	1054	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.

1077	1062	# I am not positive that other SVR4 systems won't match this,
1078	1063	# I just have to hope. -- rms.
1079	1064	# Use sysv4.2uw... so that sysv4* matches it.
1080		echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
	1065	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
1081	1066	exit ;;
1082	1067	i86:OS/2::*)
1083	1068	# If we were able to find `uname', then EMX Unix compatibility
1084	1069	# is probably installed.
1085		echo ${UNAME_MACHINE}-pc-os2-emx
	1070	echo "$UNAME_MACHINE"-pc-os2-emx
1086	1071	exit ;;
1087	1072	i86:XTS-300::STOP)
1088		echo ${UNAME_MACHINE}-unknown-stop
	1073	echo "$UNAME_MACHINE"-unknown-stop
1089	1074	exit ;;
1090	1075	i86:atheos::*)
1091		echo ${UNAME_MACHINE}-unknown-atheos
	1076	echo "$UNAME_MACHINE"-unknown-atheos
1092	1077	exit ;;
1093	1078	i86:syllable::*)
1094		echo ${UNAME_MACHINE}-pc-syllable
	1079	echo "$UNAME_MACHINE"-pc-syllable
1095	1080	exit ;;
1096	1081	i86:LynxOS:2.:* \| i86:LynxOS:3.[01]:* \| i86:LynxOS:4.[02]:*)
1097		echo i386-unknown-lynxos${UNAME_RELEASE}
	1082	echo i386-unknown-lynxos"$UNAME_RELEASE"
1098	1083	exit ;;
1099	1084	i86:DOS::)
1100		echo ${UNAME_MACHINE}-pc-msdosdjgpp
1101		exit ;;
1102		i86::4.: \| i86:SYSTEM_V:4.:*)
1103		UNAME_REL=`echo ${UNAME_RELEASE} \| sed 's/\/MP$//'`
	1085	echo "$UNAME_MACHINE"-pc-msdosdjgpp
	1086	exit ;;
	1087	i86::4.:)
	1088	UNAME_REL=`echo "$UNAME_RELEASE" \| sed 's/\/MP$//'`
1104	1089	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1105		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
	1090	echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
1106	1091	else
1107		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
	1092	echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
1108	1093	fi
1109	1094	exit ;;
1110	1095	i86::5:[678]*)

1114	1099	*Pentium) UNAME_MACHINE=i586 ;;
1115	1100	Pent\|*Celeron) UNAME_MACHINE=i686 ;;
1116	1101	esac
1117		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	1102	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
1118	1103	exit ;;
1119	1104	i86::3.2:*)
1120	1105	if test -f /usr/options/cb.name; then
1121	1106	UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1122		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
	1107	echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
1123	1108	elif /bin/uname -X 2>/dev/null >/dev/null ; then
1124	1109	UNAME_REL=`(/bin/uname -X\|grep Release\|sed -e 's/.*= //')`
1125	1110	(/bin/uname -X\|grep i80486 >/dev/null) && UNAME_MACHINE=i486

1129	1114	&& UNAME_MACHINE=i686
1130	1115	(/bin/uname -X\|grep '^Machine.*Pentium Pro' >/dev/null) \
1131	1116	&& UNAME_MACHINE=i686
1132		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
	1117	echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
1133	1118	else
1134		echo ${UNAME_MACHINE}-pc-sysv32
	1119	echo "$UNAME_MACHINE"-pc-sysv32
1135	1120	fi
1136	1121	exit ;;
1137	1122	pc:::*)

1151	1136	exit ;;
1152	1137	i860::4.:*) # i860-SVR4
1153	1138	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1154		echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
	1139	echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
1155	1140	else # Add other i860-SVR4 vendors below as they are discovered.
1156		echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
	1141	echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
1157	1142	fi
1158	1143	exit ;;
1159	1144	mini:CTIX:SYS5:*)

1173	1158	test -r /etc/.relid \
1174	1159	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
1175	1160	/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
1176		&& { echo i486-ncr-sysv4.3${OS_REL}; exit; }
	1161	&& { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1177	1162	/bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \
1178		&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
	1163	&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1179	1164	3[34]??::4.0: \| 3[34]??,::4.0:*)
1180	1165	/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
1181	1166	&& { echo i486-ncr-sysv4; exit; } ;;

1184	1169	test -r /etc/.relid \
1185	1170	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
1186	1171	/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
1187		&& { echo i486-ncr-sysv4.3${OS_REL}; exit; }
	1172	&& { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1188	1173	/bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \
1189		&& { echo i586-ncr-sysv4.3${OS_REL}; exit; }
	1174	&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
1190	1175	/bin/uname -p 2>/dev/null \| /bin/grep pteron >/dev/null \
1191		&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
	1176	&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1192	1177	m68:LynxOS:2.:* \| m68:LynxOS:3.0:*)
1193		echo m68k-unknown-lynxos${UNAME_RELEASE}
	1178	echo m68k-unknown-lynxos"$UNAME_RELEASE"
1194	1179	exit ;;
1195	1180	mc68030:UNIX_System_V:4.:)
1196	1181	echo m68k-atari-sysv4
1197	1182	exit ;;
1198	1183	TSUNAMI:LynxOS:2.:)
1199		echo sparc-unknown-lynxos${UNAME_RELEASE}
	1184	echo sparc-unknown-lynxos"$UNAME_RELEASE"
1200	1185	exit ;;
1201	1186	rs6000:LynxOS:2.:)
1202		echo rs6000-unknown-lynxos${UNAME_RELEASE}
	1187	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
1203	1188	exit ;;
1204	1189	PowerPC:LynxOS:2.: \| PowerPC:LynxOS:3.[01]: \| PowerPC:LynxOS:4.[02]:)
1205		echo powerpc-unknown-lynxos${UNAME_RELEASE}
	1190	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
1206	1191	exit ;;
1207	1192	SM[BE]S:UNIX_SV::)
1208		echo mips-dde-sysv${UNAME_RELEASE}
	1193	echo mips-dde-sysv"$UNAME_RELEASE"
1209	1194	exit ;;
1210	1195	RM:ReliantUNIX-::)
1211	1196	echo mips-sni-sysv4

1216	1201	:SINIX-::)
1217	1202	if uname -p 2>/dev/null >/dev/null ; then
1218	1203	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1219		echo ${UNAME_MACHINE}-sni-sysv4
	1204	echo "$UNAME_MACHINE"-sni-sysv4
1220	1205	else
1221	1206	echo ns32k-sni-sysv
1222	1207	fi

1236	1221	exit ;;
1237	1222	i86:VOS::*)
1238	1223	# From Paul.Green@stratus.com.
1239		echo ${UNAME_MACHINE}-stratus-vos
	1224	echo "$UNAME_MACHINE"-stratus-vos
1240	1225	exit ;;
1241	1226	:VOS::*)
1242	1227	# From Paul.Green@stratus.com.
1243	1228	echo hppa1.1-stratus-vos
1244	1229	exit ;;
1245	1230	mc68:A/UX::*)
1246		echo m68k-apple-aux${UNAME_RELEASE}
	1231	echo m68k-apple-aux"$UNAME_RELEASE"
1247	1232	exit ;;
1248	1233	news:NEWS-OS:6:*)
1249	1234	echo mips-sony-newsos6
1250	1235	exit ;;
1251	1236	R[34]000:System_V:: \| R4000:UNIX_SYSV:: \| R000:UNIX_SV::*)
1252	1237	if [ -d /usr/nec ]; then
1253		echo mips-nec-sysv${UNAME_RELEASE}
	1238	echo mips-nec-sysv"$UNAME_RELEASE"
1254	1239	else
1255		echo mips-unknown-sysv${UNAME_RELEASE}
	1240	echo mips-unknown-sysv"$UNAME_RELEASE"
1256	1241	fi
1257	1242	exit ;;
1258	1243	BeBox:BeOS::) # BeOS running on hardware made by Be, PPC only.

1271	1256	echo x86_64-unknown-haiku
1272	1257	exit ;;
1273	1258	SX-4:SUPER-UX::)
1274		echo sx4-nec-superux${UNAME_RELEASE}
	1259	echo sx4-nec-superux"$UNAME_RELEASE"
1275	1260	exit ;;
1276	1261	SX-5:SUPER-UX::)
1277		echo sx5-nec-superux${UNAME_RELEASE}
	1262	echo sx5-nec-superux"$UNAME_RELEASE"
1278	1263	exit ;;
1279	1264	SX-6:SUPER-UX::)
1280		echo sx6-nec-superux${UNAME_RELEASE}
	1265	echo sx6-nec-superux"$UNAME_RELEASE"
1281	1266	exit ;;
1282	1267	SX-7:SUPER-UX::)
1283		echo sx7-nec-superux${UNAME_RELEASE}
	1268	echo sx7-nec-superux"$UNAME_RELEASE"
1284	1269	exit ;;
1285	1270	SX-8:SUPER-UX::)
1286		echo sx8-nec-superux${UNAME_RELEASE}
	1271	echo sx8-nec-superux"$UNAME_RELEASE"
1287	1272	exit ;;
1288	1273	SX-8R:SUPER-UX::)
1289		echo sx8r-nec-superux${UNAME_RELEASE}
	1274	echo sx8r-nec-superux"$UNAME_RELEASE"
1290	1275	exit ;;
1291	1276	SX-ACE:SUPER-UX::)
1292		echo sxace-nec-superux${UNAME_RELEASE}
	1277	echo sxace-nec-superux"$UNAME_RELEASE"
1293	1278	exit ;;
1294	1279	Power:Rhapsody::*)
1295		echo powerpc-apple-rhapsody${UNAME_RELEASE}
	1280	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
1296	1281	exit ;;
1297	1282	:Rhapsody::*)
1298		echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
	1283	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
1299	1284	exit ;;
1300	1285	:Darwin::*)
1301	1286	UNAME_PROCESSOR=`uname -p` \|\| UNAME_PROCESSOR=unknown
1302		eval $set_cc_for_build
	1287	eval "$set_cc_for_build"
1303	1288	if test "$UNAME_PROCESSOR" = unknown ; then
1304	1289	UNAME_PROCESSOR=powerpc
1305	1290	fi
1306		if test `echo "$UNAME_RELEASE" \| sed -e 's/\..*//'` -le 10 ; then
	1291	if test "`echo "$UNAME_RELEASE" \| sed -e 's/\..*//'`" -le 10 ; then
1307	1292	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1308	1293	if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') \| \
1309	1294	(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \

1331	1316	# that Apple uses in portable devices.
1332	1317	UNAME_PROCESSOR=x86_64
1333	1318	fi
1334		echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
	1319	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
1335	1320	exit ;;
1336	1321	:procnto:: \| :QNX:[0123456789]:*)
1337	1322	UNAME_PROCESSOR=`uname -p`

1339	1324	UNAME_PROCESSOR=i386
1340	1325	UNAME_MACHINE=pc
1341	1326	fi
1342		echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
	1327	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
1343	1328	exit ;;
1344	1329	:QNX::4*)
1345	1330	echo i386-pc-qnx
1346	1331	exit ;;
1347	1332	NEO-:NONSTOP_KERNEL::*)
1348		echo neo-tandem-nsk${UNAME_RELEASE}
	1333	echo neo-tandem-nsk"$UNAME_RELEASE"
1349	1334	exit ;;
1350	1335	NSE-:NONSTOP_KERNEL::*)
1351		echo nse-tandem-nsk${UNAME_RELEASE}
	1336	echo nse-tandem-nsk"$UNAME_RELEASE"
1352	1337	exit ;;
1353	1338	NSR-:NONSTOP_KERNEL::*)
1354		echo nsr-tandem-nsk${UNAME_RELEASE}
	1339	echo nsr-tandem-nsk"$UNAME_RELEASE"
	1340	exit ;;
	1341	NSV-:NONSTOP_KERNEL::*)
	1342	echo nsv-tandem-nsk"$UNAME_RELEASE"
1355	1343	exit ;;
1356	1344	NSX-:NONSTOP_KERNEL::*)
1357		echo nsx-tandem-nsk${UNAME_RELEASE}
	1345	echo nsx-tandem-nsk"$UNAME_RELEASE"
1358	1346	exit ;;
1359	1347	:NonStop-UX::*)
1360	1348	echo mips-compaq-nonstopux

1363	1351	echo bs2000-siemens-sysv
1364	1352	exit ;;
1365	1353	DS/:UNIX_System_V::*)
1366		echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
	1354	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
1367	1355	exit ;;
1368	1356	:Plan9::*)
1369	1357	# "uname -m" is not consistent, so use $cputype instead. 386

1374	1362	else
1375	1363	UNAME_MACHINE="$cputype"
1376	1364	fi
1377		echo ${UNAME_MACHINE}-unknown-plan9
	1365	echo "$UNAME_MACHINE"-unknown-plan9
1378	1366	exit ;;
1379	1367	:TOPS-10::*)
1380	1368	echo pdp10-unknown-tops10

1395	1383	echo pdp10-unknown-its
1396	1384	exit ;;
1397	1385	SEI:::SEIUX)
1398		echo mips-sei-seiux${UNAME_RELEASE}
	1386	echo mips-sei-seiux"$UNAME_RELEASE"
1399	1387	exit ;;
1400	1388	:DragonFly::*)
1401		echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`
	1389	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//'`"
1402	1390	exit ;;
1403	1391	:VMS::)
1404	1392	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1405		case "${UNAME_MACHINE}" in
	1393	case "$UNAME_MACHINE" in
1406	1394	A*) echo alpha-dec-vms ; exit ;;
1407	1395	I*) echo ia64-dec-vms ; exit ;;
1408	1396	V*) echo vax-dec-vms ; exit ;;

1411	1399	echo i386-pc-xenix
1412	1400	exit ;;
1413	1401	i86:skyos::*)
1414		echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} \| sed -e 's/ .*$//'`
	1402	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" \| sed -e 's/ .*$//'`"
1415	1403	exit ;;
1416	1404	i86:rdos::*)
1417		echo ${UNAME_MACHINE}-pc-rdos
	1405	echo "$UNAME_MACHINE"-pc-rdos
1418	1406	exit ;;
1419	1407	i86:AROS::*)
1420		echo ${UNAME_MACHINE}-pc-aros
	1408	echo "$UNAME_MACHINE"-pc-aros
1421	1409	exit ;;
1422	1410	x86_64:VMkernel::)
1423		echo ${UNAME_MACHINE}-unknown-esx
	1411	echo "$UNAME_MACHINE"-unknown-esx
1424	1412	exit ;;
1425	1413	amd64:Isilon\ OneFS::)
1426	1414	echo x86_64-unknown-onefs
1427	1415	exit ;;
1428	1416	esac
1429	1417
	1418	echo "$0: unable to guess system type" >&2
	1419
	1420	case "$UNAME_MACHINE:$UNAME_SYSTEM" in
	1421	mips:Linux \| mips64:Linux)
	1422	# If we got here on MIPS GNU/Linux, output extra information.
	1423	cat >&2 <<EOF
	1424
	1425	NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
	1426	the system type. Please install a C compiler and try again.
	1427	EOF
	1428	;;
	1429	esac
	1430
1430	1431	cat >&2 <<EOF
1431		$0: unable to guess system type
1432	1432
1433	1433	This script (version $timestamp), has failed to recognize the
1434	1434	operating system you are using. If your script is old, overwrite all
1435	1435	copies of config.guess and config.sub with the latest versions from:
1436	1436
1437		http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
	1437	https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1438	1438	and
1439		http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
	1439	https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1440	1440
1441	1441	If $0 has already been updated, send the following data and any
1442	1442	information you think might be pertinent to config-patches@gnu.org to

1459	1459	/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
1460	1460	/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1461	1461
1462		UNAME_MACHINE = ${UNAME_MACHINE}
1463		UNAME_RELEASE = ${UNAME_RELEASE}
1464		UNAME_SYSTEM = ${UNAME_SYSTEM}
1465		UNAME_VERSION = ${UNAME_VERSION}
	1462	UNAME_MACHINE = "$UNAME_MACHINE"
	1463	UNAME_RELEASE = "$UNAME_RELEASE"
	1464	UNAME_SYSTEM = "$UNAME_SYSTEM"
	1465	UNAME_VERSION = "$UNAME_VERSION"
1466	1466	EOF
1467	1467
1468	1468	exit 1
1469	1469
1470	1470	# Local variables:
1471		# eval: (add-hook 'write-file-hooks 'time-stamp)
	1471	# eval: (add-hook 'before-save-hook 'time-stamp)
1472	1472	# time-stamp-start: "timestamp='"
1473	1473	# time-stamp-format: "%:y-%02m-%02d"
1474	1474	# time-stamp-end: "'"

+161

-164

build-aux/config.sub less more

0		#!/bin/sh
	0	#! /bin/sh
1	1	# Configuration validation subroutine script.
2		# Copyright 1992-2017 Free Software Foundation, Inc.
3
4		timestamp='2017-04-02'
	2	# Copyright 1992-2018 Free Software Foundation, Inc.
	3
	4	timestamp='2018-05-05'
5	5
6	6	# This file is free software; you can redistribute it and/or modify it
7	7	# under the terms of the GNU General Public License as published by

14	14	# General Public License for more details.
15	15	#
16	16	# You should have received a copy of the GNU General Public License
17		# along with this program; if not, see <http://www.gnu.org/licenses/>.
	17	# along with this program; if not, see <https://www.gnu.org/licenses/>.
18	18	#
19	19	# As a special exception to the GNU General Public License, if you
20	20	# distribute this file as part of a program that contains a

32	32	# Otherwise, we print the canonical config type on stdout and succeed.
33	33
34	34	# You can get the latest version of this script from:
35		# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
	35	# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
36	36
37	37	# This file is supposed to be the same for all GNU packages
38	38	# and recognize all the CPU types, system types and aliases

56	56
57	57	Canonicalize a configuration name.
58	58
59		Operation modes:
	59	Options:
60	60	-h, --help print this help, then exit
61	61	-t, --time-stamp print date of last modification, then exit
62	62	-v, --version print version number, then exit

66	66	version="\
67	67	GNU config.sub ($timestamp)
68	68
69		Copyright 1992-2017 Free Software Foundation, Inc.
	69	Copyright 1992-2018 Free Software Foundation, Inc.
70	70
71	71	This is free software; see the source for copying conditions. There is NO
72	72	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

93	93
94	94	local)
95	95	# First pass through any local machine types.
96		echo $1
	96	echo "$1"
97	97	exit ;;
98	98
99	99	* )

109	109	exit 1;;
110	110	esac
111	111
112		# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
113		# Here we must recognize all the valid KERNEL-OS combinations.
114		maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`
115		case $maybe_os in
116		nto-qnx* \| linux-gnu* \| linux-android* \| linux-dietlibc \| linux-newlib* \| \
117		linux-musl* \| linux-uclibc* \| uclinux-uclibc* \| uclinux-gnu* \| kfreebsd-gnu \| \
118		knetbsd-gnu \| netbsd-gnu \| netbsd-eabi \| \
119		kopensolaris-gnu \| cloudabi-eabi \| \
120		storm-chaos* \| os2-emx* \| rtmk-nova*)
121		os=-$maybe_os
122		basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`
123		;;
124		android-linux)
125		os=-linux-android
126		basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`-unknown
127		;;
128		*)
129		basic_machine=`echo $1 \| sed 's/-[^-]*$//'`
130		if [ $basic_machine != $1 ]
131		then os=`echo $1 \| sed 's/.*-/-/'`
132		else os=; fi
133		;;
	112	# Spilt fields of configuration type
	113	IFS="-" read -r field1 field2 field3 field4 <<EOF
	114	$1
	115	EOF
	116
	117	# Separate into logical components for further validation
	118	case $1 in
	119	---)
	120	basic_machine=$field1-$field2
	121	os=-$field3-$field4
	122	;;
	123	--*)
	124	# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
	125	# parts
	126	maybe_os=$field2-$field3
	127	case $maybe_os in
	128	nto-qnx* \| linux-gnu* \| linux-android* \| linux-dietlibc \
	129	\| linux-newlib* \| linux-musl* \| linux-uclibc* \| uclinux-uclibc* \
	130	\| uclinux-gnu* \| kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \
	131	\| netbsd-eabi \| kopensolaris-gnu \| cloudabi-eabi \
	132	\| storm-chaos* \| os2-emx* \| rtmk-nova*)
	133	basic_machine=$field1
	134	os=-$maybe_os
	135	;;
	136	android-linux)
	137	basic_machine=$field1-unknown
	138	os=-linux-android
	139	;;
	140	*)
	141	basic_machine=$field1-$field2
	142	os=-$field3
	143	;;
	144	esac
	145	;;
	146	-)
	147	basic_machine=$field1
	148	os=-$field2
	149	;;
	150	*)
	151	basic_machine=$1
	152	os=
	153	;;
134	154	esac
135	155
136	156	### Let's recognize common machines as not being operating systems so

177	197	;;
178	198	-sco6)
179	199	os=-sco5v6
180		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	200	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
181	201	;;
182	202	-sco5)
183	203	os=-sco3.2v5
184		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	204	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
185	205	;;
186	206	-sco4)
187	207	os=-sco3.2v4
188		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	208	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
189	209	;;
190	210	-sco3.2.[4-9]*)
191	211	os=`echo $os \| sed -e 's/sco3.2./sco3.2v/'`
192		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	212	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
193	213	;;
194	214	-sco3.2v[4-9]*)
195	215	# Don't forget version if it is 3.2v4 or newer.
196		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	216	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
197	217	;;
198	218	-sco5v6*)
199	219	# Don't forget version if it is 3.2v4 or newer.
200		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	220	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
201	221	;;
202	222	-sco*)
203	223	os=-sco3.2v2
204		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	224	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
205	225	;;
206	226	-udk*)
207		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	227	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
208	228	;;
209	229	-isc)
210	230	os=-isc2.2
211		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	231	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
212	232	;;
213	233	-clix*)
214	234	basic_machine=clipper-intergraph
215	235	;;
216	236	-isc*)
217		basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	237	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
218	238	;;
219	239	-lynx*178)
220	240	os=-lynxos178

226	246	os=-lynxos
227	247	;;
228	248	-ptx*)
229		basic_machine=`echo $1 \| sed -e 's/86-.*/86-sequent/'`
230		;;
231		-windowsnt*)
232		os=`echo $os \| sed -e 's/windowsnt/winnt/'`
	249	basic_machine=`echo "$1" \| sed -e 's/86-.*/86-sequent/'`
233	250	;;
234	251	-psos*)
235	252	os=-psos

251	268	\| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \| alpha64pca5[67] \
252	269	\| am33_2.0 \
253	270	\| arc \| arceb \
254		\| arm \| arm[bl]e \| arme[lb] \| armv[2-8] \| armv[3-8][lb] \| armv7[arm] \
	271	\| arm \| arm[bl]e \| arme[lb] \| armv[2-8] \| armv[3-8][lb] \| armv6m \| armv[78][arm] \
255	272	\| avr \| avr32 \
256	273	\| ba \
257	274	\| be32 \| be64 \
258	275	\| bfin \
259		\| c4x \| c8051 \| clipper \
	276	\| c4x \| c8051 \| clipper \| csky \
260	277	\| d10v \| d30v \| dlx \| dsp16xx \
261	278	\| e2k \| epiphany \
262	279	\| fido \| fr30 \| frv \| ft32 \

295	312	\| mt \
296	313	\| msp430 \
297	314	\| nds32 \| nds32le \| nds32be \
	315	\| nfp \
298	316	\| nios \| nios2 \| nios2eb \| nios2el \
299	317	\| ns16k \| ns32k \
300	318	\| open8 \| or1k \| or1knd \| or32 \
301		\| pdp10 \| pdp11 \| pj \| pjl \
	319	\| pdp10 \| pj \| pjl \
302	320	\| powerpc \| powerpc64 \| powerpc64le \| powerpcle \
303	321	\| pru \
304	322	\| pyramid \

315	333	\| v850 \| v850e \| v850e1 \| v850e2 \| v850es \| v850e2v3 \
316	334	\| visium \
317	335	\| wasm32 \
318		\| we32k \
319	336	\| x86 \| xc16x \| xstormy16 \| xtensa \
320	337	\| z8k \| z80)
321	338	basic_machine=$basic_machine-unknown

336	353	basic_machine=$basic_machine-unknown
337	354	os=-none
338	355	;;
339		m88110 \| m680[12346]0 \| m683?2 \| m68360 \| m5200 \| v70 \| w65 \| z8k)
	356	m88110 \| m680[12346]0 \| m683?2 \| m68360 \| m5200 \| v70 \| w65)
	357	;;
	358	m9s12z \| m68hcs12z \| hcs12z \| s12z)
	359	basic_machine=s12z-unknown
	360	os=-none
340	361	;;
341	362	ms1)
342	363	basic_machine=mt-unknown

365	386	;;
366	387	# Object if more than one company name word.
367	388	--*)
368		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
	389	echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
369	390	exit 1
370	391	;;
371	392	# Recognize the basic CPU types with company name.

381	402	\| be32-* \| be64-* \
382	403	\| bfin-* \| bs2000-* \
383	404	\| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \
384		\| c8051-* \| clipper-* \| craynv-* \| cydra-* \
	405	\| c8051-* \| clipper-* \| craynv-* \| csky-* \| cydra-* \
385	406	\| d10v-* \| d30v-* \| dlx-* \
386	407	\| e2k-* \| elxsi-* \
387	408	\| f30[01]-* \| f700-* \| fido-* \| fr30-* \| frv-* \| fx80-* \

422	443	\| mt-* \
423	444	\| msp430-* \
424	445	\| nds32-* \| nds32le-* \| nds32be-* \
	446	\| nfp-* \
425	447	\| nios-* \| nios2-* \| nios2eb-* \| nios2el-* \
426	448	\| none-* \| np1-* \| ns16k-* \| ns32k-* \
427	449	\| open8-* \

460	482	# Recognize the various machine names and aliases which stand
461	483	# for a CPU type and a company and sometimes even an OS.
462	484	386bsd)
463		basic_machine=i386-unknown
	485	basic_machine=i386-pc
464	486	os=-bsd
465	487	;;
466	488	3b1 \| 7300 \| 7300-att \| att-7300 \| pc7300 \| safari \| unixpc)

494	516	basic_machine=x86_64-pc
495	517	;;
496	518	amd64-*)
497		basic_machine=x86_64-`echo $basic_machine \| sed 's/^[^-]*-//'`
	519	basic_machine=x86_64-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
498	520	;;
499	521	amdahl)
500	522	basic_machine=580-amdahl

539	561	os=-linux
540	562	;;
541	563	blackfin-*)
542		basic_machine=bfin-`echo $basic_machine \| sed 's/^[^-]*-//'`
	564	basic_machine=bfin-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
543	565	os=-linux
544	566	;;
545	567	bluegene*)

547	569	os=-cnk
548	570	;;
549	571	c54x-*)
550		basic_machine=tic54x-`echo $basic_machine \| sed 's/^[^-]*-//'`
	572	basic_machine=tic54x-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
551	573	;;
552	574	c55x-*)
553		basic_machine=tic55x-`echo $basic_machine \| sed 's/^[^-]*-//'`
	575	basic_machine=tic55x-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
554	576	;;
555	577	c6x-*)
556		basic_machine=tic6x-`echo $basic_machine \| sed 's/^[^-]*-//'`
	578	basic_machine=tic6x-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
557	579	;;
558	580	c90)
559	581	basic_machine=c90-cray

642	664	basic_machine=rs6000-bull
643	665	os=-bosx
644	666	;;
645		dpx2* \| dpx2*-bull)
	667	dpx2*)
646	668	basic_machine=m68k-bull
647	669	os=-sysv3
648	670	;;

651	673	os=$os"spe"
652	674	;;
653	675	e500v[12]-*)
654		basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]*-//'`
	676	basic_machine=powerpc-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
655	677	os=$os"spe"
656	678	;;
657	679	ebmon29k)

743	765	hp9k8[0-9][0-9] \| hp8[0-9][0-9])
744	766	basic_machine=hppa1.0-hp
745	767	;;
746		hppa-next)
747		os=-nextstep3
748		;;
749	768	hppaosf)
750	769	basic_machine=hppa1.1-hp
751	770	os=-osf

758	777	basic_machine=i370-ibm
759	778	;;
760	779	i*86v32)
761		basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	780	basic_machine=`echo "$1" \| sed -e 's/86.*/86-pc/'`
762	781	os=-sysv32
763	782	;;
764	783	i86v4)
765		basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	784	basic_machine=`echo "$1" \| sed -e 's/86.*/86-pc/'`
766	785	os=-sysv4
767	786	;;
768	787	i*86v)
769		basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	788	basic_machine=`echo "$1" \| sed -e 's/86.*/86-pc/'`
770	789	os=-sysv
771	790	;;
772	791	i*86sol2)
773		basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	792	basic_machine=`echo "$1" \| sed -e 's/86.*/86-pc/'`
774	793	os=-solaris2
775	794	;;
776	795	i386mach)
777	796	basic_machine=i386-mach
778	797	os=-mach
779	798	;;
780		i386-vsta \| vsta)
	799	vsta)
781	800	basic_machine=i386-unknown
782	801	os=-vsta
783	802	;;

796	815	os=-sysv
797	816	;;
798	817	leon-\|leon[3-9]-)
799		basic_machine=sparc-`echo $basic_machine \| sed 's/-.*//'`
	818	basic_machine=sparc-`echo "$basic_machine" \| sed 's/-.*//'`
800	819	;;
801	820	m68knommu)
802	821	basic_machine=m68k-unknown
803	822	os=-linux
804	823	;;
805	824	m68knommu-*)
806		basic_machine=m68k-`echo $basic_machine \| sed 's/^[^-]*-//'`
	825	basic_machine=m68k-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
807	826	os=-linux
808		;;
809		m88k-omron*)
810		basic_machine=m88k-omron
811	827	;;
812	828	magnum \| m3230)
813	829	basic_machine=mips-mips

840	856	os=-mint
841	857	;;
842	858	mips3-)
843		basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`
	859	basic_machine=`echo "$basic_machine" \| sed -e 's/mips3/mips64/'`
844	860	;;
845	861	mips3*)
846		basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`-unknown
	862	basic_machine=`echo "$basic_machine" \| sed -e 's/mips3/mips64/'`-unknown
847	863	;;
848	864	monitor)
849	865	basic_machine=m68k-rom68k

862	878	os=-msdos
863	879	;;
864	880	ms1-*)
865		basic_machine=`echo $basic_machine \| sed -e 's/ms1-/mt-/'`
	881	basic_machine=`echo "$basic_machine" \| sed -e 's/ms1-/mt-/'`
866	882	;;
867	883	msys)
868	884	basic_machine=i686-pc

904	920	basic_machine=v70-nec
905	921	os=-sysv
906	922	;;
907		next \| m*-next )
	923	next \| m*-next)
908	924	basic_machine=m68k-next
909	925	case $os in
910	926	-nextstep* )

949	965	nsr-tandem)
950	966	basic_machine=nsr-tandem
951	967	;;
	968	nsv-tandem)
	969	basic_machine=nsv-tandem
	970	;;
952	971	nsx-tandem)
953	972	basic_machine=nsx-tandem
954	973	;;

984	1003	os=-linux
985	1004	;;
986	1005	parisc-*)
987		basic_machine=hppa-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1006	basic_machine=hppa-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
988	1007	os=-linux
989	1008	;;
990	1009	pbd)

1000	1019	basic_machine=i386-pc
1001	1020	;;
1002	1021	pc98-*)
1003		basic_machine=i386-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1022	basic_machine=i386-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1004	1023	;;
1005	1024	pentium \| p5 \| k5 \| k6 \| nexgen \| viac3)
1006	1025	basic_machine=i586-pc

1015	1034	basic_machine=i786-pc
1016	1035	;;
1017	1036	pentium-* \| p5-* \| k5-* \| k6-* \| nexgen-* \| viac3-*)
1018		basic_machine=i586-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1037	basic_machine=i586-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1019	1038	;;
1020	1039	pentiumpro-* \| p6-* \| 6x86-* \| athlon-*)
1021		basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1040	basic_machine=i686-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1022	1041	;;
1023	1042	pentiumii-* \| pentium2-* \| pentiumiii-* \| pentium3-*)
1024		basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1043	basic_machine=i686-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1025	1044	;;
1026	1045	pentium4-*)
1027		basic_machine=i786-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1046	basic_machine=i786-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1028	1047	;;
1029	1048	pn)
1030	1049	basic_machine=pn-gould

1034	1053	ppc \| ppcbe) basic_machine=powerpc-unknown
1035	1054	;;
1036	1055	ppc-* \| ppcbe-*)
1037		basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1056	basic_machine=powerpc-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1038	1057	;;
1039	1058	ppcle \| powerpclittle)
1040	1059	basic_machine=powerpcle-unknown
1041	1060	;;
1042	1061	ppcle-* \| powerpclittle-*)
1043		basic_machine=powerpcle-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1062	basic_machine=powerpcle-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1044	1063	;;
1045	1064	ppc64) basic_machine=powerpc64-unknown
1046	1065	;;
1047		ppc64-* \| ppc64p7-) basic_machine=powerpc64-`echo $basic_machine \| sed 's/^[^-]-//'`
	1066	ppc64-) basic_machine=powerpc64-`echo "$basic_machine" \| sed 's/^[^-]-//'`
1048	1067	;;
1049	1068	ppc64le \| powerpc64little)
1050	1069	basic_machine=powerpc64le-unknown
1051	1070	;;
1052	1071	ppc64le-* \| powerpc64little-*)
1053		basic_machine=powerpc64le-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1072	basic_machine=powerpc64le-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1054	1073	;;
1055	1074	ps2)
1056	1075	basic_machine=i386-ibm

1104	1123	sequent)
1105	1124	basic_machine=i386-sequent
1106	1125	;;
1107		sh)
1108		basic_machine=sh-hitachi
1109		os=-hms
1110		;;
1111	1126	sh5el)
1112	1127	basic_machine=sh5le-unknown
1113	1128	;;
1114		sh64)
1115		basic_machine=sh64-unknown
1116		;;
1117		sparclite-wrs \| simso-wrs)
	1129	simso-wrs)
1118	1130	basic_machine=sparclite-wrs
1119	1131	os=-vxworks
1120	1132	;;

1133	1145	os=-sysv4
1134	1146	;;
1135	1147	strongarm-* \| thumb-*)
1136		basic_machine=arm-`echo $basic_machine \| sed 's/^[^-]*-//'`
	1148	basic_machine=arm-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1137	1149	;;
1138	1150	sun2)
1139	1151	basic_machine=m68000-sun

1247	1259	basic_machine=a29k-wrs
1248	1260	os=-vxworks
1249	1261	;;
1250		wasm32)
1251		basic_machine=wasm32-unknown
1252		;;
1253	1262	w65*)
1254	1263	basic_machine=w65-wdc
1255	1264	os=-none

1258	1267	basic_machine=hppa1.1-winbond
1259	1268	os=-proelf
1260	1269	;;
	1270	x64)
	1271	basic_machine=x86_64-pc
	1272	;;
1261	1273	xbox)
1262	1274	basic_machine=i686-pc
1263	1275	os=-mingw32

1266	1278	basic_machine=xps100-honeywell
1267	1279	;;
1268	1280	xscale-* \| xscalee[bl]-*)
1269		basic_machine=`echo $basic_machine \| sed 's/^xscale/arm/'`
	1281	basic_machine=`echo "$basic_machine" \| sed 's/^xscale/arm/'`
1270	1282	;;
1271	1283	ymp)
1272	1284	basic_machine=ymp-cray
1273	1285	os=-unicos
1274		;;
1275		z8k-*-coff)
1276		basic_machine=z8k-unknown
1277		os=-sim
1278		;;
1279		z80-*-coff)
1280		basic_machine=z80-unknown
1281		os=-sim
1282	1286	;;
1283	1287	none)
1284	1288	basic_machine=none-none

1308	1312	vax)
1309	1313	basic_machine=vax-dec
1310	1314	;;
1311		pdp10)
1312		# there are many clones, so DEC is not a safe bet
1313		basic_machine=pdp10-unknown
1314		;;
1315	1315	pdp11)
1316	1316	basic_machine=pdp11-dec
1317	1317	;;

1321	1321	sh[1234] \| sh[24]a \| sh[24]aeb \| sh[34]eb \| sh[1234]le \| sh[23]ele)
1322	1322	basic_machine=sh-unknown
1323	1323	;;
1324		sparc \| sparcv8 \| sparcv9 \| sparcv9b \| sparcv9v)
1325		basic_machine=sparc-sun
1326		;;
1327	1324	cydra)
1328	1325	basic_machine=cydra-cydrome
1329	1326	;;

1343	1340	# Make sure to match an already-canonicalized machine name.
1344	1341	;;
1345	1342	*)
1346		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
	1343	echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
1347	1344	exit 1
1348	1345	;;
1349	1346	esac

1351	1348	# Here we canonicalize certain aliases for manufacturers.
1352	1349	case $basic_machine in
1353	1350	-digital)
1354		basic_machine=`echo $basic_machine \| sed 's/digital.*/dec/'`
	1351	basic_machine=`echo "$basic_machine" \| sed 's/digital.*/dec/'`
1355	1352	;;
1356	1353	-commodore)
1357		basic_machine=`echo $basic_machine \| sed 's/commodore.*/cbm/'`
	1354	basic_machine=`echo "$basic_machine" \| sed 's/commodore.*/cbm/'`
1358	1355	;;
1359	1356	*)
1360	1357	;;

1362	1359
1363	1360	# Decode manufacturer-specific aliases for certain operating systems.
1364	1361
1365		if [ x"$os" != x"" ]
	1362	if [ x$os != x ]
1366	1363	then
1367	1364	case $os in
1368		# First match some system type aliases
1369		# that might get confused with valid system types.
	1365	# First match some system type aliases that might get confused
	1366	# with valid system types.
1370	1367	# -solaris* is a basic system type, with this one exception.
1371	1368	-auroraux)
1372	1369	os=-auroraux

1377	1374	-solaris)
1378	1375	os=-solaris2
1379	1376	;;
1380		-svr4*)
1381		os=-sysv4
1382		;;
1383	1377	-unixware*)
1384	1378	os=-sysv4.2uw
1385	1379	;;
1386	1380	-gnu/linux*)
1387	1381	os=`echo $os \| sed -e 's\|gnu/linux\|linux-gnu\|'`
1388	1382	;;
1389		# First accept the basic system types.
	1383	# es1800 is here to avoid being matched by es* (a different OS)
	1384	-es1800*)
	1385	os=-ose
	1386	;;
	1387	# Now accept the basic system types.
1390	1388	# The portable systems comes first.
1391		# Each alternative MUST END IN A *, to match a version number.
	1389	# Each alternative MUST end in a * to match a version number.
1392	1390	# -sysv* is not here because it comes later, after sysvr4.
1393	1391	-gnu* \| -bsd* \| -mach* \| -minix* \| -genix* \| -ultrix* \| -irix* \
1394	1392	\| -vms \| -sco* \| -esix* \| -isc* \| -aix* \| -cnk* \| -sunos \| -sunos[34]*\

1398	1396	\| -aos* \| -aros* \| -cloudabi* \| -sortix* \
1399	1397	\| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \
1400	1398	\| -clix* \| -riscos* \| -uniplus* \| -iris* \| -rtu* \| -xenix* \
1401		\| -hiux* \| -386bsd* \| -knetbsd* \| -mirbsd* \| -netbsd* \
	1399	\| -hiux* \| -knetbsd* \| -mirbsd* \| -netbsd* \
1402	1400	\| -bitrig* \| -openbsd* \| -solidbsd* \| -libertybsd* \
1403	1401	\| -ekkobsd* \| -kfreebsd* \| -freebsd* \| -riscix* \| -lynxos* \
1404	1402	\| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
1405	1403	\| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
1406		\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
	1404	\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \| -hcos* \
1407	1405	\| -chorusos* \| -chorusrdb* \| -cegcc* \| -glidix* \
1408	1406	\| -cygwin* \| -msys* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
1409	1407	\| -midipix* \| -mingw32* \| -mingw64* \| -linux-gnu* \| -linux-android* \
1410	1408	\| -linux-newlib* \| -linux-musl* \| -linux-uclibc* \
1411	1409	\| -uxpv* \| -beos* \| -mpeix* \| -udk* \| -moxiebox* \
1412		\| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \
	1410	\| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \
1413	1411	\| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \
1414	1412	\| -storm-chaos* \| -tops10* \| -tenex* \| -tops20* \| -its* \
1415	1413	\| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \
1416		\| -morphos* \| -superux* \| -rtmk* \| -rtmk-nova* \| -windiss* \
	1414	\| -morphos* \| -superux* \| -rtmk* \| -windiss* \
1417	1415	\| -powermax* \| -dnix* \| -nx6 \| -nx7 \| -sei* \| -dragonfly* \
1418	1416	\| -skyos* \| -haiku* \| -rdos* \| -toppers* \| -drops* \| -es* \
1419		\| -onefs* \| -tirtos* \| -phoenix* \| -fuchsia* \| -redox*)
	1417	\| -onefs* \| -tirtos* \| -phoenix* \| -fuchsia* \| -redox* \| -bme* \
	1418	\| -midnightbsd*)
1420	1419	# Remember, each alternative MUST END IN *, to match a version number.
1421	1420	;;
1422	1421	-qnx*)

1433	1432	-nto*)
1434	1433	os=`echo $os \| sed -e 's\|nto\|nto-qnx\|'`
1435	1434	;;
1436		-sim \| -es1800* \| -hms* \| -xray \| -os68k* \| -none* \| -v88r* \
1437		\| -windows* \| -osx \| -abug \| -netware* \| -os9* \| -beos* \| -haiku* \
	1435	-sim \| -xray \| -os68k* \| -v88r* \
	1436	\| -windows* \| -osx \| -abug \| -netware* \| -os9* \
1438	1437	\| -macos* \| -mpw* \| -magic* \| -mmixware* \| -mon960* \| -lnews*)
1439	1438	;;
1440	1439	-mac*)
1441		os=`echo $os \| sed -e 's\|mac\|macos\|'`
	1440	os=`echo "$os" \| sed -e 's\|mac\|macos\|'`
1442	1441	;;
1443	1442	-linux-dietlibc)
1444	1443	os=-linux-dietlibc

1447	1446	os=`echo $os \| sed -e 's\|linux\|linux-gnu\|'`
1448	1447	;;
1449	1448	-sunos5*)
1450		os=`echo $os \| sed -e 's\|sunos5\|solaris2\|'`
	1449	os=`echo "$os" \| sed -e 's\|sunos5\|solaris2\|'`
1451	1450	;;
1452	1451	-sunos6*)
1453		os=`echo $os \| sed -e 's\|sunos6\|solaris3\|'`
	1452	os=`echo "$os" \| sed -e 's\|sunos6\|solaris3\|'`
1454	1453	;;
1455	1454	-opened*)
1456	1455	os=-openedition

1461	1460	-wince*)
1462	1461	os=-wince
1463	1462	;;
1464		-osfrose*)
1465		os=-osfrose
1466		;;
1467		-osf*)
1468		os=-osf
1469		;;
1470	1463	-utek*)
1471	1464	os=-bsd
1472	1465	;;

1491	1484	-nova*)
1492	1485	os=-rtmk-nova
1493	1486	;;
1494		-ns2 )
	1487	-ns2)
1495	1488	os=-nextstep2
1496	1489	;;
1497	1490	-nsk*)

1513	1506	-oss*)
1514	1507	os=-sysv3
1515	1508	;;
1516		-svr4)
	1509	-svr4*)
1517	1510	os=-sysv4
1518	1511	;;
1519	1512	-svr3)

1528	1521	-ose*)
1529	1522	os=-ose
1