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

Commit 01b0e07e authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc: Simplify logic in include/uapi/asm/elf.h 



Simplify things by putting all the 32bit and 64bit defines
together instead of in two spots.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 23c6bd2a

arch/powerpc/include/uapi/asm/elf.h

+7 −12
Original line number Diff line number Diff line
@@ -107,6 +107,11 @@ typedef elf_gregset_t32 compat_elf_gregset_t; 
# define ELF_NVRREG	34	/* includes vscr & vrsave in split vectors */

# define ELF_NVSRHALFREG 32	/* Half the vsx registers */

# define ELF_GREG_TYPE	elf_greg_t64

# define ELF_ARCH	EM_PPC64

# define ELF_CLASS	ELFCLASS64

# define ELF_DATA	ELFDATA2MSB

typedef elf_greg_t64 elf_greg_t;

typedef elf_gregset_t64 elf_gregset_t;

#else

# define ELF_NEVRREG	34	/* includes acc (as 2) */

# define ELF_NVRREG	33	/* includes vscr */
@@ -114,19 +119,9 @@ typedef elf_gregset_t32 compat_elf_gregset_t; 
# define ELF_ARCH	EM_PPC

# define ELF_CLASS	ELFCLASS32

# define ELF_DATA	ELFDATA2MSB

#endif /* __powerpc64__ */



#ifndef ELF_ARCH

# define ELF_ARCH	EM_PPC64

# define ELF_CLASS	ELFCLASS64

# define ELF_DATA	ELFDATA2MSB

  typedef elf_greg_t64 elf_greg_t;

  typedef elf_gregset_t64 elf_gregset_t;

#else

  /* Assumption: ELF_ARCH == EM_PPC and ELF_CLASS == ELFCLASS32 */

typedef elf_greg_t32 elf_greg_t;

typedef elf_gregset_t32 elf_gregset_t;

#endif /* ELF_ARCH */

#endif /* __powerpc64__ */



/* Floating point registers */

typedef double elf_fpreg_t;