diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-03-20 15:25:48 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-03-21 08:15:29 +0200 |
| commit | 1a4d299a0242a02aa0d4843dd9947d4187e70414 (patch) | |
| tree | 524965445ca8c9eba7f425db6ffb2035d8025500 /main/musl/0011-fix-build-regression-in-arm-atomics-asm-with-new-bin.patch | |
| parent | c12931e8863fa9fddc90390db24a4a591f43043e (diff) | |
| download | aports-1a4d299a0242a02aa0d4843dd9947d4187e70414.tar.bz2 aports-1a4d299a0242a02aa0d4843dd9947d4187e70414.tar.xz | |
main/musl: cherry-pick upstream fixes
ldso changes (lazy emulation etc) are not stable yet, so it's
are not included. the missing patch numbers are for those commits.
Diffstat (limited to 'main/musl/0011-fix-build-regression-in-arm-atomics-asm-with-new-bin.patch')
| -rw-r--r-- | main/musl/0011-fix-build-regression-in-arm-atomics-asm-with-new-bin.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/main/musl/0011-fix-build-regression-in-arm-atomics-asm-with-new-bin.patch b/main/musl/0011-fix-build-regression-in-arm-atomics-asm-with-new-bin.patch new file mode 100644 index 0000000000..37373594e2 --- /dev/null +++ b/main/musl/0011-fix-build-regression-in-arm-atomics-asm-with-new-bin.patch @@ -0,0 +1,40 @@ +From b261a24256792177a5f0531dbb25cc6267220ca5 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Wed, 15 Feb 2017 17:05:50 -0500 +Subject: [PATCH] fix build regression in arm atomics asm with new binutils + +binutils commit bada43421274615d0d5f629a61a60b7daa71bc15 tightened +immediate fixup handling in gas in such a way that the final .arch of +an object file must be compatible with the fixups used when the +instruction was assembled; this in turn broke assembling of atomics.s, +at least in thumb mode. + +it's not clear whether this should be considered a bug in gas, but +.object_arch is preferable anyway for our purpose here of controlling +the ISA level tag on the object file being produced, and it's the +intended directive for use in object files with runtime code +selection. research by Szabolcs Nagy confirmed that .object_arch is +supported in all relevant versions of binutils and clang's integrated +assembler. + +patch by Reiner Herrmann. +--- + src/thread/arm/atomics.s | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/thread/arm/atomics.s b/src/thread/arm/atomics.s +index 202faa4a..101ad391 100644 +--- a/src/thread/arm/atomics.s ++++ b/src/thread/arm/atomics.s +@@ -84,7 +84,7 @@ __a_gettp_cp15: + bx lr + + /* Tag this file with minimum ISA level so as not to affect linking. */ +-.arch armv4t ++.object_arch armv4t + .eabi_attribute 6,2 + + .data +-- +2.11.1 + |