package/rust/rustc/hotfix-musl-targets.prepatch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/rustc/hotfix-musl-targets.prepatch
   3 # Copyright (C) 2024 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This program is free software; you can redistribute it and/or modify
   9 # it under the terms of the GNU General Public License version 2.
  10 # --- T2-COPYRIGHT-NOTE-END ---
  11
  12 --- rustc-1.79.0-src/compiler/rustc_target/src/spec/base/linux_musl.rs.vanilla  2024-08-02 10:16:54.596002963 +0200
  13 +++ rustc-1.79.0-src/compiler/rustc_target/src/spec/base/linux_musl.rs  2024-08-02 10:21:23.559003806 +0200
  14 @@ -1,16 +1,16 @@
  15 -use crate::spec::crt_objects;
  16 -use crate::spec::{base, LinkSelfContainedDefault, TargetOptions};
  17 +use crate::spec::crt_objects;
  18 +use crate::spec::{base, LinkSelfContainedDefault, TargetOptions};
  19
  20  pub fn opts() -> TargetOptions {
  21      let mut base = base::linux::opts();
  22
  23      base.env = "musl".into();
  24 -    base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained();
  25 -    base.post_link_objects_self_contained = crt_objects::post_musl_self_contained();
  26 -    base.link_self_contained = LinkSelfContainedDefault::InferredForMusl;
  27 +    base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained();
  28 +    base.post_link_objects_self_contained = crt_objects::post_musl_self_contained();
  29 +    base.link_self_contained = LinkSelfContainedDefault::InferredForMusl;
  30
  31      // These targets statically link libc by default
  32 -    base.crt_static_default = true;
  33 +    //base.crt_static_default = true;
  34
  35      base
  36  }
  37
  38 --- rustc-1.79.0-src/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs.vanilla        2024-08-01 23:45:08.188465050 +0200
  39 +++ rustc-1.79.0-src/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs        2024-08-01 23:47:24.686465478 +0200
  40 @@ -7,7 +7,7 @@
  41      base.max_atomic_width = Some(64);
  42      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
  43      base.stack_probes = StackProbeType::Inline;
  44 -    base.static_position_independent_executables = true;
  45 +    //base.static_position_independent_executables = true;
  46      base.supported_sanitizers = SanitizerSet::ADDRESS
  47          | SanitizerSet::CFI
  48          | SanitizerSet::LEAK
  49 --- rustc-1.79.0-src/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs.vanilla 2024-08-01 23:45:44.042465162 +0200
  50 +++ rustc-1.79.0-src/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs 2024-08-01 23:47:17.156465454 +0200
  51 @@ -12,7 +12,7 @@
  52      base.features = "-vector".into();
  53      base.max_atomic_width = Some(64);
  54      base.min_global_align = Some(16);
  55 -    base.static_position_independent_executables = true;
  56 +    //base.static_position_independent_executables = true;
  57      base.stack_probes = StackProbeType::Inline;
  58      base.supported_sanitizers =
  59          SanitizerSet::ADDRESS | SanitizerSet::LEAK | SanitizerSet::MEMORY | SanitizerSet::THREAD;