diff options
3 files changed, 244 insertions, 49 deletions
diff --git a/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch b/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch deleted file mode 100644 index c2ac49e58f..0000000000 --- a/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <Mingli.Yu@windriver.com> | ||
3 | Date: Fri, 15 Jun 2018 16:21:56 +0800 | ||
4 | Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section | ||
5 | |||
6 | Set .file section explicitly for .S files to avoid | ||
7 | the linker introduces the host path in symbols for | ||
8 | object files whose source file is .S | ||
9 | Otherwise, there is a host path in the symbols as below: | ||
10 | $ readelf --wide --symbols /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/libboost_context.so.1.67.0 | ||
11 | |||
12 | 42: 0000000000000000 0 FILE LOCAL DEFAULT ABS /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/asm/make_x86_64_sysv_elf_gas.o | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
17 | --- | ||
18 | libs/context/src/asm/make_i386_sysv_elf_gas.S | 1 + | ||
19 | libs/context/src/asm/make_x86_64_sysv_elf_gas.S | 1 + | ||
20 | 2 files changed, 2 insertions(+) | ||
21 | |||
22 | diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S | ||
23 | index de77e88..b76de26 100644 | ||
24 | --- a/libs/context/src/asm/make_i386_sysv_elf_gas.S | ||
25 | +++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S | ||
26 | @@ -24,6 +24,7 @@ | ||
27 | * * | ||
28 | ****************************************************************************************/ | ||
29 | |||
30 | +.file "make_i386_sysv_elf_gas.S" | ||
31 | .text | ||
32 | .globl make_fcontext | ||
33 | .align 2 | ||
34 | diff --git a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S | ||
35 | index 25a0c00..0ef3756 100644 | ||
36 | --- a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S | ||
37 | +++ b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S | ||
38 | @@ -24,6 +24,7 @@ | ||
39 | * * | ||
40 | ****************************************************************************************/ | ||
41 | |||
42 | +.file "make_x86_64_sysv_elf_gas.S" | ||
43 | .text | ||
44 | .globl make_fcontext | ||
45 | .type make_fcontext,@function | ||
46 | -- | ||
47 | 2.7.4 | ||
48 | |||
diff --git a/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch new file mode 100644 index 0000000000..155653316c --- /dev/null +++ b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch | |||
@@ -0,0 +1,243 @@ | |||
1 | Author: Douglas Royds <douglas.royds@taitradio.com> | ||
2 | Date: Thu Nov 22 09:34:22 2018 +1300 | ||
3 | |||
4 | Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker | ||
5 | adding a host build-system path as a FILE symbol to the object file. | ||
6 | |||
7 | This replaces the existing patch that added the .file directive to a small | ||
8 | subset of these files. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/boostorg/context/issues/91] | ||
11 | Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> | ||
12 | |||
13 | diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S | ||
14 | --- boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
15 | +++ boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-22 09:04:27.900876941 +1300 | ||
16 | @@ -51,6 +51,7 @@ | ||
17 | * * | ||
18 | *******************************************************/ | ||
19 | |||
20 | +.file "jump_arm64_aapcs_elf_gas.S" | ||
21 | .text | ||
22 | .align 2 | ||
23 | .global jump_fcontext | ||
24 | diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S | ||
25 | --- boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
26 | +++ boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-22 09:04:28.876898240 +1300 | ||
27 | @@ -38,6 +38,7 @@ | ||
28 | * * | ||
29 | *******************************************************/ | ||
30 | |||
31 | +.file "jump_arm_aapcs_elf_gas.S" | ||
32 | .text | ||
33 | .globl jump_fcontext | ||
34 | .align 2 | ||
35 | diff -ur boost_1_68_0.original/libs/context/src/asm/jump_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_i386_sysv_elf_gas.S | ||
36 | --- boost_1_68_0.original/libs/context/src/asm/jump_i386_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
37 | +++ boost_1_68_0/libs/context/src/asm/jump_i386_sysv_elf_gas.S 2018-11-22 09:04:29.904920674 +1300 | ||
38 | @@ -24,6 +24,7 @@ | ||
39 | * * | ||
40 | ****************************************************************************************/ | ||
41 | |||
42 | +.file "jump_i386_sysv_elf_gas.S" | ||
43 | .text | ||
44 | .globl jump_fcontext | ||
45 | .align 2 | ||
46 | diff -ur boost_1_68_0.original/libs/context/src/asm/jump_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_mips32_o32_elf_gas.S | ||
47 | --- boost_1_68_0.original/libs/context/src/asm/jump_mips32_o32_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
48 | +++ boost_1_68_0/libs/context/src/asm/jump_mips32_o32_elf_gas.S 2018-11-22 09:04:41.021163195 +1300 | ||
49 | @@ -38,6 +38,7 @@ | ||
50 | * * | ||
51 | * *****************************************************/ | ||
52 | |||
53 | +.file "jump_mips32_o32_elf_gas.S" | ||
54 | .text | ||
55 | .globl jump_fcontext | ||
56 | .align 2 | ||
57 | diff -ur boost_1_68_0.original/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S | ||
58 | --- boost_1_68_0.original/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
59 | +++ boost_1_68_0/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S 2018-11-22 09:04:42.281190679 +1300 | ||
60 | @@ -73,6 +73,7 @@ | ||
61 | * * | ||
62 | *******************************************************/ | ||
63 | |||
64 | +.file "jump_ppc32_sysv_elf_gas.S" | ||
65 | .text | ||
66 | .globl jump_fcontext | ||
67 | .align 2 | ||
68 | diff -ur boost_1_68_0.original/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S | ||
69 | --- boost_1_68_0.original/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
70 | +++ boost_1_68_0/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S 2018-11-22 09:04:43.193210571 +1300 | ||
71 | @@ -66,6 +66,7 @@ | ||
72 | * * | ||
73 | *******************************************************/ | ||
74 | |||
75 | +.file "jump_ppc64_sysv_elf_gas.S" | ||
76 | .globl jump_fcontext | ||
77 | #if _CALL_ELF == 2 | ||
78 | .text | ||
79 | diff -ur boost_1_68_0.original/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S | ||
80 | --- boost_1_68_0.original/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
81 | +++ boost_1_68_0/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2018-11-22 09:04:44.213232818 +1300 | ||
82 | @@ -24,6 +24,7 @@ | ||
83 | * * | ||
84 | ****************************************************************************************/ | ||
85 | |||
86 | +.file "jump_x86_64_sysv_elf_gas.S" | ||
87 | .text | ||
88 | .globl jump_fcontext | ||
89 | .type jump_fcontext,@function | ||
90 | diff -ur boost_1_68_0.original/libs/context/src/asm/make_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/make_arm64_aapcs_elf_gas.S | ||
91 | --- boost_1_68_0.original/libs/context/src/asm/make_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
92 | +++ boost_1_68_0/libs/context/src/asm/make_arm64_aapcs_elf_gas.S 2018-11-22 09:04:45.153253319 +1300 | ||
93 | @@ -51,6 +51,7 @@ | ||
94 | * * | ||
95 | *******************************************************/ | ||
96 | |||
97 | +.file "make_arm64_aapcs_elf_gas.S" | ||
98 | .text | ||
99 | .align 2 | ||
100 | .global make_fcontext | ||
101 | diff -ur boost_1_68_0.original/libs/context/src/asm/make_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/make_arm_aapcs_elf_gas.S | ||
102 | --- boost_1_68_0.original/libs/context/src/asm/make_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
103 | +++ boost_1_68_0/libs/context/src/asm/make_arm_aapcs_elf_gas.S 2018-11-22 09:04:46.097273908 +1300 | ||
104 | @@ -38,6 +38,7 @@ | ||
105 | * * | ||
106 | *******************************************************/ | ||
107 | |||
108 | +.file "make_arm_aapcs_elf_gas.S" | ||
109 | .text | ||
110 | .globl make_fcontext | ||
111 | .align 2 | ||
112 | diff -ur boost_1_68_0.original/libs/context/src/asm/make_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_i386_sysv_elf_gas.S | ||
113 | --- boost_1_68_0.original/libs/context/src/asm/make_i386_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
114 | +++ boost_1_68_0/libs/context/src/asm/make_i386_sysv_elf_gas.S 2018-11-22 09:04:46.973293012 +1300 | ||
115 | @@ -24,6 +24,7 @@ | ||
116 | * * | ||
117 | ****************************************************************************************/ | ||
118 | |||
119 | +.file "make_i386_sysv_elf_gas.S" | ||
120 | .text | ||
121 | .globl make_fcontext | ||
122 | .align 2 | ||
123 | diff -ur boost_1_68_0.original/libs/context/src/asm/make_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/make_mips32_o32_elf_gas.S | ||
124 | --- boost_1_68_0.original/libs/context/src/asm/make_mips32_o32_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
125 | +++ boost_1_68_0/libs/context/src/asm/make_mips32_o32_elf_gas.S 2018-11-22 09:04:47.925313772 +1300 | ||
126 | @@ -38,6 +38,7 @@ | ||
127 | * * | ||
128 | * *****************************************************/ | ||
129 | |||
130 | +.file "make_mips32_o32_elf_gas.S" | ||
131 | .text | ||
132 | .globl make_fcontext | ||
133 | .align 2 | ||
134 | diff -ur boost_1_68_0.original/libs/context/src/asm/make_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S | ||
135 | --- boost_1_68_0.original/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
136 | +++ boost_1_68_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2018-11-22 09:04:48.865334271 +1300 | ||
137 | @@ -73,6 +73,7 @@ | ||
138 | * * | ||
139 | *******************************************************/ | ||
140 | |||
141 | +.file "make_ppc32_sysv_elf_gas.S" | ||
142 | .text | ||
143 | .globl make_fcontext | ||
144 | .align 2 | ||
145 | diff -ur boost_1_68_0.original/libs/context/src/asm/make_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S | ||
146 | --- boost_1_68_0.original/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
147 | +++ boost_1_68_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2018-11-22 09:04:50.049360089 +1300 | ||
148 | @@ -66,6 +66,7 @@ | ||
149 | * * | ||
150 | *******************************************************/ | ||
151 | |||
152 | +.file "make_ppc64_sysv_elf_gas.S" | ||
153 | .globl make_fcontext | ||
154 | #if _CALL_ELF == 2 | ||
155 | .text | ||
156 | diff -ur boost_1_68_0.original/libs/context/src/asm/make_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_x86_64_sysv_elf_gas.S | ||
157 | --- boost_1_68_0.original/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
158 | +++ boost_1_68_0/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2018-11-22 09:04:51.117383378 +1300 | ||
159 | @@ -24,6 +24,7 @@ | ||
160 | * * | ||
161 | ****************************************************************************************/ | ||
162 | |||
163 | +.file "make_x86_64_sysv_elf_gas.S" | ||
164 | .text | ||
165 | .globl make_fcontext | ||
166 | .type make_fcontext,@function | ||
167 | diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S | ||
168 | --- boost_1_68_0.original/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 | ||
169 | +++ boost_1_68_0/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S 2018-11-22 09:04:52.201407013 +1300 | ||
170 | @@ -51,6 +51,7 @@ | ||
171 | * * | ||
172 | *******************************************************/ | ||
173 | |||
174 | +.file "ontop_arm64_aapcs_elf_gas.S" | ||
175 | .text | ||
176 | .align 2 | ||
177 | .global ontop_fcontext | ||
178 | diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S | ||
179 | --- boost_1_68_0.original/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 | ||
180 | +++ boost_1_68_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S 2018-11-22 09:04:53.269430300 +1300 | ||
181 | @@ -38,6 +38,7 @@ | ||
182 | * * | ||
183 | *******************************************************/ | ||
184 | |||
185 | +.file "ontop_arm_aapcs_elf_gas.S" | ||
186 | .text | ||
187 | .globl ontop_fcontext | ||
188 | .align 2 | ||
189 | diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_i386_sysv_elf_gas.S | ||
190 | --- boost_1_68_0.original/libs/context/src/asm/ontop_i386_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 | ||
191 | +++ boost_1_68_0/libs/context/src/asm/ontop_i386_sysv_elf_gas.S 2018-11-22 09:04:54.389454719 +1300 | ||
192 | @@ -24,6 +24,7 @@ | ||
193 | * * | ||
194 | ****************************************************************************************/ | ||
195 | |||
196 | +.file "ontop_i386_sysv_elf_gas.S" | ||
197 | .text | ||
198 | .globl ontop_fcontext | ||
199 | .align 2 | ||
200 | diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_mips32_o32_elf_gas.S | ||
201 | --- boost_1_68_0.original/libs/context/src/asm/ontop_mips32_o32_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 | ||
202 | +++ boost_1_68_0/libs/context/src/asm/ontop_mips32_o32_elf_gas.S 2018-11-22 09:04:55.657482363 +1300 | ||
203 | @@ -38,6 +38,7 @@ | ||
204 | * * | ||
205 | * *****************************************************/ | ||
206 | |||
207 | +.file "ontop_mips32_o32_elf_gas.S" | ||
208 | .text | ||
209 | .globl ontop_fcontext | ||
210 | .align 2 | ||
211 | diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S | ||
212 | --- boost_1_68_0.original/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 | ||
213 | +++ boost_1_68_0/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S 2018-11-22 09:04:56.777506781 +1300 | ||
214 | @@ -73,6 +73,7 @@ | ||
215 | * * | ||
216 | *******************************************************/ | ||
217 | |||
218 | +.file "ontop_ppc32_sysv_elf_gas.S" | ||
219 | .text | ||
220 | .globl ontop_fcontext | ||
221 | .align 2 | ||
222 | diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S | ||
223 | --- boost_1_68_0.original/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 | ||
224 | +++ boost_1_68_0/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S 2018-11-22 09:04:58.485544015 +1300 | ||
225 | @@ -66,6 +66,7 @@ | ||
226 | * * | ||
227 | *******************************************************/ | ||
228 | |||
229 | +.file "ontop_ppc64_sysv_elf_gas.S" | ||
230 | .globl ontop_fcontext | ||
231 | #if _CALL_ELF == 2 | ||
232 | .text | ||
233 | diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S | ||
234 | --- boost_1_68_0.original/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 | ||
235 | +++ boost_1_68_0/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2018-11-22 09:04:59.609568516 +1300 | ||
236 | @@ -24,6 +24,7 @@ | ||
237 | * * | ||
238 | ****************************************************************************************/ | ||
239 | |||
240 | +.file "ontop_x86_64_sysv_elf_gas.S" | ||
241 | .text | ||
242 | .globl ontop_fcontext | ||
243 | .type ontop_fcontext,@function | ||
diff --git a/meta/recipes-support/boost/boost_1.68.0.bb b/meta/recipes-support/boost/boost_1.68.0.bb index c7958a4c5e..82e36fd732 100644 --- a/meta/recipes-support/boost/boost_1.68.0.bb +++ b/meta/recipes-support/boost/boost_1.68.0.bb | |||
@@ -7,5 +7,5 @@ SRC_URI += "\ | |||
7 | file://boost-math-disable-pch-for-gcc.patch \ | 7 | file://boost-math-disable-pch-for-gcc.patch \ |
8 | file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ | 8 | file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ |
9 | file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | 9 | file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ |
10 | file://0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch \ | 10 | file://reproducibility-add-file-directive-to-assembler.patch \ |
11 | " | 11 | " |