On 01/07/2011 22:13, Doug Barton wrote:
I've said before that I like to have the opportunity to pre-commit
review patches in this area because at minimum it helps me to be aware
of them for potential MFC purposes.
Thanks for the reminder Doug. Hope there's no hard feelings...
That said, I appreciate the help, especially with the more "exotic"
arches that I don't have experience with.
A few comments below.
me too...
On 01/06/2011 13:07, Warner Losh wrote:
Author: imp
Date: Thu Jan 6 21:07:51 2011
New Revision: 217071
URL: http://svn.freebsd.org/changeset/base/217071
Log:
Make this work on big endian MIPS, while not breaking it for small
endian mips. This will also make it work automatically on all future
big endian platforms.
Modified:
head/lib/bind/config.mk
Modified: head/lib/bind/config.mk
==============================================================================
--- head/lib/bind/config.mk Thu Jan 6 21:04:00 2011 (r217070)
+++ head/lib/bind/config.mk Thu Jan 6 21:07:51 2011 (r217071)
@@ -1,6 +1,7 @@
# $FreeBSD$
.include<bsd.own.mk>
+.include<bsd.endian.mk>
# BIND version number
.if defined(BIND_DIR)&& exists(${BIND_DIR}/version)
@@ -45,7 +46,7 @@ CFLAGS+= -DOPENSSL
CFLAGS+= -DUSE_MD5
# Endianness
-.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "sparc64"
+.if ${TARGET_ENDIANNESS} == 4321
CFLAGS+= -DWORDS_BIGENDIAN
.endif
This is just the kind of solution I was hoping would be available, and
exactly the kind I prefer, the no-maintenance kind. :) Is this safe
to MFC, or does it require bits that are only in HEAD atm? If the
latter, can you please let me know when it's ready to go? Thanks.
I think that bsd.endian.mk is -current only, but there's no reason it
can't be MFC'd. I'll merge it to 7 and 8 here in a few minutes and let
you know.
@@ -64,11 +65,7 @@ CFLAGS+= -I${LIB_BIND_DIR}
.endif
# Use the right version of the atomic.h file from lib/isc
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
-ISC_ATOMIC_ARCH= x86_32
-.else
-ISC_ATOMIC_ARCH= ${MACHINE_CPUARCH}
-.endif
+ISC_ATOMIC_ARCH=${MACHINE_CPUARCH:S/i386/x86_32/:S/amd64/x86_32/}
This change I am less enthusiastic about. It seems to me that it does
the exact same thing, but while admittedly quite a bit more clever
than I am capable of I find it less readable. Unless this is doing
something more or better than the previous code I will likely revert
this.
Damn. I missed that in my pre-commit review, or I'd have mentioned it
in the commit log. Feel free to revert it if you don't like it, or I'd
be happy to revert it if you wanted me to clean up my own mess.
Warner
Doug
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
