modernize build system and cleanup dependencies

2020-05-30 13:57:01 +02:00
parent 0ff6ccf9e2
commit 10797a473d
12 changed files with 104 additions and 205 deletions
--- a/src/iss/mnrv32.cpp
+++ b/src/iss/mnrv32.cpp
@@ -33,16 +33,8 @@
 #include "util/ities.h"
 #include <util/logging.h>

-#include <elfio/elfio.hpp>
 #include <iss/arch/mnrv32.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
 #include <cstdio>
 #include <cstring>
 #include <fstream>
--- a/src/iss/rv32gc.cpp
+++ b/src/iss/rv32gc.cpp
@@ -33,16 +33,8 @@
 #include "util/ities.h"
 #include <util/logging.h>

-#include <elfio/elfio.hpp>
 #include <iss/arch/rv32gc.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
 #include <fstream>
 #include <cstdio>
 #include <cstring>
--- a/src/iss/rv32imac.cpp
+++ b/src/iss/rv32imac.cpp
@@ -33,16 +33,8 @@
 #include "util/ities.h"
 #include <util/logging.h>

-#include <elfio/elfio.hpp>
 #include <iss/arch/rv32imac.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
 #include <cstdio>
 #include <cstring>
 #include <fstream>
--- a/src/iss/rv64gc.cpp
+++ b/src/iss/rv64gc.cpp
@@ -35,16 +35,8 @@
 #include "util/ities.h"
 #include <util/logging.h>

-#include <elfio/elfio.hpp>
 #include <iss/arch/rv64gc.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
 #include <cstdio>
 #include <cstring>
 #include <fstream>
--- a/src/iss/rv64i.cpp
+++ b/src/iss/rv64i.cpp
@@ -33,16 +33,8 @@
 #include "util/ities.h"
 #include <util/logging.h>

-#include <elfio/elfio.hpp>
 #include <iss/arch/rv64i.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
 #include <cstdio>
 #include <cstring>
 #include <fstream>