From owner-svn-ports-all@FreeBSD.ORG Tue May 28 20:28:04 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D52E8586; Tue, 28 May 2013 20:28:04 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id ACD9A3CC; Tue, 28 May 2013 20:28:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4SKS4n5030771; Tue, 28 May 2013 20:28:04 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4SKS4lH030769; Tue, 28 May 2013 20:28:04 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201305282028.r4SKS4lH030769@svn.freebsd.org> From: Brooks Davis Date: Tue, 28 May 2013 20:28:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319327 - in head/devel/llvm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 May 2013 20:28:04 -0000 Author: brooks Date: Tue May 28 20:28:03 2013 New Revision: 319327 URL: http://svnweb.freebsd.org/changeset/ports/319327 Log: Work around build problems on some systems running HEAD. PR: ports/178910 Obtained from: pkgsrc Added: head/devel/llvm/files/patch-lib_Target_X86_X86JITInfo.cpp (contents, props changed) Modified: head/devel/llvm/Makefile Modified: head/devel/llvm/Makefile ============================================================================== --- head/devel/llvm/Makefile Tue May 28 19:53:05 2013 (r319326) +++ head/devel/llvm/Makefile Tue May 28 20:28:03 2013 (r319327) @@ -7,7 +7,7 @@ PORTNAME= llvm PORTVERSION= 3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src Added: head/devel/llvm/files/patch-lib_Target_X86_X86JITInfo.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm/files/patch-lib_Target_X86_X86JITInfo.cpp Tue May 28 20:28:03 2013 (r319327) @@ -0,0 +1,26 @@ +$NetBSD: patch-lib_Target_X86_X86JITInfo.cpp,v 1.1 2013/04/02 12:00:05 joerg Exp $ +$FreeBSD$ + +It is not yet decided whether extern "C" applies to static functions, so +be explicit for now. + +--- lib/Target/X86/X86JITInfo.cpp.orig 2013-04-01 12:16:22.000000000 +0000 ++++ lib/Target/X86/X86JITInfo.cpp +@@ -342,6 +342,17 @@ extern "C" { + /// must locate the start of the stub or call site and pass it into the JIT + /// compiler function. + extern "C" { ++ ++#if !(defined (X86_64_JIT) && defined(_MSC_VER)) ++ // the following function is called only from this translation unit, ++ // unless we are under 64bit Windows with MSC, where there is ++ // no support for inline assembly ++static ++#endif ++void LLVM_ATTRIBUTE_USED ++X86CompilationCallback2(intptr_t *StackPtr, intptr_t RetAddr) ++__asm__("X86CompilationCallback2"); ++ + #if !(defined (X86_64_JIT) && defined(_MSC_VER)) + // the following function is called only from this translation unit, + // unless we are under 64bit Windows with MSC, where there is