Skip to contentSkip to conversation

glibc: make ld-2.28.so reproducible on arm

PATCH In review Martin Hundebøll 3 participants 4 messages Nov 6, 2018 – Nov 7, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 glibc: make ld-2.28.so reproducible on arm

Play the whack-a-mole game and add the .file directive to another assembly file that otherwise shows itself in ld-2.28.so debug file, which in turns alters the build-id of ld-2.28.so on target.

---

Changes since v1:

- Added signed-of-by tag

 .../0034-inject-file-assembly-directives.patch      | 13 +++++++++++++
 1 file changed, 13 insertions(+)
meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch +13 -0
index 3f9f8cf189..55eba2d43e 100644
@@ -257,3 +257,16 @@ index 244d87fb6d..14d3e2ce14 100644
  /* Initial entry point code for the dynamic linker.
     The C function `_dl_start' is the real entry point;
     its return value is the user program's entry point.	*/
+diff --git a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
+index d26ad1f8d3..a0de10bf81 100644
+--- a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
++++ b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
+@@ -27,6 +27,8 @@
+    ARM unwind tables for register to register moves, the actual opcodes
+    are not defined.  */
+ 
++      .file "libc-do-syscall.S"
++
+ #if defined(__thumb__)
+ 	.thumb
+ 	.syntax unified
Signature · 1 line
2.19.1
#1 lore raw

Martin,

Quoted 19 lines · Martin Hundebøll

Play the whack-a-mole game and add the .file directive to another assembly file that otherwise shows itself in ld-2.28.so debug file, which in turns alters the build-id of ld-2.28.so on target.

---

Changes since v1:

- Added signed-of-by tag

 .../0034-inject-file-assembly-directives.patch      | 13 +++++++++++++
 1 file changed, 13 insertions(+)
meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch +0 -0
index 3f9f8cf189..55eba2d43e 100644

meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch index 244d87fb6d..14d3e2ce14 100644 · line 259

Quoted 3 lines
meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch +0 -0
@@ -257,3 +257,16 @@ index 244d87fb6d..14d3e2ce14 100644
  /* Initial entry point code for the dynamic linker.
     The C function `_dl_start' is the real entry point;
     its return value is the user program's entry point.	*/

Please add Upsteam-Status: and Signed-off-by: in the patch itself.

You may want to review
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

This seems like a backport candidate for Thud too?

regards,

Armin

Quoted 13 lines
meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch +13 -0
+diff --git a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
+index d26ad1f8d3..a0de10bf81 100644
+--- a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
++++ b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
+@@ -27,6 +27,8 @@
+    ARM unwind tables for register to register moves, the actual opcodes
+    are not defined.  */
+ 
++      .file "libc-do-syscall.S"
++
+ #if defined(__thumb__)
+ 	.thumb
+ 	.syntax unified
#2 lore raw

Hi Armin,

Quoted 18 lines · On 06/11/2018 20.41, akuster808 wrote:

Martin,

Quoted 14 lines · Martin Hundebøll

Play the whack-a-mole game and add the .file directive to another assembly file that otherwise shows itself in ld-2.28.so debug file, which in turns alters the build-id of ld-2.28.so on target.

---

Changes since v1:

- Added signed-of-by tag

  .../0034-inject-file-assembly-directives.patch      | 13 +++++++++++++
  1 file changed, 13 insertions(+)
Quoted 10 lines

meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch index 244d87fb6d..14d3e2ce14 100644 · line 259

Quoted 8 lines
meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch +0 -0
index 3f9f8cf189..55eba2d43e 100644
@@ -257,3 +257,16 @@ index 244d87fb6d..14d3e2ce14 100644
   /* Initial entry point code for the dynamic linker.
      The C function `_dl_start' is the real entry point;
      its return value is the user program's entry point.	*/

Please add Upsteam-Status: and Signed-off-by: in the patch itself.

It was Richard's patch, so I chose the less intrusive approach. I can do a refresh of the entire patch?

Quoted 4 lines

You may want to review
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

This seems like a backport candidate for Thud too?

Yes, I was planning on bugging you was it hits master :)

Thanks,
Martin

Quoted 17 lines

regards,

Armin

Quoted 13 lines
meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch +13 -0
+diff --git a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
+index d26ad1f8d3..a0de10bf81 100644
+--- a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
++++ b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
+@@ -27,6 +27,8 @@
+    ARM unwind tables for register to register moves, the actual opcodes
+    are not defined.  */
+
++      .file "libc-do-syscall.S"
++
+ #if defined(__thumb__)
+ 	.thumb
+ 	.syntax unified
Signature · 10 lines
Kind regards,
Martin Hundebøll
Embedded Linux Consultant

+45 61 65 54 61
[email protected]

Geanix IVS
https://geanix.com
DK39600706
#3 lore raw
Quoted 4 lines · Martin Hundebøll
Quoted 1 line

Please add Upsteam-Status: and Signed-off-by: in the patch itself.

It was Richard's patch, so I chose the less intrusive approach. I can do a refresh of the entire patch?

There's nothing to do, as you're extending an existing patch. Easy to miss that fact in the review.

Ross