remove lto support because it isn't compatible to rftrace

- remove obsolete "instrument" feature in applications, which aren't used as instrumentation examples
hermit-os · Jan 31, 2021 · c476784 · c476784
1 parent 997735f
commit c476784
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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