From c47678462743e4e589486ba3044e34ff26bd5858 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
Date: Sun, 31 Jan 2021 14:37:41 +0100
Subject: [PATCH] remove lto support because it isn't compatible to rftrace

- remove obsolete "instrument" feature in applications,
  which aren't used as instrumentation examples
---
 .github/workflows/test.yml  |  2 --
 .gitlab-ci.yml              |  4 ++--
 Cargo.lock                  | 11 +++++++++++
 Cargo.toml                  |  2 +-
 benches/micro/Cargo.toml    |  3 +--
 benches/netbench/Cargo.toml |  1 -
 examples/httpd/Cargo.toml   |  1 -
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2ebc7db97..7ca04d371 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -75,8 +75,6 @@ jobs:
     - name: Building release version
       run:
          cargo build -p rusty_demo -Z build-std=std,core,alloc,panic_abort --target x86_64-unknown-hermit --release
-      env:
-         RUSTFLAGS: -Clinker-plugin-lto
     - name: Build loader (unix)
       working-directory: loader
       run: make
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5bbc5e92..eb4528b04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build:demo:
   image: ${CI_REGISTRY_IMAGE}
   script:
     - cargo build -p rusty_demo
-    - RUSTFLAGS="-Clinker-plugin-lto" cargo build -p rusty_demo --release
+    - cargo build -p rusty_demo --release
   artifacts:
     paths:
       - target/x86_64-unknown-hermit/debug/rusty_demo
@@ -48,7 +48,7 @@ build:httpd:
   stage: build
   image: ${CI_REGISTRY_IMAGE}
   script:
-    - RUSTFLAGS="-Clinker-plugin-lto" cargo build --manifest-path examples/httpd/Cargo.toml --no-default-features --features pci,acpi,smoltcp,vga,dhcpv4 --release
+    - cargo build --manifest-path examples/httpd/Cargo.toml --no-default-features --features pci,acpi,smoltcp,vga,dhcpv4 --release
   artifacts:
     paths:
       - target/x86_64-unknown-hermit/release/httpd
diff --git a/Cargo.lock b/Cargo.lock
index b777e7a9c..51ad58e02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -250,6 +250,7 @@ name = "hello_world"
 version = "0.1.0"
 dependencies = [
  "hermit-sys",
+ "rftrace-frontend",
 ]
 
 [[package]]
@@ -655,6 +656,15 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa2ee2d77e97cb948eb4576a5b7908aac75c02afa337c99aa34b9cef0346bedd"
 
+[[package]]
+name = "rftrace-frontend"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419a5a276d688261074e7356d4061628dca7b0987f9422eeed4c66ecc128639a"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "rust-tcp-io-perf"
 version = "0.0.0"
@@ -689,6 +699,7 @@ dependencies = [
  "hermit-sys",
  "num_cpus",
  "rayon",
+ "rftrace-frontend",
  "syscalls",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index e5121bea3..7937eeacf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ exclude = ["target", "loader", "libhermit-rs"]
 opt-level = 3
 debug = false
 rpath = false
-lto = "thin"
+lto = false
 debug-assertions = false
 
 [profile.dev]
diff --git a/benches/micro/Cargo.toml b/benches/micro/Cargo.toml
index 24f63dd62..2c7363b40 100644
--- a/benches/micro/Cargo.toml
+++ b/benches/micro/Cargo.toml
@@ -27,13 +27,12 @@ pci = ["hermit-sys/pci"]
 acpi = ["hermit-sys/acpi"]
 fsgsbase = ["hermit-sys/fsgsbase"]
 smp = ["hermit-sys/smp"]
-instrument = ["hermit-sys/instrument"]
 
 [profile.release]
 opt-level = 3
 debug = false
 rpath = false
-lto = true
+lto = false
 debug-assertions = false
 
 [profile.dev]
diff --git a/benches/netbench/Cargo.toml b/benches/netbench/Cargo.toml
index 27ed16e1b..e15587a87 100644
--- a/benches/netbench/Cargo.toml
+++ b/benches/netbench/Cargo.toml
@@ -27,7 +27,6 @@ acpi = ["hermit-sys/acpi"]
 fsgsbase = ["hermit-sys/fsgsbase"]
 smp = ["hermit-sys/smp"]
 smoltcp = ["hermit-sys/smoltcp"]
-instrument = ["hermit-sys/instrument"]
 
 [[bin]]
 name = "server-bw"
diff --git a/examples/httpd/Cargo.toml b/examples/httpd/Cargo.toml
index bae1b4240..a9bfb42dd 100644
--- a/examples/httpd/Cargo.toml
+++ b/examples/httpd/Cargo.toml
@@ -23,7 +23,6 @@ acpi = ["hermit-sys/acpi"]
 fsgsbase = ["hermit-sys/fsgsbase"]
 smp = ["hermit-sys/smp"]
 smoltcp = ["hermit-sys/smoltcp"]
-instrument = ["hermit-sys/instrument"]
 
 [profile.release]
 opt-level = 3