From 10d237eefef2e8171f30054aaa09c82ed03bfc56 Mon Sep 17 00:00:00 2001
From: Zuzana Baranova <xbaranov@fi.muni.cz>
Date: Fri, 6 Jul 2018 07:48:32 +0000
Subject: [PATCH] tools: Account for changes in rt (paths.hpp move, DiosCC
rename).
---
tools/divcc.cpp | 8 ++++----
tools/runtime-cc.cpp | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/divcc.cpp b/tools/divcc.cpp
index fd9d1f2e0..7a1fd87bd 100644
--- a/tools/divcc.cpp
+++ b/tools/divcc.cpp
@@ -1,5 +1,5 @@
#include <divine/cc/cc1.hpp>
-#include <divine/cc/driver.hpp>
+#include <divine/rt/dios-cc.hpp>
#include <divine/rt/runtime.hpp>
#include <divine/vm/xg-code.hpp>
@@ -129,7 +129,7 @@ std::unique_ptr< llvm::Module > llvmExtract( std::vector< std::pair< std::string
{
using FileType = cc::FileType;
using namespace brick::types;
- std::unique_ptr< cc::DiosDriver > drv = std::unique_ptr< cc::DiosDriver >( new cc::DiosDriver( clang.context() ) );
+ std::unique_ptr< rt::DiosCC > drv = std::unique_ptr< rt::DiosCC >( new rt::DiosCC( clang.context() ) );
for ( auto file : files )
{
@@ -155,7 +155,7 @@ std::unique_ptr< llvm::Module > llvmExtract( std::vector< std::pair< std::string
}
drv->linkEssentials();
- drv->linkLibs( cc::DiosDriver::defaultDIVINELibs );
+ drv->linkLibs( rt::DiosCC::defaultDIVINELibs );
auto m = drv->takeLinked();
@@ -188,7 +188,7 @@ int main( int argc, char **argv )
using brick::fs::joinPath;
using brick::fs::splitFileName;
- using divine::cc::includeDir;
+ using divine::rt::includeDir;
po.opts.insert( po.opts.end(), {
"-isystem", joinPath( includeDir, "libcxx/include" )
diff --git a/tools/runtime-cc.cpp b/tools/runtime-cc.cpp
index 14303c8ff..d76da34d5 100644
--- a/tools/runtime-cc.cpp
+++ b/tools/runtime-cc.cpp
@@ -1,5 +1,5 @@
#include <divine/cc/cc1.hpp>
-#include <divine/cc/paths.hpp>
+#include <divine/rt/paths.hpp>
DIVINE_RELAX_WARNINGS
#include <llvm/Bitcode/BitcodeWriter.h>
@@ -51,7 +51,7 @@ int main( int argc, const char **argv )
if ( !relpath.empty() ) {
while ( fs::isPathSeparator( relpath[0] ) )
relpath.erase( relpath.begin() );
- return fs::joinPath( cc::directory( relpath ), relpath );
+ return fs::joinPath( rt::directory( relpath ), relpath );
}
return p;
} );
--
GitLab