From bc22d1c009e321bd63ef295b2c72269c6832a201 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Tue, 31 Jan 2017 22:24:37 +0000
Subject: [PATCH] =?UTF-8?q?firmware:=20libksupport=20=E2=86=92=20ksupport.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The idea is that support libraries are called lib*, and the final
products that linked into an executable are not.
---
 artiq/firmware/Cargo.toml                           | 2 +-
 artiq/firmware/{libksupport => ksupport}/Cargo.toml | 0
 artiq/firmware/{libksupport => ksupport}/api.rs     | 0
 artiq/firmware/{libksupport => ksupport}/build.rs   | 0
 artiq/firmware/{libksupport => ksupport}/dyld.rs    | 0
 artiq/firmware/{libksupport => ksupport}/lib.rs     | 0
 artiq/firmware/{libksupport => ksupport}/rtio.rs    | 0
 artiq/runtime/Makefile                              | 4 ++--
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename artiq/firmware/{libksupport => ksupport}/Cargo.toml (100%)
 rename artiq/firmware/{libksupport => ksupport}/api.rs (100%)
 rename artiq/firmware/{libksupport => ksupport}/build.rs (100%)
 rename artiq/firmware/{libksupport => ksupport}/dyld.rs (100%)
 rename artiq/firmware/{libksupport => ksupport}/lib.rs (100%)
 rename artiq/firmware/{libksupport => ksupport}/rtio.rs (100%)

diff --git a/artiq/firmware/Cargo.toml b/artiq/firmware/Cargo.toml
index 6af1a7ffb..af13ba5ff 100644
--- a/artiq/firmware/Cargo.toml
+++ b/artiq/firmware/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["runtime", "libksupport", "satman"]
+members = ["runtime", "ksupport", "satman"]
diff --git a/artiq/firmware/libksupport/Cargo.toml b/artiq/firmware/ksupport/Cargo.toml
similarity index 100%
rename from artiq/firmware/libksupport/Cargo.toml
rename to artiq/firmware/ksupport/Cargo.toml
diff --git a/artiq/firmware/libksupport/api.rs b/artiq/firmware/ksupport/api.rs
similarity index 100%
rename from artiq/firmware/libksupport/api.rs
rename to artiq/firmware/ksupport/api.rs
diff --git a/artiq/firmware/libksupport/build.rs b/artiq/firmware/ksupport/build.rs
similarity index 100%
rename from artiq/firmware/libksupport/build.rs
rename to artiq/firmware/ksupport/build.rs
diff --git a/artiq/firmware/libksupport/dyld.rs b/artiq/firmware/ksupport/dyld.rs
similarity index 100%
rename from artiq/firmware/libksupport/dyld.rs
rename to artiq/firmware/ksupport/dyld.rs
diff --git a/artiq/firmware/libksupport/lib.rs b/artiq/firmware/ksupport/lib.rs
similarity index 100%
rename from artiq/firmware/libksupport/lib.rs
rename to artiq/firmware/ksupport/lib.rs
diff --git a/artiq/firmware/libksupport/rtio.rs b/artiq/firmware/ksupport/rtio.rs
similarity index 100%
rename from artiq/firmware/libksupport/rtio.rs
rename to artiq/firmware/ksupport/rtio.rs
diff --git a/artiq/runtime/Makefile b/artiq/runtime/Makefile
index 45f76b7fc..ed2d05d33 100644
--- a/artiq/runtime/Makefile
+++ b/artiq/runtime/Makefile
@@ -48,12 +48,12 @@ runtime.elf: $(RUSTOUT)/libruntime.a flash_storage.o ksupport_data.o
 	@chmod -x $@
 
 .PHONY: $(RUSTOUT_KSUPPORT)/libksupport.a
-$(RUSTOUT_KSUPPORT)/libksupport.a:
+$(RUSTOUT_KSUPPORT)/ksupport.a:
 	$(CARGO) \
 		RUSTFLAGS="-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=unwind" \
 		CARGO_TARGET_DIR=$(realpath .)/cargo-ksupport \
 			cargo build --target=or1k-unknown-none \
-				--manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/libksupport/Cargo.toml)
+				--manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/ksupport/Cargo.toml)
 
 ksupport.elf: $(RUSTOUT_KSUPPORT)/libksupport.a ksupport_glue.o artiq_personality.o
 	$(LD) $(LDFLAGS) \