diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-18 01:23:48 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-07-13 21:04:36 +0200 |
| commit | 9693885ad88d21ead7bd9ebc32f3e4901841b18b (patch) | |
| tree | ce6fed36947956e17303cf7cbe9cfd2004022b10 /src/arch/x86/include/arch/cpu.h | |
| parent | 492a07593b3d74d4b10fce95e5229cbd4535b1cb (diff) | |
| download | coreboot-9693885ad88d21ead7bd9ebc32f3e4901841b18b.tar.gz coreboot-9693885ad88d21ead7bd9ebc32f3e4901841b18b.tar.bz2 coreboot-9693885ad88d21ead7bd9ebc32f3e4901841b18b.zip | |
x86: Port x86 over to compile cleanly with x86-64
Change-Id: I26f1bbf027435be593f11bce4780111dcaf7cb86
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Signed-off-by: Scott Duplichan <scott@notabs.org>
Reviewed-on: http://review.coreboot.org/10586
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/arch/x86/include/arch/cpu.h')
| -rw-r--r-- | src/arch/x86/include/arch/cpu.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 851b58dd4974..5c371d9d85b0 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -179,8 +179,14 @@ struct cpu_info { static inline struct cpu_info *cpu_info(void) { struct cpu_info *ci; - __asm__("andl %%esp,%0; " + __asm__( +#ifdef __x86_64__ + "and %%rsp,%0; " + "or %2, %0 " +#else + "andl %%esp,%0; " "orl %2, %0 " +#endif :"=r" (ci) : "0" (~(CONFIG_STACK_SIZE - 1)), "r" (CONFIG_STACK_SIZE - sizeof(struct cpu_info)) |