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

Commit f884b1cf authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file 



The patch moves the HWCAP definitions and the extern elf_hwcap
declaration to the hwcap.h header file.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 909d6c6c

include/asm-arm/Kbuild

+2 −0
Original line number Original line Diff line number Diff line 
include include/asm-generic/Kbuild.asm

include include/asm-generic/Kbuild.asm



unifdef-y += hwcap.h

include/asm-arm/elf.h

+1 −22
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */

 */

#include <asm/ptrace.h>

#include <asm/ptrace.h>

#include <asm/user.h>

#include <asm/user.h>

#include <asm/hwcap.h>





typedef unsigned long elf_greg_t;

typedef unsigned long elf_greg_t;

typedef unsigned long elf_freg_t[3];

typedef unsigned long elf_freg_t[3];
@@ -39,30 +40,8 @@ typedef struct user_fp elf_fpregset_t; 
#endif

#endif

#define ELF_ARCH	EM_ARM

#define ELF_ARCH	EM_ARM





/*

 * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP

 */

#define HWCAP_SWP	1

#define HWCAP_HALF	2

#define HWCAP_THUMB	4

#define HWCAP_26BIT	8	/* Play it safe */

#define HWCAP_FAST_MULT	16

#define HWCAP_FPA	32

#define HWCAP_VFP	64

#define HWCAP_EDSP	128

#define HWCAP_JAVA	256

#define HWCAP_IWMMXT	512

#define HWCAP_CRUNCH	1024



#ifdef __KERNEL__

#ifdef __KERNEL__

#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

/*

 * This yields a mask that user programs can use to figure out what

 * instruction set this cpu supports.

 */

#define ELF_HWCAP	(elf_hwcap)

extern unsigned int elf_hwcap;



/*

/*

 * This yields a string that ld.so will use to load implementation

 * This yields a string that ld.so will use to load implementation

 * specific libraries for optimization.  This is more specific in

 * specific libraries for optimization.  This is more specific in

include/asm-arm/hwcap.h

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
#ifndef __ASMARM_HWCAP_H

#define __ASMARM_HWCAP_H



/*

 * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP

 */

#define HWCAP_SWP	1

#define HWCAP_HALF	2

#define HWCAP_THUMB	4

#define HWCAP_26BIT	8	/* Play it safe */

#define HWCAP_FAST_MULT	16

#define HWCAP_FPA	32

#define HWCAP_VFP	64

#define HWCAP_EDSP	128

#define HWCAP_JAVA	256

#define HWCAP_IWMMXT	512

#define HWCAP_CRUNCH	1024



#if defined(__KERNEL__) && !defined(__ASSEMBLY__)

/*

 * This yields a mask that user programs can use to figure out what

 * instruction set this cpu supports.

 */

#define ELF_HWCAP	(elf_hwcap)

extern unsigned int elf_hwcap;

#endif



#endif