Add new files and remove deleted files from various Makefiles.

emaste · Feb 9, 2024 · fab14fd · fab14fd
1 parent 5d05e48
commit fab14fd
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 26 deletions.
diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
@@ -37,6 +37,7 @@ INCS+=		__stddef_wchar_t.h
 INCS+=		__stddef_wint_t.h
 INCS+=		__wmmintrin_aes.h
 INCS+=		__wmmintrin_pclmul.h
+INCS+=		adcintrin.h
 INCS+=		adxintrin.h
 INCS+=		altivec.h
 INCS+=		ammintrin.h

diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
@@ -429,6 +429,7 @@ SRCS_EXT+=	Format/FormatTokenLexer.cpp
 SRCS_EXT+=	Format/IntegerLiteralSeparatorFixer.cpp
 SRCS_EXT+=	Format/MacroCallReconstructor.cpp
 SRCS_EXT+=	Format/MacroExpander.cpp
+SRCS_EXT+=	Format/MatchFilePath.cpp
 SRCS_EXT+=	Format/NamespaceEndCommentsFixer.cpp
 SRCS_EXT+=	Format/ObjCPropertyAttributeOrderFixer.cpp
 SRCS_EXT+=	Format/QualifierAlignmentFixer.cpp
@@ -996,18 +997,6 @@ clang/Basic/DiagnosticIndexName.inc: \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 TGHDRS+=	clang/Basic/DiagnosticIndexName.inc
 
-clang/Basic/arm_fp16.inc: ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td
-	${CLANG_TBLGEN} -gen-arm-neon-sema \
-	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
-	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td
-TGHDRS+=	clang/Basic/arm_fp16.inc
-
-clang/Basic/arm_neon.inc: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
-	${CLANG_TBLGEN} -gen-arm-neon-sema \
-	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
-	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
-TGHDRS+=	clang/Basic/arm_neon.inc
-
 clang/Basic/arm_cde_builtin_aliases.inc: \
 	${CLANG_SRCS}/include/clang/Basic/arm_cde.td
 	${CLANG_TBLGEN} -gen-arm-cde-builtin-aliases \
@@ -1034,6 +1023,12 @@ clang/Basic/arm_cde_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_cde.td
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td
 TGHDRS+=	clang/Basic/arm_cde_builtins.inc
 
+clang/Basic/arm_fp16.inc: ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td
+	${CLANG_TBLGEN} -gen-arm-neon-sema \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td
+TGHDRS+=	clang/Basic/arm_fp16.inc
+
 clang/Basic/arm_mve_builtin_aliases.inc: \
 	${CLANG_SRCS}/include/clang/Basic/arm_mve.td
 	${CLANG_TBLGEN} -gen-arm-mve-builtin-aliases \
@@ -1060,52 +1055,79 @@ clang/Basic/arm_mve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_mve.td
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td
 TGHDRS+=	clang/Basic/arm_mve_builtins.inc
 
+clang/Basic/arm_neon.inc: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
+	${CLANG_TBLGEN} -gen-arm-neon-sema \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
+TGHDRS+=	clang/Basic/arm_neon.inc
+
 clang/Basic/arm_sme_builtin_cg.inc: \
 	${CLANG_SRCS}/include/clang/Basic/arm_sme.td
 	${CLANG_TBLGEN} -gen-arm-sme-builtin-codegen \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sme.td
 TGHDRS+=	clang/Basic/arm_sme_builtin_cg.inc
 
+clang/Basic/arm_sme_builtins.inc: \
+	${CLANG_SRCS}/include/clang/Basic/arm_sme.td
+	${CLANG_TBLGEN} -gen-arm-sme-builtins \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sme.td
+TGHDRS+=	clang/Basic/arm_sme_builtins.inc
+
+clang/Basic/arm_sme_builtins_za_state.inc: \
+	${CLANG_SRCS}/include/clang/Basic/arm_sme.td
+	${CLANG_TBLGEN} -gen-arm-sme-builtin-za-state \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sme.td
+TGHDRS+=	clang/Basic/arm_sme_builtins_za_state.inc
+
 clang/Basic/arm_sme_sema_rangechecks.inc: \
 	${CLANG_SRCS}/include/clang/Basic/arm_sme.td
 	${CLANG_TBLGEN} -gen-arm-sme-sema-rangechecks \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sme.td
 TGHDRS+=	clang/Basic/arm_sme_sema_rangechecks.inc
 
-clang/Basic/arm_sme_builtins.inc: \
+clang/Basic/arm_sme_streaming_attrs.inc: \
 	${CLANG_SRCS}/include/clang/Basic/arm_sme.td
-	${CLANG_TBLGEN} -gen-arm-sme-builtins \
+	${CLANG_TBLGEN} -gen-arm-sme-streaming-attrs \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sme.td
-TGHDRS+=	clang/Basic/arm_sme_builtins.inc
+TGHDRS+=	clang/Basic/arm_sme_streaming_attrs.inc
 
 clang/Basic/arm_sve_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td
 	${CLANG_TBLGEN} -gen-arm-sve-builtin-codegen \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td
 TGHDRS+=	clang/Basic/arm_sve_builtin_cg.inc
 
+clang/Basic/arm_sve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td
+	${CLANG_TBLGEN} -gen-arm-sve-builtins \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td
+TGHDRS+=	clang/Basic/arm_sve_builtins.inc
+
 clang/Basic/arm_sve_sema_rangechecks.inc: \
 	${CLANG_SRCS}/include/clang/Basic/arm_sve.td
 	${CLANG_TBLGEN} -gen-arm-sve-sema-rangechecks \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td
 TGHDRS+=	clang/Basic/arm_sve_sema_rangechecks.inc
 
-clang/Basic/arm_sve_typeflags.inc: \
+clang/Basic/arm_sve_streaming_attrs.inc: \
 	${CLANG_SRCS}/include/clang/Basic/arm_sve.td
-	${CLANG_TBLGEN} -gen-arm-sve-typeflags \
+	${CLANG_TBLGEN} -gen-arm-sve-streaming-attrs \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td
-TGHDRS+=	clang/Basic/arm_sve_typeflags.inc
+TGHDRS+=	clang/Basic/arm_sve_streaming_attrs.inc
 
-clang/Basic/arm_sve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td
-	${CLANG_TBLGEN} -gen-arm-sve-builtins \
+clang/Basic/arm_sve_typeflags.inc: \
+	${CLANG_SRCS}/include/clang/Basic/arm_sve.td
+	${CLANG_TBLGEN} -gen-arm-sve-typeflags \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td
-TGHDRS+=	clang/Basic/arm_sve_builtins.inc
+TGHDRS+=	clang/Basic/arm_sve_typeflags.inc
 
 clang/Basic/riscv_sifive_vector_builtin_cg.inc: \
 	${CLANG_SRCS}/include/clang/Basic/riscv_sifive_vector.td

diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
@@ -1209,6 +1209,7 @@ SRCS_FUL+=	Support/Z3Solver.cpp
 SRCS_MIN+=	Support/circular_raw_ostream.cpp
 SRCS_MIN+=	Support/raw_os_ostream.cpp
 SRCS_MIN+=	Support/raw_ostream.cpp
+SRCS_MIN+=	Support/raw_socket_stream.cpp
 SRCS_MIN+=	Support/regcomp.c
 SRCS_MIN+=	Support/regerror.c
 SRCS_MIN+=	Support/regexec.c
@@ -1674,16 +1675,19 @@ SRCS_MIN+=	TargetParser/Triple.cpp
 SRCS_MIN+=	TargetParser/X86TargetParser.cpp
 SRCS_MIW+=	TextAPI/Architecture.cpp
 SRCS_MIW+=	TextAPI/ArchitectureSet.cpp
+SRCS_MIW+=	TextAPI/BinaryReader/DylibReader.cpp
 SRCS_MIW+=	TextAPI/InterfaceFile.cpp
 SRCS_MIW+=	TextAPI/PackedVersion.cpp
 SRCS_MIW+=	TextAPI/Platform.cpp
+SRCS_MIW+=	TextAPI/RecordVisitor.cpp
 SRCS_MIW+=	TextAPI/Symbol.cpp
 SRCS_MIW+=	TextAPI/SymbolSet.cpp
 SRCS_MIW+=	TextAPI/Target.cpp
 SRCS_MIW+=	TextAPI/TextAPIError.cpp
 SRCS_MIW+=	TextAPI/TextStub.cpp
 SRCS_MIW+=	TextAPI/TextStubCommon.cpp
 SRCS_MIW+=	TextAPI/TextStubV5.cpp
+SRCS_MIW+=	TextAPI/Utils.cpp
 SRCS_MIN+=	ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
 SRCS_MIW+=	ToolDrivers/llvm-lib/LibDriver.cpp
 SRCS_MIN+=	Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp

diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile
@@ -64,6 +64,7 @@ SRCS+=		Support/WithColor.cpp
 SRCS+=		Support/YAMLParser.cpp
 SRCS+=		Support/circular_raw_ostream.cpp
 SRCS+=		Support/raw_ostream.cpp
+SRCS+=		Support/raw_socket_stream.cpp
 SRCS+=		Support/regcomp.c
 SRCS+=		Support/regerror.c
 SRCS+=		Support/regexec.c

diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
@@ -50,6 +50,7 @@ SRCS+=		new.cpp
 SRCS+=		new_handler.cpp
 SRCS+=		new_helpers.cpp
 SRCS+=		optional.cpp
+SRCS+=		ostream.cpp
 SRCS+=		print.cpp
 SRCS+=		random.cpp
 SRCS+=		random_shuffle.cpp
@@ -286,6 +287,7 @@ ALG_HEADERS+=	find_first_of.h
 ALG_HEADERS+=	find_if.h
 ALG_HEADERS+=	find_if_not.h
 ALG_HEADERS+=	find_segment_if.h
+ALG_HEADERS+=	fold.h
 ALG_HEADERS+=	for_each.h
 ALG_HEADERS+=	for_each_n.h
 ALG_HEADERS+=	for_each_segment.h
@@ -358,6 +360,7 @@ ALG_HEADERS+=	ranges_all_of.h
 ALG_HEADERS+=	ranges_any_of.h
 ALG_HEADERS+=	ranges_binary_search.h
 ALG_HEADERS+=	ranges_clamp.h
+ALG_HEADERS+=	ranges_contains.h
 ALG_HEADERS+=	ranges_copy.h
 ALG_HEADERS+=	ranges_copy_backward.h
 ALG_HEADERS+=	ranges_copy_if.h
@@ -1334,10 +1337,8 @@ EXP+=		${HDRDIR}/experimental/${hdr}
 
 INCSGROUPS+=	EXS
 EXSDIR=		${CXXINCLUDEDIR}/experimental/__simd
-EXS_HEADERS+=	abi_tag.h
 EXS_HEADERS+=	aligned_tag.h
 EXS_HEADERS+=	declaration.h
-EXS_HEADERS+=	internal_declaration.h
 EXS_HEADERS+=	reference.h
 EXS_HEADERS+=	scalar.h
 EXS_HEADERS+=	simd.h

diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc
@@ -148,9 +148,10 @@ SRCF+=		floatundixf
 .endif
 
 # __cpu_model support, only used on aarch64 and x86
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
-    ${MACHINE_CPUARCH} == "i386"
-SRCF+=		cpu_model
+.if ${MACHINE_CPUARCH} == "aarch64"
+SRCS+=		cpu_model/aarch64.c
+.elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+SRCS+=		cpu_model/x86.c
 .endif
 
 # The fp_mode implementation for amd64 and i386 is shared, while other

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -934,6 +934,7 @@ OLD_FILES+=usr/lib/clang/18/include/__stddef_wchar_t.h
 OLD_FILES+=usr/lib/clang/18/include/__stddef_wint_t.h
 OLD_FILES+=usr/lib/clang/18/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/18/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/18/include/adcintrin.h
 OLD_FILES+=usr/lib/clang/18/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/18/include/altivec.h
 OLD_FILES+=usr/lib/clang/18/include/ammintrin.h