summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-02-02 17:36:34 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-03 21:45:49 +0000
commit22cfb4693ac6329a70c3a5ea9493f0798bfcebe0 (patch)
tree7f5e579b30b1d23b34d15f4e1e772473144d58f5
parentb9b33e32e681098dbe677c4761eebb05d2df7424 (diff)
downloadpoky-22cfb4693ac6329a70c3a5ea9493f0798bfcebe0.tar.gz
musl: Drop adding .file directive in asm files
it was a workaround for binutils issue which is fixed in 2.36 with https://sourceware.org/bugzilla/show_bug.cgi?id=26822 (From OE-Core rev: 628668acdd897d79154ebc304edef8a95ff54ac5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch245
-rw-r--r--meta/recipes-core/musl/musl_git.bb1
2 files changed, 0 insertions, 246 deletions
diff --git a/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch b/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch
deleted file mode 100644
index 1cd08cdcd4..0000000000
--- a/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch
+++ /dev/null
@@ -1,245 +0,0 @@
1From b0124f3c4f2a353506621d387135ebea6b8c6609 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Oct 2020 22:40:53 -0700
4Subject: [PATCH] crt: Add .file directive
5
6Musl linked binaries come out to be not reproducible because
7absolute build path is seen in debug info of crti.o and crtn.o
8This is due to the fact that these objects are built from assembly
9source files and they are missing .file directive
10if we add .file <filename>.s in them then debug info encodes this
11value instead of absolute path in debug_line section
12
13fixed in binutils 2.36 [1]
14
15[1] https://sourceware.org/bugzilla/show_bug.cgi?id=26822
16
17Upstream-Status: OE-Specific [ Drop when upgrading binutils 2.36+ ]
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 crt/aarch64/crti.s | 1 +
21 crt/aarch64/crtn.s | 1 +
22 crt/arm/crti.s | 1 +
23 crt/arm/crtn.s | 1 +
24 crt/i386/crti.s | 1 +
25 crt/i386/crtn.s | 1 +
26 crt/microblaze/crti.s | 1 +
27 crt/microblaze/crtn.s | 1 +
28 crt/mips/crti.s | 1 +
29 crt/mips/crtn.s | 1 +
30 crt/mips64/crti.s | 1 +
31 crt/mips64/crtn.s | 1 +
32 crt/mipsn32/crti.s | 1 +
33 crt/mipsn32/crtn.s | 1 +
34 crt/or1k/crti.s | 1 +
35 crt/or1k/crtn.s | 1 +
36 crt/powerpc/crti.s | 1 +
37 crt/powerpc/crtn.s | 1 +
38 crt/powerpc64/crti.s | 1 +
39 crt/powerpc64/crtn.s | 1 +
40 crt/s390x/crti.s | 1 +
41 crt/s390x/crtn.s | 1 +
42 crt/sh/crti.s | 1 +
43 crt/sh/crtn.s | 1 +
44 crt/x32/crti.s | 1 +
45 crt/x32/crtn.s | 1 +
46 crt/x86_64/crti.s | 1 +
47 crt/x86_64/crtn.s | 1 +
48 28 files changed, 28 insertions(+)
49
50--- a/crt/aarch64/crti.s
51+++ b/crt/aarch64/crti.s
52@@ -1,3 +1,4 @@
53+.file "crti.s"
54 .section .init
55 .global _init
56 .type _init,%function
57--- a/crt/aarch64/crtn.s
58+++ b/crt/aarch64/crtn.s
59@@ -1,3 +1,4 @@
60+.file "crtn.s"
61 .section .init
62 ldp x29,x30,[sp],#16
63 ret
64--- a/crt/arm/crti.s
65+++ b/crt/arm/crti.s
66@@ -1,3 +1,4 @@
67+.file "crti.s"
68 .syntax unified
69
70 .section .init
71--- a/crt/arm/crtn.s
72+++ b/crt/arm/crtn.s
73@@ -1,3 +1,4 @@
74+.file "crtn.s"
75 .syntax unified
76
77 .section .init
78--- a/crt/i386/crti.s
79+++ b/crt/i386/crti.s
80@@ -1,3 +1,4 @@
81+.file "crti.s"
82 .section .init
83 .global _init
84 _init:
85--- a/crt/i386/crtn.s
86+++ b/crt/i386/crtn.s
87@@ -1,3 +1,4 @@
88+.file "crtn.s"
89 .section .init
90 add $12,%esp
91 ret
92--- a/crt/microblaze/crti.s
93+++ b/crt/microblaze/crti.s
94@@ -1,3 +1,4 @@
95+.file "crti.s"
96 .section .init
97 .global _init
98 .align 2
99--- a/crt/microblaze/crtn.s
100+++ b/crt/microblaze/crtn.s
101@@ -1,3 +1,4 @@
102+.file "crtn.s"
103 .section .init
104 lwi r15, r1, 0
105 rtsd r15, 8
106--- a/crt/mips/crti.s
107+++ b/crt/mips/crti.s
108@@ -1,3 +1,4 @@
109+.file "crti.s"
110 .set noreorder
111
112 .section .init
113--- a/crt/mips/crtn.s
114+++ b/crt/mips/crtn.s
115@@ -1,3 +1,4 @@
116+.file "crtn.s"
117 .set noreorder
118
119 .section .init
120--- a/crt/mips64/crti.s
121+++ b/crt/mips64/crti.s
122@@ -1,3 +1,4 @@
123+.file "crti.s"
124 .set noreorder
125
126 .section .init
127--- a/crt/mips64/crtn.s
128+++ b/crt/mips64/crtn.s
129@@ -1,3 +1,4 @@
130+.file "crtn.s"
131 .set noreorder
132
133 .section .init
134--- a/crt/mipsn32/crti.s
135+++ b/crt/mipsn32/crti.s
136@@ -1,3 +1,4 @@
137+.file "crti.s"
138 .set noreorder
139 .section .init
140 .global _init
141--- a/crt/mipsn32/crtn.s
142+++ b/crt/mipsn32/crtn.s
143@@ -1,3 +1,4 @@
144+.file "crtn.s"
145 .set noreorder
146 .section .init
147 ld $gp, 16($sp)
148--- a/crt/or1k/crti.s
149+++ b/crt/or1k/crti.s
150@@ -1,3 +1,4 @@
151+.file "crti.s"
152 .section .init
153 .global _init
154 _init:
155--- a/crt/or1k/crtn.s
156+++ b/crt/or1k/crtn.s
157@@ -1,3 +1,4 @@
158+.file "crtn.s"
159 .section .init
160 l.lwz r9,0(r1)
161 l.jr r9
162--- a/crt/powerpc/crti.s
163+++ b/crt/powerpc/crti.s
164@@ -1,3 +1,4 @@
165+.file "crti.s"
166 .section .init
167 .align 2
168 .global _init
169--- a/crt/powerpc/crtn.s
170+++ b/crt/powerpc/crtn.s
171@@ -1,3 +1,4 @@
172+.file "crtn.s"
173 .section .init
174 .align 2
175 lwz 0,36(1)
176--- a/crt/powerpc64/crti.s
177+++ b/crt/powerpc64/crti.s
178@@ -1,3 +1,4 @@
179+.file "crti.s"
180 .section .init
181 .align 2
182 .global _init
183--- a/crt/powerpc64/crtn.s
184+++ b/crt/powerpc64/crtn.s
185@@ -1,3 +1,4 @@
186+.file "crtn.s"
187 .section .init
188 .align 2
189 addi 1, 1, 32
190--- a/crt/s390x/crti.s
191+++ b/crt/s390x/crti.s
192@@ -1,3 +1,4 @@
193+.file "crti.s"
194 .section .init
195 .align 2
196 .global _init
197--- a/crt/s390x/crtn.s
198+++ b/crt/s390x/crtn.s
199@@ -1,3 +1,4 @@
200+.file "crtn.s"
201 .section .init
202 .align 2
203 lmg %r14, %r15, 272(%r15)
204--- a/crt/sh/crti.s
205+++ b/crt/sh/crti.s
206@@ -1,3 +1,4 @@
207+.file "crti.s"
208 .section .init
209 .global _init
210 .type _init, @function
211--- a/crt/sh/crtn.s
212+++ b/crt/sh/crtn.s
213@@ -1,3 +1,4 @@
214+.file "crtn.s"
215 .section .init
216 lds.l @r15+, pr
217 mov.l @r15+, r14
218--- a/crt/x32/crti.s
219+++ b/crt/x32/crti.s
220@@ -1,3 +1,4 @@
221+.file "crti.s"
222 .section .init
223 .global _init
224 _init:
225--- a/crt/x32/crtn.s
226+++ b/crt/x32/crtn.s
227@@ -1,3 +1,4 @@
228+.file "crtn.s"
229 .section .init
230 pop %rax
231 ret
232--- a/crt/x86_64/crti.s
233+++ b/crt/x86_64/crti.s
234@@ -1,3 +1,4 @@
235+.file "crti.s"
236 .section .init
237 .global _init
238 _init:
239--- a/crt/x86_64/crtn.s
240+++ b/crt/x86_64/crtn.s
241@@ -1,3 +1,4 @@
242+.file "crtn.s"
243 .section .init
244 pop %rax
245 ret
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 265f79f2fd..249ce53521 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}"
15SRC_URI = "git://git.musl-libc.org/musl \ 15SRC_URI = "git://git.musl-libc.org/musl \
16 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ 16 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
17 file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ 17 file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
18 file://0001-crt-Add-.file-directive.patch \
19 " 18 "
20 19
21S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"