From: Chris Lattner Date: Sun, 14 Jun 2009 01:05:48 +0000 (+0000) Subject: move the various builtins stuff from libast to libbasic. This X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b15cdc1312f8fc45c86ee75e2a85106700e97f6;p=clang move the various builtins stuff from libast to libbasic. This fixes a layering violation in lib/Basic/Targets.cpp. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@73318 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj index b9b966eb57..73ef1beeca 100644 --- a/clang.xcodeproj/project.pbxproj +++ b/clang.xcodeproj/project.pbxproj @@ -138,6 +138,7 @@ DE3461270AFE68BE00DBC861 /* MinimalAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE3461260AFE68BE00DBC861 /* MinimalAction.cpp */; }; DE34621D0AFEB19B00DBC861 /* StmtPrinter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE34621C0AFEB19B00DBC861 /* StmtPrinter.cpp */; }; DE3464220B03040900DBC861 /* Type.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DE3464210B03040900DBC861 /* Type.h */; }; + DE37252E0FE481AD00CF2CC2 /* Builtins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE37252D0FE481AD00CF2CC2 /* Builtins.cpp */; }; DE38CD500D794D0100A273B6 /* CGObjCGNU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE38CD4F0D794D0100A273B6 /* CGObjCGNU.cpp */; }; DE38CF270D8C9E6C00A273B6 /* DeclObjC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE38CF260D8C9E6C00A273B6 /* DeclObjC.cpp */; }; DE3986F00CB8D4B300223765 /* IdentifierTable.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DE3986EF0CB8D4B300223765 /* IdentifierTable.h */; }; @@ -200,9 +201,6 @@ DECB78170FA5882F00F5FBC7 /* PCHWriterStmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECB78160FA5882F00F5FBC7 /* PCHWriterStmt.cpp */; }; DED626C90AE0C065001E80A4 /* TargetInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DED626C80AE0C065001E80A4 /* TargetInfo.cpp */; }; DED62ABB0AE2EDF1001E80A4 /* Decl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DED62ABA0AE2EDF1001E80A4 /* Decl.cpp */; }; - DED676D10B6C786700AAD4A3 /* Builtins.def in CopyFiles */ = {isa = PBXBuildFile; fileRef = DED676D00B6C786700AAD4A3 /* Builtins.def */; }; - DED676FA0B6C797B00AAD4A3 /* Builtins.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DED676F90B6C797B00AAD4A3 /* Builtins.h */; }; - DED677C90B6C854100AAD4A3 /* Builtins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DED677C80B6C854100AAD4A3 /* Builtins.cpp */; }; DED7D7410A524295003AD0FB /* Diagnostic.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DED7D7310A524295003AD0FB /* Diagnostic.h */; }; DED7D7430A524295003AD0FB /* FileManager.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DED7D7330A524295003AD0FB /* FileManager.h */; }; DED7D7450A524295003AD0FB /* SourceLocation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DED7D7350A524295003AD0FB /* SourceLocation.h */; }; @@ -296,8 +294,6 @@ DE75ED290B044DC90020CF81 /* ASTContext.h in CopyFiles */, DE1733700B068DC60080B521 /* DeclSpec.h in CopyFiles */, DE01DA490B12ADA300AC22CE /* PPCallbacks.h in CopyFiles */, - DED676D10B6C786700AAD4A3 /* Builtins.def in CopyFiles */, - DED676FA0B6C797B00AAD4A3 /* Builtins.h in CopyFiles */, 1A30A9E90B93A4C800201A91 /* ExprCXX.h in CopyFiles */, 1A869A700BA2164C008DA07A /* LiteralSupport.h in CopyFiles */, DE67E7150C020EDF00F66BC5 /* Sema.h in CopyFiles */, @@ -353,9 +349,6 @@ 1A5D5E570E5E81010023C059 /* CGCXX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGCXX.cpp; path = lib/CodeGen/CGCXX.cpp; sourceTree = ""; tabWidth = 2; }; 1A649E1D0F9599D9005B965E /* CGBlocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CGBlocks.h; path = lib/CodeGen/CGBlocks.h; sourceTree = ""; }; 1A649E1E0F9599DA005B965E /* CGCXX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CGCXX.h; path = lib/CodeGen/CGCXX.h; sourceTree = ""; }; - 1A68BC110D0CADDD001A28C8 /* PPCBuiltins.def */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text; name = PPCBuiltins.def; path = clang/AST/PPCBuiltins.def; sourceTree = ""; tabWidth = 2; }; - 1A68BC120D0CADDD001A28C8 /* TargetBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = TargetBuiltins.h; path = clang/AST/TargetBuiltins.h; sourceTree = ""; tabWidth = 2; }; - 1A68BC130D0CADDD001A28C8 /* X86Builtins.def */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text; name = X86Builtins.def; path = clang/AST/X86Builtins.def; sourceTree = ""; tabWidth = 2; }; 1A6FE7080FD6F85800E00CA9 /* CGCXXTemp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGCXXTemp.cpp; path = lib/CodeGen/CGCXXTemp.cpp; sourceTree = ""; tabWidth = 2; }; 1A7019E90F79BC1100FEC4D1 /* DiagnosticAnalysisKinds.td */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DiagnosticAnalysisKinds.td; sourceTree = ""; }; 1A7019EA0F79BC1100FEC4D1 /* DiagnosticASTKinds.td */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DiagnosticASTKinds.td; sourceTree = ""; }; @@ -525,6 +518,12 @@ DE3461260AFE68BE00DBC861 /* MinimalAction.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = MinimalAction.cpp; path = lib/Parse/MinimalAction.cpp; sourceTree = ""; tabWidth = 2; }; DE34621C0AFEB19B00DBC861 /* StmtPrinter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = StmtPrinter.cpp; path = lib/AST/StmtPrinter.cpp; sourceTree = ""; tabWidth = 2; }; DE3464210B03040900DBC861 /* Type.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = Type.h; path = clang/AST/Type.h; sourceTree = ""; tabWidth = 2; }; + DE37251C0FE4818000CF2CC2 /* Builtins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Builtins.h; sourceTree = ""; }; + DE37252A0FE4818F00CF2CC2 /* Builtins.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Builtins.def; sourceTree = ""; }; + DE37252D0FE481AD00CF2CC2 /* Builtins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Builtins.cpp; sourceTree = ""; }; + DE3725310FE4822800CF2CC2 /* TargetBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TargetBuiltins.h; sourceTree = ""; }; + DE3725320FE4826C00CF2CC2 /* BuiltinsX86.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BuiltinsX86.def; sourceTree = ""; }; + DE3725330FE4827200CF2CC2 /* BuiltinsPPC.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BuiltinsPPC.def; sourceTree = ""; }; DE38CD4E0D794CF900A273B6 /* CGObjCRuntime.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = CGObjCRuntime.h; path = lib/CodeGen/CGObjCRuntime.h; sourceTree = ""; tabWidth = 2; }; DE38CD4F0D794D0100A273B6 /* CGObjCGNU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGObjCGNU.cpp; path = lib/CodeGen/CGObjCGNU.cpp; sourceTree = ""; tabWidth = 2; }; DE38CF260D8C9E6C00A273B6 /* DeclObjC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = DeclObjC.cpp; path = lib/AST/DeclObjC.cpp; sourceTree = ""; tabWidth = 2; }; @@ -621,9 +620,6 @@ DECB78540FA58F5500F5FBC7 /* AccessSpecifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AccessSpecifier.h; path = clang/Parse/AccessSpecifier.h; sourceTree = ""; }; DED626C80AE0C065001E80A4 /* TargetInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = TargetInfo.cpp; sourceTree = ""; tabWidth = 2; }; DED62ABA0AE2EDF1001E80A4 /* Decl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = Decl.cpp; path = lib/AST/Decl.cpp; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; - DED676D00B6C786700AAD4A3 /* Builtins.def */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = text; name = Builtins.def; path = clang/AST/Builtins.def; sourceTree = ""; tabWidth = 2; }; - DED676F90B6C797B00AAD4A3 /* Builtins.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = Builtins.h; path = clang/AST/Builtins.h; sourceTree = ""; tabWidth = 2; }; - DED677C80B6C854100AAD4A3 /* Builtins.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = Builtins.cpp; path = lib/AST/Builtins.cpp; sourceTree = ""; tabWidth = 2; }; DED7D7310A524295003AD0FB /* Diagnostic.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = Diagnostic.h; sourceTree = ""; tabWidth = 2; }; DED7D7330A524295003AD0FB /* FileManager.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = FileManager.h; sourceTree = ""; tabWidth = 2; }; DED7D7350A524295003AD0FB /* SourceLocation.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = SourceLocation.h; sourceTree = ""; tabWidth = 2; }; @@ -1146,13 +1142,9 @@ DE75ED280B044DC90020CF81 /* ASTContext.h */, DEA09A6E0F31756F000C2258 /* ASTDiagnostic.h */, 1A72BEAC0D641E9400B085E9 /* Attr.h */, - DED676D00B6C786700AAD4A3 /* Builtins.def */, - DED676F90B6C797B00AAD4A3 /* Builtins.h */, 90FB99DE0F98FB1D008F9415 /* DeclContextInternals.h */, 90FB99DF0F98FB1D008F9415 /* DeclVisitor.h */, 90FB99E00F98FB1D008F9415 /* ExternalASTSource.h */, - 1A68BC110D0CADDD001A28C8 /* PPCBuiltins.def */, - 1A68BC130D0CADDD001A28C8 /* X86Builtins.def */, DEC63B1B0C7B940600DBF169 /* CFG.h */, DEC8D9900A9433CD00353FCA /* Decl.h */, 3538FDB60ED24A2C005EC283 /* DeclarationName.h */, @@ -1176,7 +1168,6 @@ DE345C190AFC658B00DBC861 /* StmtVisitor.h */, 35847BE30CC7DB9000C40FFF /* StmtIterator.h */, 35CFFE010CA1CBDD00E6F2BE /* StmtGraphTraits.h */, - 1A68BC120D0CADDD001A28C8 /* TargetBuiltins.h */, DEDFF87F0F848CE30035BD10 /* TemplateName.h */, DEF16BE40FA13A5B0098507F /* TypeNodes.def */, DEF16BE50FA13A650098507F /* TypeOrdering.h */, @@ -1191,7 +1182,6 @@ DE8823CA0ED0046600CBC30A /* APValue.cpp */, 35BB2D7E0D19954000944DB5 /* ASTConsumer.cpp */, DE1732FF0B068B700080B521 /* ASTContext.cpp */, - DED677C80B6C854100AAD4A3 /* Builtins.cpp */, DEC63B190C7B940200DBF169 /* CFG.cpp */, 35FE6BCE0DF6EE1F00739712 /* DeclBase.cpp */, DED62ABA0AE2EDF1001E80A4 /* Decl.cpp */, @@ -1238,6 +1228,10 @@ DED7D7300A524295003AD0FB /* Basic */ = { isa = PBXGroup; children = ( + DE37251C0FE4818000CF2CC2 /* Builtins.h */, + DE37252A0FE4818F00CF2CC2 /* Builtins.def */, + DE3725330FE4827200CF2CC2 /* BuiltinsPPC.def */, + DE3725320FE4826C00CF2CC2 /* BuiltinsX86.def */, 906BF4AE0F83BA16001071FA /* ConvertUTF.h */, DED7D7310A524295003AD0FB /* Diagnostic.h */, DEDFFF070F959EE60035BD10 /* Diagnostic.td */, @@ -1260,6 +1254,7 @@ DED7D7350A524295003AD0FB /* SourceLocation.h */, DED7D7360A524295003AD0FB /* SourceManager.h */, 9063F2290F9E911F002F7251 /* SourceManagerInternals.h */, + DE3725310FE4822800CF2CC2 /* TargetBuiltins.h */, DE46BF270AE0A82D00CC047C /* TargetInfo.h */, 9063F22A0F9E911F002F7251 /* TemplateKinds.h */, DED7D7380A524295003AD0FB /* TokenKinds.h */, @@ -1299,6 +1294,7 @@ DED7D7500A5242C7003AD0FB /* Basic */ = { isa = PBXGroup; children = ( + DE37252D0FE481AD00CF2CC2 /* Builtins.cpp */, 906BF4AF0F83BA2E001071FA /* ConvertUTF.c */, DED7D75D0A5242C7003AD0FB /* Diagnostic.cpp */, DED7D75E0A5242C7003AD0FB /* FileManager.cpp */, @@ -1526,7 +1522,6 @@ DE75EDF10B06880E0020CF81 /* Type.cpp in Sources */, DE1733000B068B700080B521 /* ASTContext.cpp in Sources */, DE17336E0B068DC20080B521 /* DeclSpec.cpp in Sources */, - DED677C90B6C854100AAD4A3 /* Builtins.cpp in Sources */, 1A869AA80BA21ABA008DA07A /* LiteralSupport.cpp in Sources */, DE67E70B0C020EC500F66BC5 /* SemaType.cpp in Sources */, DE67E70D0C020ECA00F66BC5 /* SemaStmt.cpp in Sources */, @@ -1699,6 +1694,7 @@ 1A6FE7090FD6F85800E00CA9 /* CGCXXTemp.cpp in Sources */, BDF87CF70FD746F300BBF872 /* SemaTemplateDeduction.cpp in Sources */, 1A14D3A70FD78A3F00DA2835 /* DeclPrinter.cpp in Sources */, + DE37252E0FE481AD00CF2CC2 /* Builtins.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h index cd8178de1f..a41347219c 100644 --- a/include/clang/AST/ASTContext.h +++ b/include/clang/AST/ASTContext.h @@ -14,16 +14,15 @@ #ifndef LLVM_CLANG_AST_ASTCONTEXT_H #define LLVM_CLANG_AST_ASTCONTEXT_H +#include "clang/Basic/Builtins.h" #include "clang/Basic/IdentifierTable.h" #include "clang/Basic/LangOptions.h" #include "clang/AST/Attr.h" -#include "clang/AST/Builtins.h" #include "clang/AST/Decl.h" #include "clang/AST/NestedNameSpecifier.h" #include "clang/AST/PrettyPrinter.h" #include "clang/AST/TemplateName.h" #include "clang/AST/Type.h" -#include "clang/Basic/SourceLocation.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/FoldingSet.h" #include "llvm/ADT/OwningPtr.h" diff --git a/include/clang/AST/Builtins.def b/include/clang/Basic/Builtins.def similarity index 100% rename from include/clang/AST/Builtins.def rename to include/clang/Basic/Builtins.def diff --git a/include/clang/AST/Builtins.h b/include/clang/Basic/Builtins.h similarity index 97% rename from include/clang/AST/Builtins.h rename to include/clang/Basic/Builtins.h index e4cce371da..a18faf688f 100644 --- a/include/clang/AST/Builtins.h +++ b/include/clang/Basic/Builtins.h @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_AST_BUILTINS_H -#define LLVM_CLANG_AST_BUILTINS_H +#ifndef LLVM_CLANG_BASIC_BUILTINS_H +#define LLVM_CLANG_BASIC_BUILTINS_H #include @@ -31,7 +31,7 @@ namespace Builtin { enum ID { NotBuiltin = 0, // This is not a builtin function. #define BUILTIN(ID, TYPE, ATTRS) BI##ID, -#include "clang/AST/Builtins.def" +#include "clang/Basic/Builtins.def" FirstTSBuiltin }; diff --git a/include/clang/AST/PPCBuiltins.def b/include/clang/Basic/BuiltinsPPC.def similarity index 86% rename from include/clang/AST/PPCBuiltins.def rename to include/clang/Basic/BuiltinsPPC.def index b8c791286e..817a032d92 100644 --- a/include/clang/AST/PPCBuiltins.def +++ b/include/clang/Basic/BuiltinsPPC.def @@ -1,4 +1,4 @@ -//===--- PPCBuiltins.def - PowerPC Builtin function database ----*- C++ -*-===// +//===--- BuiltinsPPC.def - PowerPC Builtin function database ----*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -15,7 +15,7 @@ // FIXME: this needs to be the full list supported by GCC. Right now, I'm just // adding stuff on demand. -// The format of this database matches clang/AST/Builtins.def. +// The format of this database matches clang/Basic/Builtins.def. // This is just a placeholder, the types and attributes are wrong. BUILTIN(__builtin_altivec_abs_v4sf , "ii" , "nc") diff --git a/include/clang/AST/X86Builtins.def b/include/clang/Basic/BuiltinsX86.def similarity index 99% rename from include/clang/AST/X86Builtins.def rename to include/clang/Basic/BuiltinsX86.def index 85381c0762..2af95808b2 100644 --- a/include/clang/AST/X86Builtins.def +++ b/include/clang/Basic/BuiltinsX86.def @@ -1,4 +1,4 @@ -//===--- X86Builtins.def - X86 Builtin function database --------*- C++ -*-===// +//===--- BuiltinsX86.def - X86 Builtin function database --------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -// The format of this database matches clang/AST/Builtins.def. +// The format of this database matches clang/Basic/Builtins.def. // FIXME: In GCC, these builtins are defined depending on whether support for // MMX/SSE/etc is turned on. We should do this too. diff --git a/include/clang/AST/TargetBuiltins.h b/include/clang/Basic/TargetBuiltins.h similarity index 79% rename from include/clang/AST/TargetBuiltins.h rename to include/clang/Basic/TargetBuiltins.h index d425a9b8ec..d2e9495017 100644 --- a/include/clang/AST/TargetBuiltins.h +++ b/include/clang/Basic/TargetBuiltins.h @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_AST_TARGET_BUILTINS_H -#define LLVM_CLANG_AST_TARGET_BUILTINS_H +#ifndef LLVM_CLANG_BASIC_TARGET_BUILTINS_H +#define LLVM_CLANG_BASIC_TARGET_BUILTINS_H -#include "clang/AST/Builtins.h" +#include "clang/Basic/Builtins.h" #undef PPC namespace clang { @@ -19,7 +19,7 @@ namespace clang { enum { LastTIBuiltin = clang::Builtin::FirstTSBuiltin-1, #define BUILTIN(ID, TYPE, ATTRS) BI##ID, -#include "X86Builtins.def" +#include "clang/Basic/BuiltinsX86.def" LastTSBuiltin }; } @@ -29,7 +29,7 @@ namespace clang { enum { LastTIBuiltin = clang::Builtin::FirstTSBuiltin-1, #define BUILTIN(ID, TYPE, ATTRS) BI##ID, -#include "PPCBuiltins.def" +#include "clang/Basic/BuiltinsPPC.def" LastTSBuiltin }; } diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt index 19ab9f650e..ac4cbb2d29 100644 --- a/lib/AST/CMakeLists.txt +++ b/lib/AST/CMakeLists.txt @@ -4,7 +4,6 @@ add_clang_library(clangAST APValue.cpp ASTConsumer.cpp ASTContext.cpp - Builtins.cpp CFG.cpp DeclarationName.cpp DeclBase.cpp diff --git a/lib/AST/Builtins.cpp b/lib/Basic/Builtins.cpp similarity index 98% rename from lib/AST/Builtins.cpp rename to lib/Basic/Builtins.cpp index bdf5dc4f0b..7f91226424 100644 --- a/lib/AST/Builtins.cpp +++ b/lib/Basic/Builtins.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/AST/Builtins.h" +#include "clang/Basic/Builtins.h" #include "clang/Basic/IdentifierTable.h" #include "clang/Basic/TargetInfo.h" using namespace clang; @@ -20,7 +20,7 @@ static const Builtin::Info BuiltinInfo[] = { { "not a builtin function", 0, 0, 0, false }, #define BUILTIN(ID, TYPE, ATTRS) { #ID, TYPE, ATTRS, 0, false }, #define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) { #ID, TYPE, ATTRS, HEADER, false }, -#include "clang/AST/Builtins.def" +#include "clang/Basic/Builtins.def" }; const Builtin::Info &Builtin::Context::GetRecord(unsigned ID) const { diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt index 1cbf11c2bf..e0e9a10e51 100644 --- a/lib/Basic/CMakeLists.txt +++ b/lib/Basic/CMakeLists.txt @@ -1,6 +1,7 @@ set(LLVM_NO_RTTI 1) add_clang_library(clangBasic + Builtins.cpp ConvertUTF.c Diagnostic.cpp FileManager.cpp diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 8b04920b6f..13758ad183 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -12,9 +12,8 @@ // //===----------------------------------------------------------------------===// -// FIXME: Layering violation -#include "clang/AST/Builtins.h" -#include "clang/AST/TargetBuiltins.h" +#include "clang/Basic/Builtins.h" +#include "clang/Basic/TargetBuiltins.h" #include "clang/Basic/TargetInfo.h" #include "clang/Basic/LangOptions.h" #include "llvm/ADT/STLExtras.h" @@ -315,7 +314,7 @@ public: const Builtin::Info PPCTargetInfo::BuiltinInfo[] = { #define BUILTIN(ID, TYPE, ATTRS) { #ID, TYPE, ATTRS, 0, false }, #define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) { #ID, TYPE, ATTRS, HEADER, false }, -#include "clang/AST/PPCBuiltins.def" +#include "clang/Basic/BuiltinsPPC.def" }; @@ -489,7 +488,7 @@ namespace { const Builtin::Info BuiltinInfo[] = { #define BUILTIN(ID, TYPE, ATTRS) { #ID, TYPE, ATTRS, 0, false }, #define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) { #ID, TYPE, ATTRS, HEADER, false }, -#include "clang/AST/X86Builtins.def" +#include "clang/Basic/BuiltinsX86.def" }; const char *GCCRegNames[] = { diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index f9c44c8965..a919dfa2e3 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -17,7 +17,7 @@ #include "clang/AST/APValue.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" -#include "clang/AST/TargetBuiltins.h" +#include "clang/Basic/TargetBuiltins.h" #include "llvm/Intrinsics.h" using namespace clang; using namespace CodeGen;