diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-07-06 10:47:07 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-07-07 17:29:18 -0300 |
| commit | 6af1d328969dfa4d67c7bfc483e2c7c344234045 (patch) | |
| tree | 0037ff3a3bff71f1bca9854aeecad47567147711 /community/rust/static-pie.patch | |
| parent | 4a0700ff403b63d8eb3257ebdf33ca51eed294de (diff) | |
| download | aports-6af1d328969dfa4d67c7bfc483e2c7c344234045.tar.bz2 aports-6af1d328969dfa4d67c7bfc483e2c7c344234045.tar.xz | |
community/rust: upgrade to 1.36.0
* Update alpine-target.patch to fix the triplet on armhf and add the armv7 and ppc64le
triplets. This should have been done in 69851bdae1177246337f51a35734e93f1fd7e3d3,
but has been forgotten.
* Remove the following patches:
* llvm-with-ffi.patch -> only required when statically linking LLVM
* bootstrap-tool-respect-tool-config.patch -> plain outdated, not required anymore
Diffstat (limited to 'community/rust/static-pie.patch')
| -rw-r--r-- | community/rust/static-pie.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/community/rust/static-pie.patch b/community/rust/static-pie.patch index 4f861466c1..4d0021aba5 100644 --- a/community/rust/static-pie.patch +++ b/community/rust/static-pie.patch @@ -72,9 +72,9 @@ library, just like static binaries, but more secure. pre_link_objects_exe: Vec::new(), pre_link_objects_dll: Vec::new(), post_link_objects: Vec::new(), ---- a/src/librustc_codegen_llvm/back/link.rs -+++ b/src/librustc_codegen_llvm/back/link.rs -@@ -994,13 +994,9 @@ +--- a/src/librustc_codegen_ssa/back/link.rs ++++ b/src/librustc_codegen_ssa/back/link.rs +@@ -1058,12 +1058,7 @@ let mut position_independent_executable = false; if t.options.position_independent_executables { @@ -83,10 +83,8 @@ library, just like static binaries, but more secure. - let more_args = &sess.opts.cg.link_arg; - let mut args = args.iter().chain(more_args.iter()).chain(used_link_args.iter()); - -+ let static_pie = t.options.static_position_independent_executables; - if get_reloc_model(sess) == llvm::RelocMode::PIC -- && !sess.crt_static() && !args.any(|x| *x == "-static") { -+ && (!sess.crt_static() || static_pie) { +- if is_pic(sess) && !sess.crt_static() && !args.any(|x| *x == "-static") { ++ if is_pic(sess) && (!sess.crt_static() || t.options.static_position_independent_executables) { position_independent_executable = true; } } |