Very nice, thanks! -eric
On Tue, Jun 3, 2014 at 8:28 PM, Alp Toker <[email protected]> wrote: > Author: alp > Date: Tue Jun 3 22:28:55 2014 > New Revision: 210145 > > URL: http://llvm.org/viewvc/llvm-project?rev=210145&view=rev > Log: > 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. > > Modified: > cfe/trunk/include/clang/Config/config.h.cmake > cfe/trunk/include/clang/Config/config.h.in > cfe/trunk/lib/Basic/Version.cpp > cfe/trunk/lib/Driver/Driver.cpp > cfe/trunk/lib/Driver/ToolChains.cpp > cfe/trunk/lib/Frontend/CompilerInstance.cpp > cfe/trunk/lib/Rewrite/Core/Rewriter.cpp > cfe/trunk/lib/Tooling/Tooling.cpp > cfe/trunk/tools/c-index-test/c-index-test.c > cfe/trunk/tools/driver/driver.cpp > cfe/trunk/tools/libclang/CIndex.cpp > cfe/trunk/unittests/Basic/FileManagerTest.cpp > cfe/trunk/unittests/Basic/SourceManagerTest.cpp > cfe/trunk/unittests/Lex/LexerTest.cpp > cfe/trunk/unittests/Lex/PPConditionalDirectiveRecordTest.cpp > cfe/trunk/unittests/Tooling/ToolingTest.cpp > > Modified: cfe/trunk/include/clang/Config/config.h.cmake > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Config/config.h.cmake?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/include/clang/Config/config.h.cmake (original) > +++ cfe/trunk/include/clang/Config/config.h.cmake Tue Jun 3 22:28:55 2014 > @@ -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 > > Modified: cfe/trunk/include/clang/Config/config.h.in > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Config/config.h.in?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/include/clang/Config/config.h.in (original) > +++ cfe/trunk/include/clang/Config/config.h.in Tue Jun 3 22:28:55 2014 > @@ -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 > > Modified: cfe/trunk/lib/Basic/Version.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Version.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/lib/Basic/Version.cpp (original) > +++ cfe/trunk/lib/Basic/Version.cpp Tue Jun 3 22:28:55 2014 > @@ -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 <cstdlib> > #include <cstring> > > Modified: cfe/trunk/lib/Driver/Driver.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/lib/Driver/Driver.cpp (original) > +++ cfe/trunk/lib/Driver/Driver.cpp Tue Jun 3 22:28:55 2014 > @@ -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 <map> > #include <memory> > > -// 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; > > Modified: cfe/trunk/lib/Driver/ToolChains.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/lib/Driver/ToolChains.cpp (original) > +++ cfe/trunk/lib/Driver/ToolChains.cpp Tue Jun 3 22:28:55 2014 > @@ -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 <cstdlib> // ::getenv > > using namespace clang::driver; > > Modified: cfe/trunk/lib/Frontend/CompilerInstance.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInstance.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/lib/Frontend/CompilerInstance.cpp (original) > +++ cfe/trunk/lib/Frontend/CompilerInstance.cpp Tue Jun 3 22:28:55 2014 > @@ -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(Fro > // 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) > > Modified: cfe/trunk/lib/Rewrite/Core/Rewriter.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/Core/Rewriter.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/lib/Rewrite/Core/Rewriter.cpp (original) > +++ cfe/trunk/lib/Rewrite/Core/Rewriter.cpp Tue Jun 3 22:28:55 2014 > @@ -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; > > Modified: cfe/trunk/lib/Tooling/Tooling.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Tooling.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/lib/Tooling/Tooling.cpp (original) > +++ cfe/trunk/lib/Tooling/Tooling.cpp Tue Jun 3 22:28:55 2014 > @@ -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" > > Modified: cfe/trunk/tools/c-index-test/c-index-test.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/c-index-test.c?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/tools/c-index-test/c-index-test.c (original) > +++ cfe/trunk/tools/c-index-test/c-index-test.c Tue Jun 3 22:28:55 2014 > @@ -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 <ctype.h> > #include <stdlib.h> > #include <stdio.h> > > Modified: cfe/trunk/tools/driver/driver.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/tools/driver/driver.cpp (original) > +++ cfe/trunk/tools/driver/driver.cpp Tue Jun 3 22:28:55 2014 > @@ -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" > > Modified: cfe/trunk/tools/libclang/CIndex.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/tools/libclang/CIndex.cpp (original) > +++ cfe/trunk/tools/libclang/CIndex.cpp Tue Jun 3 22:28:55 2014 > @@ -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 <pthread.h> > #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 > > Modified: cfe/trunk/unittests/Basic/FileManagerTest.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Basic/FileManagerTest.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/unittests/Basic/FileManagerTest.cpp (original) > +++ cfe/trunk/unittests/Basic/FileManagerTest.cpp Tue Jun 3 22:28:55 2014 > @@ -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; > > Modified: cfe/trunk/unittests/Basic/SourceManagerTest.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Basic/SourceManagerTest.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/unittests/Basic/SourceManagerTest.cpp (original) > +++ cfe/trunk/unittests/Basic/SourceManagerTest.cpp Tue Jun 3 22:28:55 2014 > @@ -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; > > Modified: cfe/trunk/unittests/Lex/LexerTest.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Lex/LexerTest.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/unittests/Lex/LexerTest.cpp (original) > +++ cfe/trunk/unittests/Lex/LexerTest.cpp Tue Jun 3 22:28:55 2014 > @@ -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; > > Modified: cfe/trunk/unittests/Lex/PPConditionalDirectiveRecordTest.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Lex/PPConditionalDirectiveRecordTest.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/unittests/Lex/PPConditionalDirectiveRecordTest.cpp (original) > +++ cfe/trunk/unittests/Lex/PPConditionalDirectiveRecordTest.cpp Tue Jun 3 > 22:28:55 2014 > @@ -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; > > Modified: cfe/trunk/unittests/Tooling/ToolingTest.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/ToolingTest.cpp?rev=210145&r1=210144&r2=210145&view=diff > ============================================================================== > --- cfe/trunk/unittests/Tooling/ToolingTest.cpp (original) > +++ cfe/trunk/unittests/Tooling/ToolingTest.cpp Tue Jun 3 22:28:55 2014 > @@ -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 <string> > > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
