[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. 56cf4907b889bb4bebd61ffa8c91be1b2c6be2fa

git at labs.omniti.com git at labs.omniti.com
Tue Apr 19 00:36:19 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Reconnoiter".

The branch, master has been updated
       via  56cf4907b889bb4bebd61ffa8c91be1b2c6be2fa (commit)
      from  7291ddf9550019c8f986d944636ba693b5c05b17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 56cf4907b889bb4bebd61ffa8c91be1b2c6be2fa
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Tue Apr 19 00:37:27 2011 -0400

    make this stuff compile and run on sparcv8plus and sparcv9

diff --git a/configure.in b/configure.in
index 20433df..85b396c 100755
--- a/configure.in
+++ b/configure.in
@@ -60,12 +60,22 @@ case $host in
 	DTRACEOBJ=dtrace_stub.o
 	AC_MSG_CHECKING([32 or 64 bit Solaris assembly])
 	if test -n "`echo $CFLAGS | grep m64`"; then
-		AC_MSG_RESULT([64])
 		DTRACEFLAGS=-64
-		ATOMIC_OBJS="noit_atomic_sol_x86_64.o"
+		if test -n "`isalist | grep sparc`"; then
+			AC_MSG_RESULT([sparc 64])
+			ATOMIC_OBJS="noit_atomic_sol_sparcv9.o"
+		else
+			AC_MSG_RESULT([intel 64])
+			ATOMIC_OBJS="noit_atomic_sol_x86_64.o"
+		fi
 	else
-		AC_MSG_RESULT([32])
-		ATOMIC_OBJS="noit_atomic_sol_x86_32.o"
+		if test -n "`isalist | grep sparc`"; then
+			AC_MSG_RESULT([sparc 32])
+			ATOMIC_OBJS="noit_atomic_sol_sparcv8plus.o"
+		else
+			AC_MSG_RESULT([intel 32])
+			ATOMIC_OBJS="noit_atomic_sol_x86_32.o"
+		fi
 	fi
 	if test "x$CC" != "xgcc" ; then
 		CFLAGS="$CFLAGS -mt"
@@ -375,7 +385,7 @@ int main(void){sem_t s;return (0 != sem_init(&s,0,0));}
 
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(ssetugid strlcpy strnstrn openpty inet_pton inet_ntop getopt \
-               poll)
+               poll vasprintf)
 
 # Checks for header files.
 AC_CHECK_HEADERS(sys/file.h sys/types.h dirent.h sys/param.h fcntl.h errno.h limits.h \
diff --git a/src/json-lib/printbuf.c b/src/json-lib/printbuf.c
index db6f2bc..469c363 100644
--- a/src/json-lib/printbuf.c
+++ b/src/json-lib/printbuf.c
@@ -62,7 +62,7 @@ int printbuf_memappend(struct printbuf *p, const char *buf, int size)
   return size;
 }
 
-#if NEEDS_VASPRINTF
+#ifndef HAVE_VASPRINTF
 /* CAW: compliant version of vasprintf */
 static int vasprintf(char **buf, const char *fmt, va_list ap)
 {
diff --git a/src/noit_config.h.in b/src/noit_config.h.in
index eefd6f8..4388301 100644
--- a/src/noit_config.h.in
+++ b/src/noit_config.h.in
@@ -123,6 +123,7 @@
 #undef HAVE_INET_NTOP
 #undef HAVE_GETOPT
 #undef HAVE_POLL
+#undef HAVE_VASPRINTF
 
 /* Kernel kqueue() support */
 #undef HAVE_KQUEUE
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index 4698e15..f908c8d 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -32,6 +32,14 @@ libnoit_utils.a:	$(OBJS) @DTRACEOBJ@
 	@echo "- archiving $@"
 	@$(RANLIB) $@
 
+noit_atomic_sol_sparcv8plus.o:	noit_atomic_sol.s
+	@as -P -xarch=v8plus -o $@ noit_atomic_sol.s
+	@echo "- assembling $@"
+
+noit_atomic_sol_sparcv9.o:	noit_atomic_sol.s
+	@as -P -xarch=v9 -o $@ noit_atomic_sol.s
+	@echo "- assembling $@"
+
 noit_atomic_sol_x86_32.o:	noit_atomic_sol.s
 	@as -P -o $@ noit_atomic_sol.s
 	@echo "- assembling $@"

-----------------------------------------------------------------------

Summary of changes:
 configure.in            |   20 +++++++++++++++-----
 src/json-lib/printbuf.c |    2 +-
 src/noit_config.h.in    |    1 +
 src/utils/Makefile.in   |    8 ++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list