elfutils: Fix build on ppc/musl

Submitted by Khem Raj on Sept. 8, 2019, 11:23 p.m. | Patch ID: 164763

Details

Message ID 20190908232331.2295-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj Sept. 8, 2019, 11:23 p.m.
musl relies on the pt_regs definitions from kernel ptrace headers

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../elfutils/elfutils_0.176.bb                |  1 +
 ...cliude-asm-ptrace.h-for-pt_regs-defi.patch | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
index d98457e3f9..fe810282bc 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
@@ -29,6 +29,7 @@  SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://debian/disable_werror.patch \
            file://debian/testsuite-ignore-elflint.diff \
            file://0001-skip-the-test-when-gcc-not-deployed.patch \
+           file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \
            file://run-ptest \
            file://ptest.patch \
            "
diff --git a/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
new file mode 100644
index 0000000000..3303333c45
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
@@ -0,0 +1,32 @@ 
+From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 8 Sep 2019 15:57:59 -0700
+Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs definition
+
+Fixes
+| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has incomplete type
+|       struct pt_regs r;
+|                      ^
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ backends/ppc_initreg.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
+index 0e0d359..e5cca7e 100644
+--- a/backends/ppc_initreg.c
++++ b/backends/ppc_initreg.c
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #if defined(__powerpc__) && defined(__linux__)
+ # include <sys/ptrace.h>
++# include <asm/ptrace.h>
+ # include <sys/user.h>
+ #endif
+ 
+-- 
+2.23.0
+

Comments

Ross Burton Sept. 9, 2019, 9:51 a.m.
There's a 0.177 upgrade on the list (and in mut), is this required for 
that too?

Ross

On 09/09/2019 00:23, Khem Raj wrote:
> musl relies on the pt_regs definitions from kernel ptrace headers
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   .../elfutils/elfutils_0.176.bb                |  1 +
>   ...cliude-asm-ptrace.h-for-pt_regs-defi.patch | 32 +++++++++++++++++++
>   2 files changed, 33 insertions(+)
>   create mode 100644 meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> 
> diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> index d98457e3f9..fe810282bc 100644
> --- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> +++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> @@ -29,6 +29,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
>              file://debian/disable_werror.patch \
>              file://debian/testsuite-ignore-elflint.diff \
>              file://0001-skip-the-test-when-gcc-not-deployed.patch \
> +           file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \
>              file://run-ptest \
>              file://ptest.patch \
>              "
> diff --git a/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> new file mode 100644
> index 0000000000..3303333c45
> --- /dev/null
> +++ b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> @@ -0,0 +1,32 @@
> +From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sun, 8 Sep 2019 15:57:59 -0700
> +Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs definition
> +
> +Fixes
> +| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has incomplete type
> +|       struct pt_regs r;
> +|                      ^
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + backends/ppc_initreg.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
> +index 0e0d359..e5cca7e 100644
> +--- a/backends/ppc_initreg.c
> ++++ b/backends/ppc_initreg.c
> +@@ -33,6 +33,7 @@
> + #include <stdlib.h>
> + #if defined(__powerpc__) && defined(__linux__)
> + # include <sys/ptrace.h>
> ++# include <asm/ptrace.h>
> + # include <sys/user.h>
> + #endif
> +
> +--
> +2.23.0
> +
>
Khem Raj Sept. 9, 2019, 2:22 p.m.
On Mon, Sep 9, 2019 at 2:52 AM Ross Burton <ross.burton@intel.com> wrote:
>
> There's a 0.177 upgrade on the list (and in mut), is this required for
> that too?
>

if the patch which we are removing with this change is used
then yes it is needed.

> Ross
>
> On 09/09/2019 00:23, Khem Raj wrote:
> > musl relies on the pt_regs definitions from kernel ptrace headers
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >   .../elfutils/elfutils_0.176.bb                |  1 +
> >   ...cliude-asm-ptrace.h-for-pt_regs-defi.patch | 32 +++++++++++++++++++
> >   2 files changed, 33 insertions(+)
> >   create mode 100644 meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> >
> > diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > index d98457e3f9..fe810282bc 100644
> > --- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > @@ -29,6 +29,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
> >              file://debian/disable_werror.patch \
> >              file://debian/testsuite-ignore-elflint.diff \
> >              file://0001-skip-the-test-when-gcc-not-deployed.patch \
> > +           file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \
> >              file://run-ptest \
> >              file://ptest.patch \
> >              "
> > diff --git a/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> > new file mode 100644
> > index 0000000000..3303333c45
> > --- /dev/null
> > +++ b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> > @@ -0,0 +1,32 @@
> > +From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Sun, 8 Sep 2019 15:57:59 -0700
> > +Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs definition
> > +
> > +Fixes
> > +| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has incomplete type
> > +|       struct pt_regs r;
> > +|                      ^
> > +
> > +Upstream-Status: Pending
> > +
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +---
> > + backends/ppc_initreg.c | 1 +
> > + 1 file changed, 1 insertion(+)
> > +
> > +diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
> > +index 0e0d359..e5cca7e 100644
> > +--- a/backends/ppc_initreg.c
> > ++++ b/backends/ppc_initreg.c
> > +@@ -33,6 +33,7 @@
> > + #include <stdlib.h>
> > + #if defined(__powerpc__) && defined(__linux__)
> > + # include <sys/ptrace.h>
> > ++# include <asm/ptrace.h>
> > + # include <sys/user.h>
> > + #endif
> > +
> > +--
> > +2.23.0
> > +
> >
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core