xserver-xorg-video-mga: Changes to 'debian-unstable'
.gitignore | 26
ChangeLog | 166
Makefile.am | 2
Makefile.in | 134
aclocal.m4 | 281 +
autogen.sh | 12
config.guess | 667 ++-
config.h.in | 9
config.sub | 230 +
configure | 1681 ++--------
configure.ac | 6
debian/changelog | 19
debian/control | 13
debian/patches/01_stupid_configure_error.diff | 13
debian/patches/04-Bug-2168-Fix-graphics-corruptions-with-Mystique-rev-2.diff | 27
debian/patches/series | 2
debian/rules | 4
debian/xsfbs/xsfbs.mk | 28
ltmain.sh | 12
man/Makefile.in | 96
mkinstalldirs | 89
src/Makefile.in | 124
src/mga.h | 3
src/mga_dacG.c | 29
src/mga_dh.c | 112
src/mga_dri.c | 6
src/mga_driver.c | 32
src/mga_exa.c | 3
src/mga_g450pll.c | 5
src/mga_map.h | 17
src/mga_merge.c | 27
src/mga_reg.h | 57
src/mga_storm.c | 46
util/Makefile.in | 113
34 files changed, 1960 insertions(+), 2131 deletions(-)
New commits:
commit 6a2ba7f8f757b08f2e7e9ddc6c46256e9ca14c5a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 23 06:23:00 2007 +0200
Delete obsolete file.
diff --git a/src/mga_map.h b/src/mga_map.h
deleted file mode 100644
index 323e2a9..0000000
--- a/src/mga_map.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_map.h,v 1.1 1997/03/06 23:16:01 hohndel Exp $ */
-
-#if !defined(UNIXCPP) || defined(ANSICPP)
-#define CATNAME(prefix,subname) prefix##subname
-#else
-#define CATNAME(prefix,subname) prefix/**/subname
-#endif
-
-#if PSZ == 8
-#define MGANAME(subname) CATNAME(Mga8,subname)
-#elif PSZ == 16
-#define MGANAME(subname) CATNAME(Mga16,subname)
-#elif PSZ == 24
-#define MGANAME(subname) CATNAME(Mga24,subname)
-#elif PSZ == 32
-#define MGANAME(subname) CATNAME(Mga32,subname)
-#endif
commit cba0002af6e623e44293f1ff7a0463bd83eba587
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 23 06:19:27 2007 +0200
Update and install the upstream changelog.
diff --git a/ChangeLog b/ChangeLog
index 907260c..5948747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,169 @@
+commit 876657e613de6d9dd906c95e05fc590a84d1c322
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Tue Dec 26 22:14:57 2006 +0100
+
+ Fixed a typo that caused MGAREG_C2OFFSET to be set to a bad value.
+
+ Unfortunately, this doesn't fix any bugs because afterwards,
+ the correct value would be stored in MGAREG_C2OFFSET anyway.
+
+commit 7d676a830a9b0c5593e144e15a14dc4aa6bc5ab7
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Tue Dec 26 19:45:18 2006 +0100
+
+ More boring janitoring work.
+
+commit 787284f420d324821ac31b43f3d915d58533a141
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Tue Dec 26 00:30:51 2006 +0100
+
+ Fixed a typo in a debug message.
+
+commit 373bf108414cebdaea8d3febc9120566ef5e4118
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Tue Dec 26 00:28:55 2006 +0100
+
+ Bug #9448: Actually write the C2STARTADD0 register.
+
+commit fd91b601ec4dd48cfb6ea5495b595fec6d932ab5
+Merge: f84b138... 0ce8f52...
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Dec 24 06:32:53 2006 +0200
+
+ Merge branch 'temp'
+
+commit 0ce8f522a207dd0fa21ebf41b82f6af930cd7e54
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Dec 24 06:24:56 2006 +0200
+
+ bump to 1.4.6.1 (respin)
+ No code changes, just built with a better util-macros.
+
+commit 74d21b74774c81d3d96ff3017763c25e3660dde0
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Dec 24 06:23:43 2006 +0200
+
+ bump to 1.4.6
+
+commit f84b13871114e6bb486402e00186a319df123f53
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Dec 24 06:23:19 2006 +0200
+
+ bump to 1.4.6.1
+
+commit 9b2e1381ccda8bb4f4d186c20d5672738adfc04b
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat Dec 16 01:44:49 2006 +0200
+
+ bump to 1.4.6
+
+commit 4bcfca9bcf4a2be8d49a700b1a0d529f4e5ea412
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Dec 10 14:33:10 2006 +0100
+
+ Replaced some more magic values with register names.
+
+commit 55d283a8c2347e809dadace3fb9a026bab6d57dd
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Dec 6 18:46:00 2006 +0200
+
+ Makefile.am: fix ChangeLog hook
+ Make ChangeLog hook safe for all situations I could think of, including
+ carrying the ChangeLog through for distcheck when objdir != srcdir. It's
+ significantly more ugly, but eh.
+
+commit fbbbb853041ae4af36eeffb24188b9a5513ba7d5
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sat Dec 2 12:42:34 2006 +0100
+
+ Removed a duplicated register definition.
+
+commit 447aae84d07cab34987ab08ead9319e176ccd904
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Fri Dec 1 20:19:13 2006 +0100
+
+ More janitoring work.
+
+ Moved the XPWRCTRL, XDISPCTRL and C2CTL register definitions
+ to mga_reg.h.
+ Cleaned up the DAC2 routing.
+
+commit 10b2202c254b71b8d0da987a225d5e78a030bca4
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Fri Dec 1 19:10:55 2006 +0100
+
+ Use the XORG_RELEASE_VERSION autoconf macro.
+
+commit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Nov 30 19:59:38 2006 +0200
+
+ bump to 1.4.5
+
+commit 5bbafd77678a2b0f82e820aa98337a014d284554
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Nov 26 18:06:12 2006 +0100
+
+ Made some XAA function static.
+
+commit 4778901bb13a950285c55ea6f058e94ee7b03652
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Nov 26 16:21:34 2006 +0100
+
+ Removed a duplicated register definition.
+
+commit f9d83ad601c8cba197e96f0b907f1dae6134953b
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Nov 26 16:17:12 2006 +0100
+
+ Replaced more magic values with register names.
+
+commit 6df85941ce077e1eee8b43945c51ab1b0906c758
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Nov 26 15:39:54 2006 +0100
+
+ Use register names in MGASaveScreenMerged() rather than magic numbers.
+
+commit b3ee69f6ac058e52d5175f611090baa76eed49f9
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Nov 26 15:24:46 2006 +0100
+
+ Register name tweak.
+
+ The "DAC power down" register powers down the DAC when it's
+ set to zero, and enables it when it's set to one.
+ To avoid confusion, I renamed it.
+
+commit 0f8c42fe75c6da9e7ea4aeb33b71778551c61528
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sat Nov 25 17:08:15 2006 +0100
+
+ Removed some unused defines from mga_reg.h.
+
+commit 334c7237078652722d7dec1c74812af46bfd7c67
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sat Nov 25 16:42:49 2006 +0100
+
+ Removed some duplicated register definitions.
+
+commit be88d58968c604624617f40820dc9a50a92661be
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun Nov 19 21:04:01 2006 +0100
+
+ Bug #2168: Fix graphics corruptions with Mystique rev 2.
+
+commit daeecb63567fb394654c9e66d64c3c53658f2c7d
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Fri Nov 17 23:08:25 2006 +0100
+
+ Enabled the Exa composite hooks on G550.
+
+commit d69607fe8b2dfb6c539dbf9f2b2996d04a4a838a
+Author: David Nusinow <dnusinow@debian.org>
+Date: Mon Nov 6 23:58:06 2006 -0500
+
+ Minor typofix that was causing configure to exit with a syntax error
+
commit 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Oct 27 11:53:40 2006 -0700
diff --git a/debian/changelog b/debian/changelog
index 1b277b8..c5ea043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-2) UNRELEASED; urgency=low
* Remove Fabio from uploaders, with his permission.
* Add XS-Vcs-*.
* Drop obsolete CVS information from the description.
+ * Install the upstream changelog.
- -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 06:11:04 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 06:19:03 +0200
xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index f3c0a2e..5a6d53a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
dh_link
dh_strip
commit 9171634a1a3a1bfb734553ac4cc54d92a1926276
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 23 06:13:27 2007 +0200
debian/control cleanup:
Remove Fabio from Uploaders, add XS-Vcs-*, remove obsolete CVS stuff.
diff --git a/debian/changelog b/debian/changelog
index 0fc8545..1b277b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-2) UNRELEASED; urgency=low
+
+ * Build package non-native.
+ * Remove Fabio from uploaders, with his permission.
+ * Add XS-Vcs-*.
+ * Drop obsolete CVS information from the description.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 06:11:04 +0200
+
xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-1) experimental; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 6dda459..fab4d1e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-mga
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, libdrm-dev (>> 2.0), x11proto-xf86dri-dev, quilt
Standards-Version: 3.7.2.0
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mga
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mga.git
Package: xserver-xorg-video-mga
Architecture: any
@@ -18,6 +20,3 @@ Description: X.Org X server -- MGA display driver
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'driver/xf86-video-mga' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver -> serverminver rename
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
.PHONY: serverabi
serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
else
commit 096fec7fb113b27ed7ca96e33f139bad9bd87cd3
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Mar 1 21:58:31 2007 -0500
Revert accidental commit of a debian/patches patch
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f786c8..17211bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,6 +54,7 @@ mga_drv_la_SOURCES = \
mga_reg.h \
mga_sarea.h \
mga_shadow.c \
+ mga_ucode.h \
mga_vga.c \
mga_video.c
commit 3a03805b817227d6763b7ecef50ecd3b7c44dfac
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:44:57 2007 -0500
Autoreconf
diff --git a/config.guess b/config.guess
index 2fc3acc..396482d 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2003-06-17'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@ timestamp='2003-06-17'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -53,7 +56,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -104,7 +107,7 @@ set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -136,13 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-## for Red Hat Linux
-if test -f /etc/redhat-release ; then
- VENDOR=redhat ;
-else
- VENDOR= ;
-fi
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -203,50 +199,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
@@ -284,42 +262,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -327,32 +312,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -361,10 +346,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -376,10 +361,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -390,37 +375,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -444,32 +432,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -485,29 +474,29 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -515,7 +504,7 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -530,14 +519,18 @@ EOF
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -551,28 +544,28 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -634,9 +627,19 @@ EOF
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -644,11 +647,11 @@ EOF
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -676,150 +679,179 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
Reply to: