diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-05-04 04:14:58 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-05-04 04:14:58 +0000 |
| commit | d5739efd2c266081ed6b844767dcdd0a3331bfd3 (patch) | |
| tree | 074c8c34ba9d24a8d2ea8b25aeed5db1c35a6bb7 | |
| parent | 6700847458427cbdbaf837ab06bfea9b80d92df2 (diff) | |
Port X.Org to FreeBSD/powerpc. This makes a bit of math for sysmouse in
mouse.c explicitly signed, avoiding the need for -fsigned-chars. (Peter
Grehan, grehan at FreeBSD dot org)
| -rw-r--r-- | hw/xfree86/common/compiler.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/loader/loader.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index aca769722..b7d813329 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1074,7 +1074,7 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset, # define write_mem_barrier() /* NOP */ # endif /* __arm32__ */ -# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__powerpc__) +# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__) # ifndef MAP_FAILED # define MAP_FAILED ((void *)-1) diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 7bae32159..8703e48db 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -552,8 +552,8 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label) FatalError("\n_LoaderFileToMem() read() failed: %s\n", strerror(errno)); -# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__)) \ - && defined(__powerpc__) +# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) \ + || defined(__FreeBSD__)) && defined(__powerpc__) /* * Keep the instruction cache in sync with changes in the * main memory. diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 4359a0856..002eecb35 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -284,7 +284,7 @@ # define ARCH_PCI_INIT linuxPciInit # define INCLUDE_XF86_MAP_PCI_MEM # define INCLUDE_XF86_NO_DOMAIN /* Needs kernel work to remove */ -# elif defined(__OpenBSD__) +# elif defined(__FreeBSD__) || defined(__OpenBSD__) # define ARCH_PCI_INIT freebsdPciInit # define INCLUDE_XF86_MAP_PCI_MEM # define INCLUDE_XF86_NO_DOMAIN |