summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-06-15 16:35:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-15 17:56:24 +0100
commitb4a4cf6122645e27e52e9cd0b2006528010b04e7 (patch)
treeb767203a9f56b9dfb0788ec2835ffb66bb7fea33 /meta/recipes-support
parent086610faf03a4c3e01cdb9d69c002b66813d97e3 (diff)
downloadpoky-b4a4cf6122645e27e52e9cd0b2006528010b04e7.tar.gz
boost: Improve reproducibility
Set .file section explicitly for .S files to avoid the linker introduces the host path in symbols for object files whose source file is .S Otherwise, there is a host path in the symbols as below: $ 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 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 [YOCTO #12708] (From OE-Core rev: 5d785dadf2bd35f4ae7304ab927fda10368377ce) Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch48
-rw-r--r--meta/recipes-support/boost/boost_1.67.0.bb1
2 files changed, 49 insertions, 0 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
new file mode 100644
index 0000000000..c2ac49e58f
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch
@@ -0,0 +1,48 @@
1From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <Mingli.Yu@windriver.com>
3Date: Fri, 15 Jun 2018 16:21:56 +0800
4Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section
5
6Set .file section explicitly for .S files to avoid
7the linker introduces the host path in symbols for
8object files whose source file is .S
9Otherwise, 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
1242: 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
14Upstream-Status: Pending
15
16Signed-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
22diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S
23index 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
34diff --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
35index 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--
472.7.4
48
diff --git a/meta/recipes-support/boost/boost_1.67.0.bb b/meta/recipes-support/boost/boost_1.67.0.bb
index eb50899d56..7bb451166c 100644
--- a/meta/recipes-support/boost/boost_1.67.0.bb
+++ b/meta/recipes-support/boost/boost_1.67.0.bb
@@ -7,4 +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" 11"