Module Name:    src
Committed By:   martin
Date:           Mon Jul  3 09:39:39 UTC 2023

Modified Files:
        src/external/apache2/llvm/autoconf/include/llvm/Config [netbsd-10]:
            config.h.in
        src/tools/llvm-lib/libLLVMSupport [netbsd-10]: Makefile

Log Message:
Pull up following revision(s) (requested by hgutch in ticket #223):

        tools/llvm-lib/libLLVMSupport/Makefile: revision 1.2
        external/apache2/llvm/autoconf/include/llvm/Config/config.h.in: 
revision 1.3

Fix LLVM build with host gcc 13

Building LLVM with a host gcc 13 fails and suggests including <cstdint>
in external/apache2/llvm/dist/llvm/include/llvm/Support/Signals.h .

Instead of this, joerg@ suggested not modifying the llvm vendor branch
but instead working around this in our LLVM build infrastructure.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 \
    src/external/apache2/llvm/autoconf/include/llvm/Config/config.h.in
cvs rdiff -u -r1.1 -r1.1.56.1 src/tools/llvm-lib/libLLVMSupport/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/apache2/llvm/autoconf/include/llvm/Config/config.h.in
diff -u src/external/apache2/llvm/autoconf/include/llvm/Config/config.h.in:1.2 src/external/apache2/llvm/autoconf/include/llvm/Config/config.h.in:1.2.4.1
--- src/external/apache2/llvm/autoconf/include/llvm/Config/config.h.in:1.2	Sun May 30 01:56:46 2021
+++ src/external/apache2/llvm/autoconf/include/llvm/Config/config.h.in	Mon Jul  3 09:39:39 2023
@@ -3,6 +3,10 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#ifdef __cplusplus
+#include <cstdint>
+#endif
+
 /* Exported configuration */
 #include "llvm/Config/llvm-config.h"
 

Index: src/tools/llvm-lib/libLLVMSupport/Makefile
diff -u src/tools/llvm-lib/libLLVMSupport/Makefile:1.1 src/tools/llvm-lib/libLLVMSupport/Makefile:1.1.56.1
--- src/tools/llvm-lib/libLLVMSupport/Makefile:1.1	Sun Feb  6 01:14:16 2011
+++ src/tools/llvm-lib/libLLVMSupport/Makefile	Mon Jul  3 09:39:39 2023
@@ -1,3 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:16 joerg Exp $
+#	$NetBSD: Makefile,v 1.1.56.1 2023/07/03 09:39:39 martin Exp $
+
+CPPFLAGS.Signals.cpp+=	-include llvm/Config/config.h
 
 .include <bsd.init.mk>

Reply via email to