[Buildroot] [PATCH] package/strace: fix nios2_sp_ptr definition

[Arnout Vandecappelle]

On 04-07-17 18:33, Romain Naour wrote:
> The patch [1] introduced in streace 1.17 use the old way to access SP
> register as defined for kernel headers < 4.0.
> The kernel headers for nios2 has been changed in commit [2].
> 
> Use the new kernel header.
> 
> Fixes:
> http://autobuild.buildroot.net/results/b9f/b9fc25b82f3280872fe1593ac252a8529ba83576
> 
> [1] https://github.com/strace/strace/commit/6117728aacf431a3e3c05761766c776874cc0861
> [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=92d5dd8cd6e2b211d32d8fbc6cf4b7470765a09f

 Really strange to hack around this way, but what do you expect with strace...

 What's the upstream status of the patch?

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>

 Regards,
 Arnout

> 
> Signed-off-by: Romain Naour <romain.naour at smile.fr>
> ---
>  ...os2-arch_regs-fix-nios2_sp_ptr-definition.patch | 43 ++++++++++++++++++++++
>  package/strace/Config.in                           |  6 +++
>  2 files changed, 49 insertions(+)
>  create mode 100644 package/strace/0001-nios2-arch_regs-fix-nios2_sp_ptr-definition.patch
> 
> diff --git a/package/strace/0001-nios2-arch_regs-fix-nios2_sp_ptr-definition.patch b/package/strace/0001-nios2-arch_regs-fix-nios2_sp_ptr-definition.patch
> new file mode 100644
> index 0000000..81e1726
> --- /dev/null
> +++ b/package/strace/0001-nios2-arch_regs-fix-nios2_sp_ptr-definition.patch
> @@ -0,0 +1,43 @@
> +From 8a1f47f7963991e5b039282769d0a798d36f9e45 Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour at smile.fr>
> +Date: Tue, 4 Jul 2017 18:06:14 +0200
> +Subject: [PATCH] nios2/arch_regs: fix nios2_sp_ptr definition
> +
> +The patch [1] introduced in streace 1.17 use the old way to access SP register as defined
> +for kernel headers < 4.0.
> +The kernel headers for nios2 has been changed in commit [2].
> +
> +Use the new kernel header.
> +
> +Fixes:
> +http://autobuild.buildroot.net/results/b9f/b9fc25b82f3280872fe1593ac252a8529ba83576
> +
> +[1] https://github.com/strace/strace/commit/6117728aacf431a3e3c05761766c776874cc0861
> +[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=92d5dd8cd6e2b211d32d8fbc6cf4b7470765a09f
> +
> +Signed-off-by: Romain Naour <romain.naour at smile.fr>
> +---
> + linux/nios2/arch_regs.c | 2 +-
> + linux/nios2/arch_regs.h | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/linux/nios2/arch_regs.c b/linux/nios2/arch_regs.c
> +index 8a668bc..c18a3aa 100644
> +--- a/linux/nios2/arch_regs.c
> ++++ b/linux/nios2/arch_regs.c
> +@@ -1,4 +1,4 @@
> + static struct user_pt_regs nios2_regs;
> +-unsigned long *const nios2_sp_ptr = &nios2_regs.sp;
> ++unsigned int *const nios2_sp_ptr = &nios2_regs.regs[PTR_SP];
> + # define ARCH_REGS_FOR_GETREGSET nios2_regs
> + #define ARCH_PC_REG nios2_regs.regs[PTR_EA]
> +diff --git a/linux/nios2/arch_regs.h b/linux/nios2/arch_regs.h
> +index 7f344b5..c4230ed 100644
> +--- a/linux/nios2/arch_regs.h
> ++++ b/linux/nios2/arch_regs.h
> +@@ -1 +1 @@
> +-extern unsigned long *const nios2_sp_ptr;
> ++extern unsigned int *const nios2_sp_ptr;
> +-- 
> +2.9.4
> +
> diff --git a/package/strace/Config.in b/package/strace/Config.in
> index bbb582a..501c964 100644
> --- a/package/strace/Config.in
> +++ b/package/strace/Config.in
> @@ -1,8 +1,14 @@
>  config BR2_PACKAGE_STRACE
>  	bool "strace"
> +	# needs at least kernel headers 4.0 on nios2
> +	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2
>  	help
>  	  A useful diagnostic, instructional, and debugging tool.
>  	  Allows you to track what system calls a program makes
>  	  while it is running.
>  
>  	  http://sourceforge.net/projects/strace/
> +
> +comment "strace needs a toolchain w/ headers >= 4.0 on nios2"
> +	depends on BR2_nios2
> +	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF