Amjad50/Emerald: renamed amjad_os to emerald and related changes

Author: Amjad50

Cargo.lock

@@ -81,29 +81,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9"
 
-[[package]]
-name = "amjad_os_kernel_user_link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17549aafd3a6df6860b12329aff74941c7669483d0adaaf634f5e6aebff0639e"
-dependencies = [
- "compiler_builtins",
- "rustc-std-workspace-core",
-]
-
-[[package]]
-name = "amjad_os_user_std"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d84fa958dc7be5b9c3a3f213869e53dd18bf8f4abee33f4bb620d94070226ba1"
-dependencies = [
- "amjad_os_kernel_user_link",
- "compiler_builtins",
- "increasing_heap_allocator",
- "rustc-std-workspace-alloc",
- "rustc-std-workspace-core",
-]
-
 [[package]]
 name = "ammonia"
 version = "3.3.0"
@@ -1214,6 +1191,29 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "emerald_kernel_user_link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0785bd57d8819d6796c5d92f9406c8e83fa3317cf62abfcd9a3f0c48862a7a37"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "emerald_std"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24cefaf4e212b4da00f133b09e689ecdc1a00ac7f58fe03d530206f315a6eb42"
+dependencies = [
+ "compiler_builtins",
+ "emerald_kernel_user_link",
+ "increasing_heap_allocator",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
 [[package]]
 name = "ena"
 version = "0.14.2"
@@ -5110,11 +5110,11 @@ version = "0.0.0"
 dependencies = [
  "addr2line",
  "alloc",
- "amjad_os_user_std",
  "cfg-if",
  "compiler_builtins",
  "core",
  "dlmalloc",
+ "emerald_std",
  "fortanix-sgx-abi",
  "hashbrown",
  "hermit-abi",

compiler/rustc_target/src/spec/base/amjad_os.rs renamed to compiler/rustc_target/src/spec/base/emerald.rs

@@ -2,7 +2,7 @@ use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, TargetOptions};
 
 pub fn opts() -> TargetOptions {
     TargetOptions {
-        os: "amjad_os".into(),
+        os: "emerald".into(),
         linker: Some("rust-lld".into()),
         linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
         // tls_model: TlsModel::InitialExec,

compiler/rustc_target/src/spec/base/mod.rs

@@ -1,10 +1,10 @@
 pub(crate) mod aix;
-pub(crate) mod amjad_os;
 pub(crate) mod android;
 pub(crate) mod apple;
 pub(crate) mod avr_gnu;
 pub(crate) mod bpf;
 pub(crate) mod dragonfly;
+pub(crate) mod emerald;
 pub(crate) mod freebsd;
 pub(crate) mod fuchsia;
 pub(crate) mod haiku;

compiler/rustc_target/src/spec/mod.rs

@@ -1679,7 +1679,7 @@ supported_targets! {
     ("armv7-unknown-linux-ohos", armv7_unknown_linux_ohos),
     ("x86_64-unknown-linux-ohos", x86_64_unknown_linux_ohos),
 
-    ("x86_64-unknown-amjad_os", x86_64_unknown_amjad_os),
+    ("x86_64-unknown-emerald", x86_64_unknown_emerald),
 }
 
 /// Cow-Vec-Str: Cow<'static, [Cow<'static, str>]>

compiler/rustc_target/src/spec/targets/x86_64_unknown_amjad_os.rs renamed to compiler/rustc_target/src/spec/targets/x86_64_unknown_emerald.rs

@@ -13,7 +13,7 @@ pub fn target() -> Target {
             plt_by_default: false,
             max_atomic_width: Some(64),
             stack_probes: StackProbeType::Inline,
-            ..base::amjad_os::opts()
+            ..base::emerald::opts()
         },
     }
 }

library/panic_abort/src/lib.rs

@@ -46,7 +46,7 @@ pub unsafe fn __rust_start_panic(_payload: &mut dyn PanicPayload) -> u32 {
                             all(target_vendor = "fortanix", target_env = "sgx"),
                             target_os = "xous",
                             target_os = "uefi",
-                            target_os = "amjad_os"
+                            target_os = "emerald"
         ))] {
             unsafe fn abort() -> ! {
                 // call std::sys::abort_internal

library/std/Cargo.toml

@@ -57,9 +57,9 @@ wasi = { version = "0.11.0", features = ['rustc-dep-of-std'], default-features =
 r-efi = { version = "4.2.0", features = ['rustc-dep-of-std']}
 r-efi-alloc = { version = "1.0.0", features = ['rustc-dep-of-std']}
 
-[target.'cfg(target_os = "amjad_os")'.dependencies]
-# This is from `https://github.com/Amjad50/OS`, i.e. it must be run from that context
-user_std = { version = "0.2.2", package = "amjad_os_user_std", features = ['rustc-dep-of-std'] }
+[target.'cfg(target_os = "emerald")'.dependencies]
+# This is from `https://github.com/Amjad50/Emerald`, i.e. it must be run from that context
+user_std = { version = "0.2.2", package = "emerald_std", features = ['rustc-dep-of-std'] }
 
 [features]
 backtrace = [

library/std/build.rs

@@ -35,7 +35,7 @@ fn main() {
         || target.contains("hurd")
         || target.contains("uefi")
         || target.contains("teeos")
-        || target.contains("amjad_os")
+        || target.contains("emerald")
         // See src/bootstrap/synthetic_targets.rs
         || env::var("RUSTC_BOOTSTRAP_SYNTHETIC_TARGET").is_ok()
     {