From owner-p4-projects@FreeBSD.ORG  Tue May 27 14:39:44 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A3FB37B404; Tue, 27 May 2003 14:39:43 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 42FA737B401
	for <perforce@freebsd.org>; Tue, 27 May 2003 14:39:43 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DF32743FBD
	for <perforce@freebsd.org>; Tue, 27 May 2003 14:39:42 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4RLdg0U051614
	for <perforce@freebsd.org>; Tue, 27 May 2003 14:39:42 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4RLdg01051611
	for perforce@freebsd.org; Tue, 27 May 2003 14:39:42 -0700 (PDT)
Date: Tue, 27 May 2003 14:39:42 -0700 (PDT)
Message-Id: <200305272139.h4RLdg01051611@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31942 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2003 21:39:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=31942

Change 31942 by peter@peter_hammer on 2003/05/27 14:39:24

	make libstand build in 32 bit mode for amd64.

Affected files ...

.. //depot/projects/hammer/lib/libstand/Makefile#4 edit

Differences ...

==== //depot/projects/hammer/lib/libstand/Makefile#4 (text+ko) ====

@@ -24,6 +24,10 @@
 .if ${MACHINE_ARCH} == "powerpc"
 CFLAGS+=	-msoft-float
 .endif
+.if ${MACHINE_ARCH} == "amd64"
+CFLAGS+=	-m32
+LDFLAGS+=	-m elf_i386_fbsd
+.endif
 
 # standalone components and stuff we have modified locally
 SRCS+=	zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \
@@ -34,13 +38,17 @@
 SRCS+=	strcasecmp.c
 
 # byte order functions from libc
+.if ${MACHINE_ARCH} != "amd64"
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net
+.else
+.PATH: ${.CURDIR}/../libc/i386/net
+.endif
 SRCS+= htons.S ntohs.S htonl.S ntohl.S
 
 # string functions from libc
 .PATH:	${.CURDIR}/../libc/string
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "sparc64"
+	${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64"
 SRCS+=	bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
         memcpy.c memmove.c memset.c qdivrem.c rindex.c strcat.c strchr.c \
         strcmp.c strcpy.c strcspn.c strlen.c strncat.c strncmp.c strncpy.c \
@@ -107,7 +115,11 @@
 .endif
 
 # _setjmp/_longjmp
+.if ${MACHINE_ARCH} == "amd64"
+.PATH:	${.CURDIR}/i386
+.else
 .PATH:	${.CURDIR}/${MACHINE_ARCH}
+.endif
 SRCS+=	_setjmp.S
 
 # decompression functionality from libbz2
@@ -169,3 +181,12 @@
 SRCS+=	splitfs.c
 
 .include <bsd.lib.mk>
+
+.if ${MACHINE_ARCH} == "amd64"
+${SRCS:M*.c:R:S/$/.o/g}:	machine
+
+beforedepend:	machine
+
+machine:
+	ln -s ${.CURDIR}/../../sys/i386/include machine
+.endif