Unverified Commit 1a618770 authored by K900's avatar K900 Committed by GitHub
Browse files

nix-ld: 2.0.4 -> 2.0.5 (#425731)

parents 8b7df465 d709e791

pkgs/by-name/ni/nix-ld/package.nix

+3 −6
Original line number Diff line number Diff line
@@ -8,20 +8,17 @@ 


rustPlatform.buildRustPackage rec {

  pname = "nix-ld";

  version = "2.0.4";

  version = "2.0.5";



  src = fetchFromGitHub {

    owner = "nix-community";

    repo = "nix-ld";

    rev = version;

    hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk=";

    hash = "sha256-7ev9V128h7ZWi9JsFje6X1OzE5maJfmBMkxohxQysOA=";

  };



  # Submitted upstream: https://github.com/nix-community/nix-ld/pull/169

  patches = [ ./rust-1.88.patch ];



  useFetchCargoVendor = true;

  cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc=";

  cargoHash = "sha256-YR7j2dvZHMBUe0lW7GYFxJV11ZM+gX13NHj2uf3UEbQ=";



  hardeningDisable = [ "stackprotector" ];

pkgs/by-name/ni/nix-ld/rust-1.88.patch

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
diff --git a/src/arch.rs b/src/arch.rs

index a998697..45ec2cb 100644

--- a/src/arch.rs

+++ b/src/arch.rs

@@ -140,7 +140,7 @@ cfg_match! {

     target_arch = "x86_64" => {

         pub const ENTRY_TRAMPOLINE: Option<unsafe extern "C" fn() -> !> = Some(entry_trampoline);

 

-        #[naked]

+        #[unsafe(naked)]

         unsafe extern "C" fn entry_trampoline() -> ! {

             core::arch::naked_asm!(

                 "lea r10, [rip + {context}]",

@@ -159,7 +159,7 @@ cfg_match! {

     target_arch = "aarch64" => {

         pub const ENTRY_TRAMPOLINE: Option<unsafe extern "C" fn() -> !> = Some(entry_trampoline);

 

-        #[naked]

+        #[unsafe(naked)]

         unsafe extern "C" fn entry_trampoline() -> ! {

             core::arch::naked_asm!(

                 "adrp x8, {context}",

diff --git a/src/sys.rs b/src/sys.rs

index 109d809..bf085d9 100644

--- a/src/sys.rs

+++ b/src/sys.rs

@@ -181,6 +181,5 @@ pub fn new_slice_leak(size: usize) -> Option<&'static mut [u8]> {

 

 #[cfg(not(test))]

 #[lang = "eh_personality"]

-#[no_mangle]

 pub extern fn rust_eh_personality() {

 }