These definitions were needed to build arch/arm64/kernel/ptrace.c with CONFIG_COMPAT64 a long time ago, before "arm64: ptrace: Support compat64". This is not the case any more, however since "fs/compat_binfmt_elf: Align compat64 with compat32" we do need to define compat_elf_gregset_t to keep linux/elfcore-compat.h happy.
This is the correct approach and there is no plan to change it, so let's remove the outdated TODO.
Signed-off-by: Kevin Brodsky kevin.brodsky@arm.com --- arch/arm64/include/asm/elf.h | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index b54070e80867..63f6f50599e6 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -209,11 +209,6 @@ extern int purecap_setup_additional_pages(struct linux_binprm *bprm, #define compat_elf_check_arch(x) ((x)->e_machine == EM_AARCH64 && \ !((x)->e_flags & EF_AARCH64_CHERI_PURECAP))
-/* - * TODO [PCuABI]: Redefine below macros and typedefs to let ptrace pick them - * and build. These redefinitions are not permanent and might not be required if - * the ptrace is modified for complete COMPAT64 support. - */ #define COMPAT_ELF_NGREG ELF_NGREG typedef unsigned long compat_elf_greg_t; typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG];
On 3/15/24 1:51 PM, Kevin Brodsky wrote:
These definitions were needed to build arch/arm64/kernel/ptrace.c with CONFIG_COMPAT64 a long time ago, before "arm64: ptrace: Support compat64". This is not the case any more, however since "fs/compat_binfmt_elf: Align compat64 with compat32" we do need to define compat_elf_gregset_t to keep linux/elfcore-compat.h happy.
This is the correct approach and there is no plan to change it, so let's remove the outdated TODO.
Signed-off-by: Kevin Brodsky kevin.brodsky@arm.com
arch/arm64/include/asm/elf.h | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index b54070e80867..63f6f50599e6 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -209,11 +209,6 @@ extern int purecap_setup_additional_pages(struct linux_binprm *bprm, #define compat_elf_check_arch(x) ((x)->e_machine == EM_AARCH64 && \ !((x)->e_flags & EF_AARCH64_CHERI_PURECAP)) -/*
- TODO [PCuABI]: Redefine below macros and typedefs to let ptrace pick them
- and build. These redefinitions are not permanent and might not be required if
- the ptrace is modified for complete COMPAT64 support.
- */ #define COMPAT_ELF_NGREG ELF_NGREG typedef unsigned long compat_elf_greg_t; typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG];
Given we've already handled compat_elf_gregset_t and the rest, i'd say +1
On 05/04/2024 15:39, Carsten Haitzler wrote:
On 3/15/24 1:51 PM, Kevin Brodsky wrote:
These definitions were needed to build arch/arm64/kernel/ptrace.c with CONFIG_COMPAT64 a long time ago, before "arm64: ptrace: Support compat64". This is not the case any more, however since "fs/compat_binfmt_elf: Align compat64 with compat32" we do need to define compat_elf_gregset_t to keep linux/elfcore-compat.h happy.
This is the correct approach and there is no plan to change it, so let's remove the outdated TODO.
Signed-off-by: Kevin Brodsky kevin.brodsky@arm.com
arch/arm64/include/asm/elf.h | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index b54070e80867..63f6f50599e6 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -209,11 +209,6 @@ extern int purecap_setup_additional_pages(struct linux_binprm *bprm, #define compat_elf_check_arch(x) ((x)->e_machine == EM_AARCH64 && \ !((x)->e_flags & EF_AARCH64_CHERI_PURECAP)) -/*
- TODO [PCuABI]: Redefine below macros and typedefs to let ptrace
pick them
- and build. These redefinitions are not permanent and might not be
required if
- the ptrace is modified for complete COMPAT64 support.
- */
#define COMPAT_ELF_NGREG ELF_NGREG typedef unsigned long compat_elf_greg_t; typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG];
Given we've already handled compat_elf_gregset_t and the rest, i'd say +1
Indeed, thanks for having a look. Now in next.
Kevin
linux-morello@op-lists.linaro.org
-
Carsten Haitzler -
Kevin Brodsky