diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2007-10-16 08:47:03 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2007-10-16 08:47:03 +0000 |
| commit | 87a61bf18bf6b69cdac40f08b82d7cda3a0613c9 (patch) | |
| tree | 174c6ca1fe40ae173a9e1f27a399d51d8baf6a3d /sys-freebsd | |
| parent | gcc-4 now defines __sparc64__ for us (diff) | |
| download | gentoo-2-87a61bf18bf6b69cdac40f08b82d7cda3a0613c9.tar.gz gentoo-2-87a61bf18bf6b69cdac40f08b82d7cda3a0613c9.tar.bz2 gentoo-2-87a61bf18bf6b69cdac40f08b82d7cda3a0613c9.zip | |
gcc-4 now defines __sparc64__ for us
(Portage version: 2.1.3.13)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/boot0/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/boot0/boot0-6.2.ebuild | 5 | ||||
| -rw-r--r-- | sys-freebsd/boot0/files/freebsd-sources-6.2-sparc64.patch | 33 |
3 files changed, 7 insertions, 37 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog index 17c89915e69a..60d0ad342ea1 100644 --- a/sys-freebsd/boot0/ChangeLog +++ b/sys-freebsd/boot0/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/boot0 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.20 2007/01/15 21:33:57 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.21 2007/10/16 08:47:02 uberlord Exp $ + + 16 Oct 2007; Roy Marples <uberlord@gentoo.org> + -files/freebsd-sources-6.2-sparc64.patch, boot0-6.2.ebuild: + gcc-4 now defines __sparc64__ for us *boot0-6.2 (15 Jan 2007) diff --git a/sys-freebsd/boot0/boot0-6.2.ebuild b/sys-freebsd/boot0/boot0-6.2.ebuild index 6e3510f462d7..fa235a015bb6 100644 --- a/sys-freebsd/boot0/boot0-6.2.ebuild +++ b/sys-freebsd/boot0/boot0-6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.2.ebuild,v 1.1 2007/01/15 21:33:57 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.2.ebuild,v 1.2 2007/10/16 08:47:02 uberlord Exp $ inherit bsdmk freebsd @@ -18,8 +18,7 @@ DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* S="${WORKDIR}/sys/boot" -PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch - ${FILESDIR}/freebsd-sources-6.2-sparc64.patch" +PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch" src_unpack() { freebsd_src_unpack diff --git a/sys-freebsd/boot0/files/freebsd-sources-6.2-sparc64.patch b/sys-freebsd/boot0/files/freebsd-sources-6.2-sparc64.patch deleted file mode 100644 index 7e10d0017eab..000000000000 --- a/sys-freebsd/boot0/files/freebsd-sources-6.2-sparc64.patch +++ /dev/null @@ -1,33 +0,0 @@ -FreeBSD only works on Sparc64 and freeBSD code relies on the __sparc64__ define. -gcc only defines __sparc64__ if -mcpu is not used. -gcc-4 defaults to using -mcpu=ultrasparc on FreeBSD. - -This causes us a problem. Infact, FreeBSD developers sent gcc a patch to always -define __sparc64__ when using -mcpu=ultrasparc, but this was rejected by most -people including NetBSD developers. - -The correct solution is to use __sparc__. -If platform detection is required, or the code is obviously 64 bit then we can -use the __arch64__ define as well. -This combination should be supported by all gcc versions:) - ---- ofw/libofw/ofw_net.c 2005-03-02 20:12:27 +0000 -+++ ofw/libofw/ofw_net.c 2006-10-11 08:10:48 +0100 -@@ -189,7 +189,7 @@ - if ((ch = index(path, ':')) != NULL) - *ch = '\0'; - netdev = OF_finddevice(path); --#ifdef __sparc64__ -+#if defined(__sparc__) - if (OF_getprop(netdev, "mac-address", desc->myea, 6) == -1) - #else - if (OF_getprop(netdev, "local-mac-address", desc->myea, 6) == -1) -@@ -207,7 +207,7 @@ - printf("ofwn_init: Open Firmware instance handle: %08x\n", netinstance); - #endif - --#ifndef __sparc64__ -+#ifndef __sparc__ - dmabuf = NULL; - if (OF_call_method("dma-alloc", netinstance, 1, 1, (64 * 1024), &dmabuf) - < 0) { |