Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a60ad51 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

MIPS: ELF: Unify __MIPS_O32_FP64_MUST_BE_ZERO definitions 



Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13244/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent de704161

arch/mips/include/asm/elf.h

+12 −13
Original line number Diff line number Diff line
@@ -211,19 +211,6 @@ typedef double elf_fpreg_t; 
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];



#ifdef CONFIG_32BIT



/*

 * In order to be sure that we don't attempt to execute an O32 binary which

 * requires 64 bit FP (FR=1) on a system which does not support it we refuse

 * to execute any binary which has bits specified by the following macro set

 * in its ELF header flags.

 */

#ifdef CONFIG_MIPS_O32_FP64_SUPPORT

# define __MIPS_O32_FP64_MUST_BE_ZERO	0

#else

# define __MIPS_O32_FP64_MUST_BE_ZERO	EF_MIPS_FP64

#endif



/*

 * This is used to ensure we don't load something for the wrong architecture.

 */
@@ -290,6 +277,18 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; 


#endif /* !defined(ELF_ARCH) */



/*

 * In order to be sure that we don't attempt to execute an O32 binary which

 * requires 64 bit FP (FR=1) on a system which does not support it we refuse

 * to execute any binary which has bits specified by the following macro set

 * in its ELF header flags.

 */

#ifdef CONFIG_MIPS_O32_FP64_SUPPORT

# define __MIPS_O32_FP64_MUST_BE_ZERO	0

#else

# define __MIPS_O32_FP64_MUST_BE_ZERO	EF_MIPS_FP64

#endif



#define mips_elf_check_machine(x) ((x)->e_machine == EM_MIPS)



#define vmcore_elf32_check_arch mips_elf_check_machine

arch/mips/kernel/binfmt_elfo32.c

+0 −12
Original line number Diff line number Diff line
@@ -27,18 +27,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; 
typedef double elf_fpreg_t;

typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];



/*

 * In order to be sure that we don't attempt to execute an O32 binary which

 * requires 64 bit FP (FR=1) on a system which does not support it we refuse

 * to execute any binary which has bits specified by the following macro set

 * in its ELF header flags.

 */

#ifdef CONFIG_MIPS_O32_FP64_SUPPORT

# define __MIPS_O32_FP64_MUST_BE_ZERO	0

#else

# define __MIPS_O32_FP64_MUST_BE_ZERO	EF_MIPS_FP64

#endif



/*

 * This is used to ensure we don't load something for the wrong architecture.

 */