[cfe-commits] r67009 - in /cfe/trunk: ./ include/ include/clang/ include/clang/AST/ include/clang/Analysis/ include/clang/Basic/ include/clang/Driver/ include/clang/Frontend/ include/clang/Lex/ include/clang/Parse/ include/clang/Sema/ lib/Basic/

Sebastian Redl sebastian.redl at getdesigned.at
Sat Mar 14 08:59:00 PDT 2009


Author: cornedbee
Date: Sat Mar 14 10:58:54 2009
New Revision: 67009

URL: http://llvm.org/viewvc/llvm-project?rev=67009&view=rev
Log:
Revert the switch to the tablegen diags. It fails for seperate objdir builds and cmake builds, and I have no clue what to do about it. Revisit this after someone with a clue about the build systems has looked at it.

Added:
    cfe/trunk/include/clang/Basic/DiagnosticASTKinds.def
      - copied unchanged from r67006, cfe/trunk/include/clang/Basic/DiagnosticASTKinds.def
    cfe/trunk/include/clang/Basic/DiagnosticAnalysisKinds.def
      - copied unchanged from r67006, cfe/trunk/include/clang/Basic/DiagnosticAnalysisKinds.def
    cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.def
      - copied unchanged from r67006, cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.def
    cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.def
      - copied unchanged from r67006, cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.def
    cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.def
      - copied unchanged from r67006, cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.def
    cfe/trunk/include/clang/Basic/DiagnosticLexKinds.def
      - copied unchanged from r67006, cfe/trunk/include/clang/Basic/DiagnosticLexKinds.def
    cfe/trunk/include/clang/Basic/DiagnosticParseKinds.def
      - copied unchanged from r67006, cfe/trunk/include/clang/Basic/DiagnosticParseKinds.def
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def
      - copied unchanged from r67006, cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def
Removed:
    cfe/trunk/include/CMakeLists.txt
    cfe/trunk/include/Makefile
    cfe/trunk/include/clang/Basic/CMakeLists.txt
    cfe/trunk/include/clang/Basic/Makefile
    cfe/trunk/include/clang/CMakeLists.txt
    cfe/trunk/include/clang/Makefile
Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/Makefile
    cfe/trunk/include/clang/AST/ASTDiagnostic.h
    cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h
    cfe/trunk/include/clang/Basic/   (props changed)
    cfe/trunk/include/clang/Basic/Diagnostic.h
    cfe/trunk/include/clang/Driver/DriverDiagnostic.h
    cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h
    cfe/trunk/include/clang/Lex/LexDiagnostic.h
    cfe/trunk/include/clang/Parse/ParseDiagnostic.h
    cfe/trunk/include/clang/Sema/SemaDiagnostic.h
    cfe/trunk/lib/Basic/Diagnostic.cpp

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Sat Mar 14 10:58:54 2009
@@ -47,7 +47,6 @@
 
 add_definitions( -D_GNU_SOURCE )
 
-add_subdirectory(include)
 add_subdirectory(lib)
 add_subdirectory(Driver)
 

Modified: cfe/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Makefile?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/Makefile (original)
+++ cfe/trunk/Makefile Sat Mar 14 10:58:54 2009
@@ -1,5 +1,5 @@
 LEVEL = ../..
-DIRS := include lib Driver docs tools
+DIRS := lib Driver docs tools
 
 include $(LEVEL)/Makefile.common
 

Removed: cfe/trunk/include/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/CMakeLists.txt?rev=67008&view=auto

==============================================================================
--- cfe/trunk/include/CMakeLists.txt (original)
+++ cfe/trunk/include/CMakeLists.txt (removed)
@@ -1 +0,0 @@
-add_subdirectory(clang)

Removed: cfe/trunk/include/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/Makefile?rev=67008&view=auto

==============================================================================
--- cfe/trunk/include/Makefile (original)
+++ cfe/trunk/include/Makefile (removed)
@@ -1,4 +0,0 @@
-LEVEL = ../../..
-DIRS := clang
-
-include $(LEVEL)/Makefile.common

Modified: cfe/trunk/include/clang/AST/ASTDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTDiagnostic.h?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/include/clang/AST/ASTDiagnostic.h (original)
+++ cfe/trunk/include/clang/AST/ASTDiagnostic.h Sat Mar 14 10:58:54 2009
@@ -17,7 +17,7 @@
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define ASTSTART
-#include "clang/Basic/DiagnosticASTKinds.inc"
+#include "clang/Basic/DiagnosticASTKinds.def"
 #undef DIAG
       NUM_BUILTIN_AST_DIAGNOSTICS
     };

Modified: cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h (original)
+++ cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h Sat Mar 14 10:58:54 2009
@@ -17,7 +17,7 @@
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define ANALYSISSTART
-#include "clang/Basic/DiagnosticAnalysisKinds.inc"
+#include "clang/Basic/DiagnosticAnalysisKinds.def"
 #undef DIAG
       NUM_BUILTIN_ANALYSIS_DIAGNOSTICS
     };

Propchange: cfe/trunk/include/clang/Basic/

------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore (removed)
@@ -1,6 +0,0 @@
-Debug
-Debug+Checks
-Release
-Release-Asserts
-*.inc
-

Removed: cfe/trunk/include/clang/Basic/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/CMakeLists.txt?rev=67008&view=auto

==============================================================================
--- cfe/trunk/include/clang/Basic/CMakeLists.txt (original)
+++ cfe/trunk/include/clang/Basic/CMakeLists.txt (removed)
@@ -1,8 +0,0 @@
-tablegen(DiagnosticAnalysisKinds.inc -gen-clang-diags-def -clang-component=Analysis)
-tablegen(DiagnosticASTKinds.inc -gen-clang-diags-def -clang-component=AST)
-tablegen(DiagnosticCommonKinds.inc -gen-clang-diags-def -clang-component=Common)
-tablegen(DiagnosticDriverKinds.inc -gen-clang-diags-def -clang-component=Driver)
-tablegen(DiagnosticFrontendKinds.inc -gen-clang-diags-def -clang-component=Frontend)
-tablegen(DiagnosticLexKinds.inc -gen-clang-diags-def -clang-component=Lex)
-tablegen(DiagnosticParseKinds.inc -gen-clang-diags-def -clang-component=Parse)
-tablegen(DiagnosticSemaKinds.inc -gen-clang-diags-def -clang-component=Sema)

Modified: cfe/trunk/include/clang/Basic/Diagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Diagnostic.h?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/Diagnostic.h (original)
+++ cfe/trunk/include/clang/Basic/Diagnostic.h Sat Mar 14 10:58:54 2009
@@ -50,7 +50,7 @@
     // Get typedefs for common diagnostics.
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "clang/Basic/DiagnosticCommonKinds.inc"
+#include "clang/Basic/DiagnosticCommonKinds.def"
       NUM_BUILTIN_COMMON_DIAGNOSTICS
 #undef DIAG
     };

Removed: cfe/trunk/include/clang/Basic/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Makefile?rev=67008&view=auto

==============================================================================
--- cfe/trunk/include/clang/Basic/Makefile (original)
+++ cfe/trunk/include/clang/Basic/Makefile (removed)
@@ -1,9 +0,0 @@
-LEVEL = ../../../../..
-BUILT_SOURCES = DiagnosticAnalysisKinds.inc DiagnosticASTKinds.inc \
-	DiagnosticCommonKinds.inc DiagnosticDriverKinds.inc \
-	DiagnosticFrontendKinds.inc DiagnosticLexKinds.inc \
-	DiagnosticParseKinds.inc DiagnosticSemaKinds.inc
-
-CLANG_BUILD_DIAGNOSTICS_INC = 1
-
-include $(LEVEL)/Makefile.common

Removed: cfe/trunk/include/clang/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/CMakeLists.txt?rev=67008&view=auto

==============================================================================
--- cfe/trunk/include/clang/CMakeLists.txt (original)
+++ cfe/trunk/include/clang/CMakeLists.txt (removed)
@@ -1 +0,0 @@
-add_subdirectory(Basic)

Modified: cfe/trunk/include/clang/Driver/DriverDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/DriverDiagnostic.h?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/include/clang/Driver/DriverDiagnostic.h (original)
+++ cfe/trunk/include/clang/Driver/DriverDiagnostic.h Sat Mar 14 10:58:54 2009
@@ -17,7 +17,7 @@
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define DRIVERSTART
-#include "clang/Basic/DiagnosticDriverKinds.inc"
+#include "clang/Basic/DiagnosticDriverKinds.def"
 #undef DIAG
       NUM_BUILTIN_DRIVER_DIAGNOSTICS
     };

Modified: cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h (original)
+++ cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h Sat Mar 14 10:58:54 2009
@@ -17,7 +17,7 @@
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define FRONTENDSTART
-#include "clang/Basic/DiagnosticFrontendKinds.inc"
+#include "clang/Basic/DiagnosticFrontendKinds.def"
 #undef DIAG
       NUM_BUILTIN_FRONTEND_DIAGNOSTICS
     };

Modified: cfe/trunk/include/clang/Lex/LexDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/LexDiagnostic.h?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/include/clang/Lex/LexDiagnostic.h (original)
+++ cfe/trunk/include/clang/Lex/LexDiagnostic.h Sat Mar 14 10:58:54 2009
@@ -17,7 +17,7 @@
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define LEXSTART
-#include "clang/Basic/DiagnosticLexKinds.inc"
+#include "clang/Basic/DiagnosticLexKinds.def"
 #undef DIAG
       NUM_BUILTIN_LEX_DIAGNOSTICS
     };

Removed: cfe/trunk/include/clang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Makefile?rev=67008&view=auto

==============================================================================
--- cfe/trunk/include/clang/Makefile (original)
+++ cfe/trunk/include/clang/Makefile (removed)
@@ -1,4 +0,0 @@
-LEVEL = ../../../..
-DIRS := Basic
-
-include $(LEVEL)/Makefile.common

Modified: cfe/trunk/include/clang/Parse/ParseDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/ParseDiagnostic.h?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/include/clang/Parse/ParseDiagnostic.h (original)
+++ cfe/trunk/include/clang/Parse/ParseDiagnostic.h Sat Mar 14 10:58:54 2009
@@ -17,7 +17,7 @@
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define PARSESTART
-#include "clang/Basic/DiagnosticParseKinds.inc"
+#include "clang/Basic/DiagnosticParseKinds.def"
 #undef DIAG
       NUM_BUILTIN_PARSE_DIAGNOSTICS
     };

Modified: cfe/trunk/include/clang/Sema/SemaDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/SemaDiagnostic.h?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/include/clang/Sema/SemaDiagnostic.h (original)
+++ cfe/trunk/include/clang/Sema/SemaDiagnostic.h Sat Mar 14 10:58:54 2009
@@ -17,7 +17,7 @@
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define SEMASTART
-#include "clang/Basic/DiagnosticSemaKinds.inc"
+#include "clang/Basic/DiagnosticSemaKinds.def"
 #undef DIAG
       NUM_BUILTIN_SEMA_DIAGNOSTICS
     };

Modified: cfe/trunk/lib/Basic/Diagnostic.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Diagnostic.cpp?rev=67009&r1=67008&r2=67009&view=diff

==============================================================================
--- cfe/trunk/lib/Basic/Diagnostic.cpp (original)
+++ cfe/trunk/lib/Basic/Diagnostic.cpp Sat Mar 14 10:58:54 2009
@@ -41,35 +41,35 @@
 /// diagnostic.
 #define DIAG(ENUM,FLAGS,DESC) FLAGS,
 static unsigned char DiagnosticFlagsCommon[] = {
-#include "clang/Basic/DiagnosticCommonKinds.inc"
+#include "clang/Basic/DiagnosticCommonKinds.def"
   0
 };
 static unsigned char DiagnosticFlagsDriver[] = {
-#include "clang/Basic/DiagnosticDriverKinds.inc"
+#include "clang/Basic/DiagnosticDriverKinds.def"
   0
 };
 static unsigned char DiagnosticFlagsFrontend[] = {
-#include "clang/Basic/DiagnosticFrontendKinds.inc"
+#include "clang/Basic/DiagnosticFrontendKinds.def"
   0
 };
 static unsigned char DiagnosticFlagsLex[] = {
-#include "clang/Basic/DiagnosticLexKinds.inc"
+#include "clang/Basic/DiagnosticLexKinds.def"
   0
 };
 static unsigned char DiagnosticFlagsParse[] = {
-#include "clang/Basic/DiagnosticParseKinds.inc"
+#include "clang/Basic/DiagnosticParseKinds.def"
   0
 };
 static unsigned char DiagnosticFlagsAST[] = {
-#include "clang/Basic/DiagnosticASTKinds.inc"
+#include "clang/Basic/DiagnosticASTKinds.def"
   0
 };
 static unsigned char DiagnosticFlagsSema[] = {
-#include "clang/Basic/DiagnosticSemaKinds.inc"
+#include "clang/Basic/DiagnosticSemaKinds.def"
   0
 };
 static unsigned char DiagnosticFlagsAnalysis[] = {
-#include "clang/Basic/DiagnosticAnalysisKinds.inc"
+#include "clang/Basic/DiagnosticAnalysisKinds.def"
   0
 };
 #undef DIAG
@@ -103,35 +103,35 @@
 /// should be localized.
 #define DIAG(ENUM,FLAGS,DESC) DESC,
 static const char * const DiagnosticTextCommon[] = {
-#include "clang/Basic/DiagnosticCommonKinds.inc"
+#include "clang/Basic/DiagnosticCommonKinds.def"
   0
 };
 static const char * const DiagnosticTextDriver[] = {
-#include "clang/Basic/DiagnosticDriverKinds.inc"
+#include "clang/Basic/DiagnosticDriverKinds.def"
   0
 };
 static const char * const DiagnosticTextFrontend[] = {
-#include "clang/Basic/DiagnosticFrontendKinds.inc"
+#include "clang/Basic/DiagnosticFrontendKinds.def"
   0
 };
 static const char * const DiagnosticTextLex[] = {
-#include "clang/Basic/DiagnosticLexKinds.inc"
+#include "clang/Basic/DiagnosticLexKinds.def"
   0
 };
 static const char * const DiagnosticTextParse[] = {
-#include "clang/Basic/DiagnosticParseKinds.inc"
+#include "clang/Basic/DiagnosticParseKinds.def"
   0
 };
 static const char * const DiagnosticTextAST[] = {
-#include "clang/Basic/DiagnosticASTKinds.inc"
+#include "clang/Basic/DiagnosticASTKinds.def"
   0
 };
 static const char * const DiagnosticTextSema[] = {
-#include "clang/Basic/DiagnosticSemaKinds.inc"
+#include "clang/Basic/DiagnosticSemaKinds.def"
   0
 };
 static const char * const DiagnosticTextAnalysis[] = {
-#include "clang/Basic/DiagnosticAnalysisKinds.inc"
+#include "clang/Basic/DiagnosticAnalysisKinds.def"
   0
 };
 #undef DIAG





More information about the cfe-commits mailing list