gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix-ld: 2.0.3 -> 2.0.4

Browse Source 
https://github.com/nix-community/nix-ld/releases/tag/2.0.4
This commit is contained in:
João Nogueira
2025-04-17 01:14:55 +02:00
parent bf35e5f293
commit 1c8f173ccd
2 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ni/nix-ld/package.nix
+3 -5
View File
@@ -8,19 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "nix-ld";
version = "2.0.3";
version = "2.0.4";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-ld";
rev = version;
hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";
hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk=";
};
patches = [ ./rust-1.83.patch ];
useFetchCargoVendor = true;
cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4=";
cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc=";
hardeningDisable = [ "stackprotector" ];
pkgs/by-name/ni/nix-ld/rust-1.83.patch
-36
View File
@@ -1,36 +0,0 @@
--- a/src/arch.rs
+++ b/src/arch.rs
@@ -142,7 +142,7 @@ cfg_match! {
#[naked]
unsafe extern "C" fn entry_trampoline() -> ! {
- core::arch::asm!(
+ core::arch::naked_asm!(
"lea r10, [rip + {context}]",
"mov r11, [r10 + {size} * 1]", // .env_entry
"test r11, r11",
@@ -153,7 +153,6 @@ cfg_match! {
"jmp [rip + {context}]",
context = sym TRAMPOLINE_CONTEXT,
size = const core::mem::size_of::<*const u8>(),
- options(noreturn),
)
}
}
@@ -162,7 +161,7 @@ cfg_match! {
#[naked]
unsafe extern "C" fn entry_trampoline() -> ! {
- core::arch::asm!(
+ core::arch::naked_asm!(
"adrp x8, {context}",
"ldr x9, [x8, {env_entry_off}]", // .env_entry
"cbz x9, 2f",
@@ -174,7 +173,6 @@ cfg_match! {
context = sym TRAMPOLINE_CONTEXT,
env_entry_off = const TrampolineContext::ENV_ENTRY_OFFSET,
env_string_off = const TrampolineContext::ENV_STRING_OFFSET,
- options(noreturn),
)
}
}