add isl_aff_mod_val

[platform/upstream/isl.git] / interface / extract_interface.cc

diff --git a/interface/extract_interface.cc b/interface/extract_interface.cc
index db59342..5aa6294 100644 (file)
--- a/interface/extract_interface.cc
+++ b/interface/extract_interface.cc
@@ -145,12 +145,18 @@ static Driver *construct_driver(const char *binary, DiagnosticsEngine &Diags)
        return new Driver(binary, llvm::sys::getDefaultTargetTriple(),
                            "", false, false, Diags);
 }
-#else
+#elif defined(HAVE_ISPRODUCTION)
 static Driver *construct_driver(const char *binary, DiagnosticsEngine &Diags)
 {
        return new Driver(binary, llvm::sys::getDefaultTargetTriple(),
                            "", false, Diags);
 }
+#else
+static Driver *construct_driver(const char *binary, DiagnosticsEngine &Diags)
+{
+       return new Driver(binary, llvm::sys::getDefaultTargetTriple(),
+                           "", Diags);
+}
 #endif
 
 /* Create a CompilerInvocation object that stores the command line
@@ -232,12 +238,44 @@ static TargetInfo *create_target_info(CompilerInstance *Clang,
 
 #endif
 
+#ifdef CREATEDIAGNOSTICS_TAKES_ARG
+
+static void create_diagnostics(CompilerInstance *Clang)
+{
+       Clang->createDiagnostics(0, NULL, construct_printer());
+}
+
+#else
+
+static void create_diagnostics(CompilerInstance *Clang)
+{
+       Clang->createDiagnostics(construct_printer());
+}
+
+#endif
+
+#ifdef ADDPATH_TAKES_4_ARGUMENTS
+
+void add_path(HeaderSearchOptions &HSO, string Path)
+{
+       HSO.AddPath(Path, frontend::Angled, false, false);
+}
+
+#else
+
+void add_path(HeaderSearchOptions &HSO, string Path)
+{
+       HSO.AddPath(Path, frontend::Angled, true, false, false);
+}
+
+#endif
+
 int main(int argc, char *argv[])
 {
        llvm::cl::ParseCommandLineOptions(argc, argv);
 
        CompilerInstance *Clang = new CompilerInstance();
-       Clang->createDiagnostics(0, NULL, construct_printer());
+       create_diagnostics(Clang);
        DiagnosticsEngine &Diags = Clang->getDiagnostics();
        Diags.setSuppressSystemWarnings(true);
        CompilerInvocation *invocation =
@@ -256,7 +294,7 @@ int main(int argc, char *argv[])
        HSO.ResourceDir = ResourceDir;
 
        for (int i = 0; i < Includes.size(); ++i)
-               HSO.AddPath(Includes[i], frontend::Angled, true, false, false);
+               add_path(HSO, Includes[i]);
 
        PO.addMacroDef("__isl_give=__attribute__((annotate(\"isl_give\")))");
        PO.addMacroDef("__isl_keep=__attribute__((annotate(\"isl_keep\")))");