From: Alp Toker Date: Wed, 4 Jun 2014 03:28:55 +0000 (+0000) Subject: Remove the last remaining llvm/Config/config.h includes X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4545688eab4ddb6fb4dabe43d9d00f9d7db9602;p=clang Remove the last remaining llvm/Config/config.h includes This corrects long-standing misuses of LLVM's internal config.h. In most cases the public llvm-config.h header was intended and we can now remove the old hacks thanks to LLVM r210144. The config.h header is private, won't be installed and should no longer be included by clang or other modules. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@210145 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake index c18c4cc86f..8fa7a52a3e 100644 --- a/include/clang/Config/config.h.cmake +++ b/include/clang/Config/config.h.cmake @@ -1,3 +1,6 @@ +#ifndef CONFIG_H +#define CONFIG_H + /* Bug report URL. */ #define BUG_REPORT_URL "${BUG_REPORT_URL}" @@ -12,3 +15,8 @@ /* Directory where gcc is installed. */ #define GCC_INSTALL_PREFIX "${GCC_INSTALL_PREFIX}" + +/* Define if we have libxml2 */ +#cmakedefine CLANG_HAVE_LIBXML ${CLANG_HAVE_LIBXML} + +#endif diff --git a/include/clang/Config/config.h.in b/include/clang/Config/config.h.in index 8ff94178e2..d66b4cf68d 100644 --- a/include/clang/Config/config.h.in +++ b/include/clang/Config/config.h.in @@ -1,5 +1,3 @@ -/* include/clang/Config/config.h.in. */ - #ifndef CONFIG_H #define CONFIG_H @@ -21,4 +19,7 @@ /* Directory where gcc is installed. */ #undef GCC_INSTALL_PREFIX +/* Define if we have libxml2 */ +#undef CLANG_HAVE_LIBXML + #endif diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp index ae32c01139..7973c5dd61 100644 --- a/lib/Basic/Version.cpp +++ b/lib/Basic/Version.cpp @@ -13,7 +13,6 @@ #include "clang/Basic/Version.h" #include "clang/Basic/LLVM.h" -#include "llvm/Config/config.h" #include "llvm/Support/raw_ostream.h" #include #include diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index a0fcf41316..1d7f180554 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -11,6 +11,7 @@ #include "InputInfo.h" #include "ToolChains.h" #include "clang/Basic/Version.h" +#include "clang/Config/config.h" #include "clang/Driver/Action.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/DriverDiagnostic.h" @@ -37,10 +38,6 @@ #include #include -// FIXME: It would prevent us from including llvm-config.h -// if config.h were included before system_error.h. -#include "clang/Config/config.h" - using namespace clang::driver; using namespace clang; using namespace llvm::opt; diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 8d8e7c7c20..dcbdd7175a 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -10,6 +10,7 @@ #include "ToolChains.h" #include "clang/Basic/ObjCRuntime.h" #include "clang/Basic/Version.h" +#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" @@ -31,10 +32,6 @@ #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" -// FIXME: This needs to be listed last until we fix the broken include guards -// in these files and the LLVM config.h files. -#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX - #include // ::getenv using namespace clang::driver; diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index ac20d7a28e..a967c0ab54 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -33,7 +33,6 @@ #include "clang/Serialization/ASTReader.h" #include "clang/Serialization/GlobalModuleIndex.h" #include "llvm/ADT/Statistic.h" -#include "llvm/Config/config.h" #include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Host.h" @@ -710,7 +709,9 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) { // Validate/process some options. if (getHeaderSearchOpts().Verbose) OS << "clang -cc1 version " CLANG_VERSION_STRING +#ifdef PACKAGE_STRING << " based upon " << PACKAGE_STRING +#endif << " default target " << llvm::sys::getDefaultTargetTriple() << "\n"; if (getFrontendOpts().ShowTimers) diff --git a/lib/Rewrite/Core/Rewriter.cpp b/lib/Rewrite/Core/Rewriter.cpp index c0f87d2a24..8b17b654d6 100644 --- a/lib/Rewrite/Core/Rewriter.cpp +++ b/lib/Rewrite/Core/Rewriter.cpp @@ -21,7 +21,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Lex/Lexer.h" #include "llvm/ADT/SmallString.h" -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/raw_ostream.h" using namespace clang; diff --git a/lib/Tooling/Tooling.cpp b/lib/Tooling/Tooling.cpp index 35e3eb4af2..f8247418a9 100644 --- a/lib/Tooling/Tooling.cpp +++ b/lib/Tooling/Tooling.cpp @@ -24,7 +24,7 @@ #include "clang/Tooling/ArgumentsAdjusters.h" #include "clang/Tooling/CompilationDatabase.h" #include "llvm/ADT/STLExtras.h" -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" #include "llvm/Option/Option.h" #include "llvm/Support/Debug.h" #include "llvm/Support/FileSystem.h" diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c index dcae670591..1d5cb1434c 100644 --- a/tools/c-index-test/c-index-test.c +++ b/tools/c-index-test/c-index-test.c @@ -1,10 +1,10 @@ /* c-index-test.c */ +#include "clang/Config/config.h" #include "clang-c/Index.h" #include "clang-c/CXCompilationDatabase.h" #include "clang-c/BuildSystem.h" #include "clang-c/Documentation.h" -#include "llvm/Config/config.h" #include #include #include diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index fd135554a6..edb32bc96b 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -25,7 +25,7 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/OptTable.h" #include "llvm/Option/Option.h" diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 22b007e2f7..bf54fb9376 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -39,7 +39,7 @@ #include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringSwitch.h" -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/Format.h" @@ -52,7 +52,7 @@ #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" -#if HAVE_PTHREAD_H +#ifdef __APPLE__ #include #endif @@ -6962,7 +6962,7 @@ cxindex::Logger::~Logger() { OS << "[libclang:" << Name << ':'; // FIXME: Portability. -#if HAVE_PTHREAD_H && __APPLE__ +#ifdef __APPLE__ mach_port_t tid = pthread_mach_thread_np(pthread_self()); OS << tid << ':'; #endif diff --git a/unittests/Basic/FileManagerTest.cpp b/unittests/Basic/FileManagerTest.cpp index 9df85329a4..ae89395f12 100644 --- a/unittests/Basic/FileManagerTest.cpp +++ b/unittests/Basic/FileManagerTest.cpp @@ -11,7 +11,7 @@ #include "clang/Basic/FileSystemOptions.h" #include "clang/Basic/FileSystemStatCache.h" #include "gtest/gtest.h" -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" using namespace llvm; using namespace clang; diff --git a/unittests/Basic/SourceManagerTest.cpp b/unittests/Basic/SourceManagerTest.cpp index f227d0d6fd..3f12f4743c 100644 --- a/unittests/Basic/SourceManagerTest.cpp +++ b/unittests/Basic/SourceManagerTest.cpp @@ -20,7 +20,7 @@ #include "clang/Lex/Preprocessor.h" #include "clang/Lex/PreprocessorOptions.h" #include "llvm/ADT/SmallString.h" -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" #include "gtest/gtest.h" using namespace llvm; diff --git a/unittests/Lex/LexerTest.cpp b/unittests/Lex/LexerTest.cpp index 3d30352d48..2b42f9cb0e 100644 --- a/unittests/Lex/LexerTest.cpp +++ b/unittests/Lex/LexerTest.cpp @@ -20,7 +20,6 @@ #include "clang/Lex/ModuleLoader.h" #include "clang/Lex/Preprocessor.h" #include "clang/Lex/PreprocessorOptions.h" -#include "llvm/Config/config.h" #include "gtest/gtest.h" using namespace llvm; diff --git a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp index f7ed8e54fc..1be5ececa7 100644 --- a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp +++ b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp @@ -20,7 +20,6 @@ #include "clang/Lex/ModuleLoader.h" #include "clang/Lex/Preprocessor.h" #include "clang/Lex/PreprocessorOptions.h" -#include "llvm/Config/config.h" #include "gtest/gtest.h" using namespace llvm; diff --git a/unittests/Tooling/ToolingTest.cpp b/unittests/Tooling/ToolingTest.cpp index 2d055e7085..f277728ea8 100644 --- a/unittests/Tooling/ToolingTest.cpp +++ b/unittests/Tooling/ToolingTest.cpp @@ -17,7 +17,7 @@ #include "clang/Tooling/CompilationDatabase.h" #include "clang/Tooling/Tooling.h" #include "llvm/ADT/STLExtras.h" -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" #include "gtest/gtest.h" #include