michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Replace __attribute__((aligned(x))) with __aligned(x)

Browse source 
The __attribute__ keyword is toolchain specific.

Change-Id: I2183d154ccdb9b5bed3bc245cc37cbf4c5cc62cc
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-05-26 14:25:53 -04:00 • committed by Anas Nashif
commit ad39ee1c96
4 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/core/gdt.c
View file

@ -70,8 +70,7 @@ for the IA-32 architecture.
*/
static
tGdtDesc
_gdt_entries[MAX_GDT_ENTRIES]
__attribute__((aligned(8))) = {
_gdt_entries[MAX_GDT_ENTRIES] __aligned(8) = {
{/* Entry 0 (selector=0x0000): The "NULL descriptor" */
0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00},
{ /* Entry 1 (selector=0x0008): Code descriptor: DPL0 */

2
arch/x86/include/gdt.h
View file

@ -73,7 +73,7 @@ typedef struct PACK_STRUCT s_gdtHeader
{
uint16_t limit; /* GDT limit */
tGdtDesc *pEntries; /* pointer to the GDT entries */
} tGdtHeader __attribute__((aligned(4)));
} tGdtHeader __aligned(4);
/* externs */

7
arch/x86/include/nanok.h
View file

@ -547,7 +547,7 @@ typedef struct s_FpRegSet { /* # of bytes: name of register */
unsigned short ds; /* 2 : x87 FPU instr operand ptr selector */
unsigned short pad5; /* 2 : N/A */
tFpReg fpReg[8]; /* 80 : ST0 -> ST7 */
} tFpRegSet __attribute__((aligned(FP_REG_SET_ALIGN)));
} tFpRegSet __aligned(FP_REG_SET_ALIGN);
#ifdef CONFIG_SSE
@ -595,7 +595,7 @@ typedef struct s_FpRegSetEx /* # of bytes: name of register */
tFpRegEx fpReg[8]; /* 128 : x87 FPU/MMX registers */
tXmmReg xmmReg[8]; /* 128 : XMM registers */
unsigned char rsrvd3[176]; /* 176 : reserved */
} tFpRegSetEx __attribute__((aligned(FP_REG_SET_ALIGN)));
} tFpRegSetEx __aligned(FP_REG_SET_ALIGN);
#else /* CONFIG_SSE == 0 */
@ -875,8 +875,7 @@ static inline void fiberRtnValueSet(
#define _EXC_STUB_ALIGN 1
#endif
typedef unsigned char
__attribute__((aligned(_EXC_STUB_ALIGN))) NANO_EXC_STUB[_EXC_STUB_SIZE];
typedef unsigned char __aligned(_EXC_STUB_ALIGN) NANO_EXC_STUB[_EXC_STUB_SIZE];
/*
* Macro to declare a dynamic exception stub. Using the macro places the stub

3
include/arch/x86/arch.h
View file

@ -71,8 +71,7 @@ by the generic nanokernel interface header (nanokernel.h)
#define _INT_STUB_ALIGN 1
#endif
typedef unsigned char __attribute__((aligned(_INT_STUB_ALIGN)))
NANO_INT_STUB[_INT_STUB_SIZE];
typedef unsigned char __aligned(_INT_STUB_ALIGN) NANO_INT_STUB[_INT_STUB_SIZE];
typedef struct s_isrList {