Skip to contentSkip to conversation

google-breakpad: add patch to fix AArch64 build issue

PATCH New Thomas Petazzoni 3 participants 3 messages May 12, 2015 – May 13, 2015

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

PATCH 1/1 google-breakpad: add patch to fix AArch64 build issue

Fixes:

http://autobuild.buildroot.org/results/b2b/b2bfbcc922b3041ab3a1892d5c1469ec68476682/

Signed-off-by Thomas Petazzoni <[email protected]>
---
 .../0001-add-missing-asm-ptrace-include.patch      | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/google-breakpad/0001-add-missing-asm-ptrace-include.patch
package/google-breakpad/0001-add-missing-asm-ptrace-include.patch new file +31 -0
new file mode 100644
index 0000000..30e6160
@@ -0,0 +1,31 @@
+Include <asm/ptrace.h> to get necessary definitions on AArch64
+
+In glibc commit
+https://sourceware.org/git/?p=glibc.git;a=commit;h=7d05a8168b45c0580e1f9a79c2dd26c8f0d31fca,
+including <asm/ptrace.h> from <sys/user.h> on AArch64 has been
+removed. So the Google Breakpad code, which used to build fine on
+glibc 2.18 (CodeSourcery toolchain for example), no longer builds wiht
+glibc 2.19 (Linaro toolchain for example).
+
+To fix this, this patch adds the missing <asm/ptrace.h> include (for
+AArch64 only, to be conservative).
+
+This patch has not been submitted upstream, since more recent versions
+of Google Breakpad have completely changed this part of the code.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: b/src/client/linux/minidump_writer/linux_dumper.h
+===================================================================
+--- a/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/client/linux/minidump_writer/linux_dumper.h
+@@ -43,6 +43,9 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/user.h>
++#if defined(__aarch64__)
++#include <asm/ptrace.h>
++#endif
+ 
+ #include "common/memory.h"
+ #include "google_breakpad/common/minidump_format.h"
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 google-breakpad: add patch to fix AArch64 build issue

Hi Thomas,

Le 12/05/2015 23:48, Thomas Petazzoni a ?crit :

Quoted 16 lines

Fixes:

http://autobuild.buildroot.org/results/b2b/b2bfbcc922b3041ab3a1892d5c1469ec68476682/

Signed-off-by Thomas Petazzoni <[email protected]>
---
 .../0001-add-missing-asm-ptrace-include.patch      | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/google-breakpad/0001-add-missing-asm-ptrace-include.patch
package/google-breakpad/0001-add-missing-asm-ptrace-include.patch new file +0 -0
new file mode 100644
index 0000000..30e6160

package/google-breakpad/0001-add-missing-asm-ptrace-include.patch line 7

Quoted 7 lines
package/google-breakpad/0001-add-missing-asm-ptrace-include.patch new file +7 -0
@@ -0,0 +1,31 @@
+Include <asm/ptrace.h> to get necessary definitions on AArch64
+
+In glibc commit
+https://sourceware.org/git/?p=glibc.git;a=commit;h=7d05a8168b45c0580e1f9a79c2dd26c8f0d31fca,
+including <asm/ptrace.h> from <sys/user.h> on AArch64 has been
+removed. So the Google Breakpad code, which used to build fine on
+glibc 2.18 (CodeSourcery toolchain for example), no longer builds wiht

with

package/google-breakpad/0001-add-missing-asm-ptrace-include.patch line 16

Quoted 9 lines
package/google-breakpad/0001-add-missing-asm-ptrace-include.patch new file +9 -0
+glibc 2.19 (Linaro toolchain for example).
+
+To fix this, this patch adds the missing <asm/ptrace.h> include (for
+AArch64 only, to be conservative).
+
+This patch has not been submitted upstream, since more recent versions
+of Google Breakpad have completely changed this part of the code.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>

Build tested with Linaro and Code Sourcery toolchains.

Reviewed-by Romain Naour <[email protected]>
Tested-by Romain Naour <[email protected]>

Best regards,
Romain

Quoted 16 lines
package/google-breakpad/0001-add-missing-asm-ptrace-include.patch new file +15 -0
+
+Index: b/src/client/linux/minidump_writer/linux_dumper.h
+===================================================================
+--- a/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/client/linux/minidump_writer/linux_dumper.h
+@@ -43,6 +43,9 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/user.h>
++#if defined(__aarch64__)
++#include <asm/ptrace.h>
++#endif
+ 
+ #include "common/memory.h"
+ #include "google_breakpad/common/minidump_format.h"
#2 lore raw

PATCH 1/1 google-breakpad: add patch to fix AArch64 build issue

In reply to Thomas Petazzoni
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Fixes:
http://autobuild.buildroot.org/results/b2b/b2bfbcc922b3041ab3a1892d5c1469ec68476682/

Signed-off-by Thomas Petazzoni <[email protected]>

Committed with the typo pointed out by Romain fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard