From 26474c4278f466e4945e01cba46e00d484d6ffc5 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Thu, 6 Feb 2025 01:24:55 +0000 Subject: [PATCH] [StrTable] Fix modules build and clean up stale files I missed a few places to tidy up from before using the tablengen files directly for the builtins. I didn't remove all of the modulemap entries and there were two small `.def` files left lingering. This should clean all of that up. I went through to cross check the list of files and it looks correct now. --- clang/include/clang/Basic/BuiltinsSME.def | 21 --------------------- clang/include/clang/Basic/BuiltinsSVE.def | 22 ---------------------- clang/include/module.modulemap | 4 ---- 3 files changed, 47 deletions(-) delete mode 100644 clang/include/clang/Basic/BuiltinsSME.def delete mode 100644 clang/include/clang/Basic/BuiltinsSVE.def diff --git a/clang/include/clang/Basic/BuiltinsSME.def b/clang/include/clang/Basic/BuiltinsSME.def deleted file mode 100644 index 180ee20295ccd..0000000000000 --- a/clang/include/clang/Basic/BuiltinsSME.def +++ /dev/null @@ -1,21 +0,0 @@ -//===--- BuiltinsSME.def - SME Builtin function database --------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// This file defines the SME-specific builtin function database. Users of -// this file must define the BUILTIN macro to make use of this information. -// -//===----------------------------------------------------------------------===// - -// The format of this database matches clang/Basic/Builtins.def. - -#define GET_SME_BUILTINS -#include "clang/Basic/arm_sme_builtins.inc" -#undef GET_SME_BUILTINS - -#undef BUILTIN -#undef TARGET_BUILTIN diff --git a/clang/include/clang/Basic/BuiltinsSVE.def b/clang/include/clang/Basic/BuiltinsSVE.def deleted file mode 100644 index a83f1c8f82dd0..0000000000000 --- a/clang/include/clang/Basic/BuiltinsSVE.def +++ /dev/null @@ -1,22 +0,0 @@ -//===--- BuiltinsSVE.def - SVE Builtin function database --------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// This file defines the SVE-specific builtin function database. Users of -// this file must define the BUILTIN macro to make use of this information. -// -//===----------------------------------------------------------------------===// - -// The format of this database matches clang/Basic/Builtins.def. - -#define GET_SVE_BUILTINS -#include "clang/Basic/arm_sve_builtins.inc" -#include "clang/Basic/BuiltinsAArch64NeonSVEBridge.def" -#undef GET_SVE_BUILTINS - -#undef BUILTIN -#undef TARGET_BUILTIN diff --git a/clang/include/module.modulemap b/clang/include/module.modulemap index e2bc941d3143a..4e2d22f13e054 100644 --- a/clang/include/module.modulemap +++ b/clang/include/module.modulemap @@ -49,11 +49,7 @@ module Clang_Basic { textual header "clang/Basic/BuiltinsLoongArchLASX.def" textual header "clang/Basic/BuiltinsLoongArchLSX.def" textual header "clang/Basic/BuiltinsMips.def" - textual header "clang/Basic/BuiltinsNEON.def" textual header "clang/Basic/BuiltinsPPC.def" - textual header "clang/Basic/BuiltinsRISCVVector.def" - textual header "clang/Basic/BuiltinsSME.def" - textual header "clang/Basic/BuiltinsSVE.def" textual header "clang/Basic/BuiltinsSystemZ.def" textual header "clang/Basic/BuiltinsVE.def" textual header "clang/Basic/BuiltinsVEVL.gen.def"