From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 18:03:13 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9020C106564A;
	Thu,  4 Jun 2009 18:03:13 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F5958FC13;
	Thu,  4 Jun 2009 18:03:13 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54I3Dbx099516;
	Thu, 4 Jun 2009 18:03:13 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54I3DCG099513;
	Thu, 4 Jun 2009 18:03:13 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906041803.n54I3DCG099513@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Thu, 4 Jun 2009 18:03:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193446 - in projects/clangbsd:
	crypto/openssl/crypto/rc5 secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jun 2009 18:03:13 -0000

Author: ed
Date: Thu Jun  4 18:03:13 2009
New Revision: 193446
URL: http://svn.freebsd.org/changeset/base/193446

Log:
  Allow us to build libcrypto with Clang.

Modified:
  projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h
  projects/clangbsd/secure/lib/libcrypto/Makefile
  projects/clangbsd/secure/lib/libcrypto/Makefile.inc

Modified: projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h
==============================================================================
--- projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h	Thu Jun  4 18:03:03 2009	(r193445)
+++ projects/clangbsd/crypto/openssl/crypto/rc5/rc5.h	Thu Jun  4 18:03:13 2009	(r193446)
@@ -73,7 +73,11 @@ extern "C" {
 #define RC5_DECRYPT	0
 
 /* 32 bit.  For Alpha, things may get weird */
+#ifdef __amd64__
+#define RC5_32_INT unsigned int
+#else
 #define RC5_32_INT unsigned long
+#endif
 
 #define RC5_32_BLOCK		8
 #define RC5_32_KEY_LENGTH	16 /* This is a default, max is 255 */

Modified: projects/clangbsd/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/clangbsd/secure/lib/libcrypto/Makefile	Thu Jun  4 18:03:03 2009	(r193445)
+++ projects/clangbsd/secure/lib/libcrypto/Makefile	Thu Jun  4 18:03:13 2009	(r193446)
@@ -3,12 +3,11 @@
 SHLIBDIR?=	/lib
 SUBDIR=		engines
 
+.include <bsd.own.mk>
+
 LIB=		crypto
 SHLIB_MAJOR=	5
 
-# XXX: LLVM PR3678
-CFLAGS+=	-DOPENSSL_NO_INLINE_ASM
-
 NO_LINT=
 
 .if exists(Makefile.man)

Modified: projects/clangbsd/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- projects/clangbsd/secure/lib/libcrypto/Makefile.inc	Thu Jun  4 18:03:03 2009	(r193445)
+++ projects/clangbsd/secure/lib/libcrypto/Makefile.inc	Thu Jun  4 18:03:13 2009	(r193446)
@@ -14,7 +14,7 @@ CFLAGS+=	-DOPENSSL_NO_IDEA
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-CFLAGS+= -DL_ENDIAN
+CFLAGS+= -DL_ENDIAN -DMD32_REG_T=int
 .endif
 
 MANDIR=	${SHAREDIR}/openssl/man/man