svn commit: r319327 - in head/devel/llvm: . files

[Brooks Davis]

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