Module Name:    src
Committed By:   joerg
Date:           Wed Mar 18 17:43:20 UTC 2015

Modified Files:
        src/external/bsd/llvm: Makefile.inc
        src/external/bsd/llvm/lib/libLLVMExecutionEngine: Makefile
        src/external/bsd/llvm/lib/libLLVMRuntimeDyld: Makefile

Log Message:
Update build glue for LLVM/Clang r232565.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
    src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile
cvs rdiff -u -r1.6 -r1.7 \
    src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.77 src/external/bsd/llvm/Makefile.inc:1.78
--- src/external/bsd/llvm/Makefile.inc:1.77	Thu Jan 29 23:14:48 2015
+++ src/external/bsd/llvm/Makefile.inc	Wed Mar 18 17:43:20 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.77 2015/01/29 23:14:48 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.78 2015/03/18 17:43:20 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -8,7 +8,7 @@ LLVM_TOPLEVEL_MK=
 SVN_ROOT=		http://llvm.org/svn/llvm-project
 SVN_BRANCH=		branches/release_36
 
-COMMON_REVISION=	227398
+COMMON_REVISION=	232565
 CLANG_REVISION=		${COMMON_REVISION}
 LLD_REVISION=		${COMMON_REVISION}
 LLDB_REVISION=		${COMMON_REVISION}
@@ -49,10 +49,10 @@ CLANG_INCLUDE_CONFIG=	${LLVM_TOPLEVEL}/c
 MCLINKER_INCLUDE_CONFIG= ${LLVM_TOPLEVEL}/config/mclinker
 LLVM_INCLUDE_OBJDIR!=	cd ${LLVM_TOPLEVEL}/include && ${PRINTOBJDIR}
 
-CPPFLAGS+=	-std=c++11
 .if ${MKLLDB:Uno} == "yes"
 CPPFLAGS+=	-DLLDB_DISABLE_PYTHON
 .endif
+CXXFLAGS+=	-std=c++11
 CXXFLAGS+=	-fno-rtti -fno-exceptions
 CXXFLAGS+=	-ffunction-sections -fdata-sections
 LDFLAGS+=	-Wl,--gc-sections

Index: src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile:1.4 src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile:1.5
--- src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile:1.4	Thu Jan 29 20:41:35 2015
+++ src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile	Wed Mar 18 17:43:20 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2015/01/29 20:41:35 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2015/03/18 17:43:20 joerg Exp $
 
 LIB=	LLVMExecutionEngine
 
@@ -9,7 +9,6 @@ LIB=	LLVMExecutionEngine
 SRCS+=	GDBRegistrationListener.cpp \
 	ExecutionEngine.cpp \
 	ExecutionEngineBindings.cpp \
-	RTDyldMemoryManager.cpp \
 	TargetSelect.cpp
 
 .include <bsd.lib.mk>

Index: src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.6 src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.7
--- src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.6	Thu Jan 29 20:41:36 2015
+++ src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile	Wed Mar 18 17:43:20 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2015/01/29 20:41:36 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2015/03/18 17:43:20 joerg Exp $
 
 LIB=	LLVMRuntimeDyld
 
@@ -6,7 +6,8 @@ LIB=	LLVMRuntimeDyld
 
 .PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/RuntimeDyld
 
-SRCS+=	RuntimeDyld.cpp \
+SRCS+=	RTDyldMemoryManager.cpp \
+	RuntimeDyld.cpp \
 	RuntimeDyldChecker.cpp \
 	RuntimeDyldELF.cpp \
 	RuntimeDyldMachO.cpp

Reply via email to