diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-06-03 10:48:37 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2006-06-03 10:48:37 +0000 |
| commit | 8e8c6faecddbe014d8760822e1f705b43a00fa33 (patch) | |
| tree | 310d751c8e59ed46894a77f9503758383db9ccec | |
| parent | 5b703f847d166176920077c1e6ba1d9559fc8481 (diff) | |
Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 2 |
3 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2006-06-03 Daniel Stone <daniel@freedesktop.org> + + * configure.ac: + * hw/xfree86/os-support/bus/Pci.h: + Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno) + 2006-06-01 Adam Jackson <ajax@freedesktop.org> * hw/xfree86/common/xf86Init.c: diff --git a/configure.ac b/configure.ac index d65b176fd..cfbc7a170 100644 --- a/configure.ac +++ b/configure.ac @@ -248,7 +248,10 @@ KDRIVE_HW=no dnl it would be nice to autodetect these *CONS_SUPPORTs case $host_os in *freebsd*) - AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) + case $host_os in + kfreebsd*-gnu) ;; + *) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;; + esac AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console]) AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console]) @@ -1056,7 +1059,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then ;; esac ;; - freebsd*) + freebsd* | kfreebsd*-gnu) XORG_OS="freebsd" XORG_OS_SUBDIR="bsd" XORG_OS_KBD="BSD" @@ -1156,7 +1159,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then ;; powerpc*) case $host_os in - linux*|freebsd*|netbsd*|openbsd*) + linux*|freebsd*|netbsd*|openbsd*|kfreebsd*-gnu) ;; *) xorg_bus_ppcpci="yes" @@ -1169,7 +1172,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then ;; x86_64*|amd64*) case $host_os in - freebsd*) + freebsd*|kfreebsd*-gnu) # FreeBSD uses the system pci interface ;; *) @@ -1509,7 +1512,7 @@ case $host_os in cygwin*) ;; solaris*) ;; darwin*) ;; - *bsd*) ;; + freebsd*|netbsd*|openbsd*) ;; *) AC_DEFINE(_POSIX_SOURCE, 1, [POSIX-compliant source]) AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source]) diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 32088fe4f..80e5fdb05 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -332,7 +332,7 @@ # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge # endif #elif defined(__amd64__) || defined(__amd64) -# if defined(__FreeBSD__) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # define ARCH_PCI_INIT freebsdPciInit # else # define ARCH_PCI_INIT ix86PciInit |