9 files changed, 14 insertions, 8 deletions

diff --git a/sys/alpha/pci/tsunamireg.h b/sys/alpha/pci/tsunamireg.h
index 60b19a3bc65e3..36ecaaf9779de 100644
--- a/sys/alpha/pci/tsunamireg.h
+++ b/sys/alpha/pci/tsunamireg.h
@@ -10,7 +10,7 @@
 
 
 typedef struct {
-	volatile u_int64_t reg __attribute__((aligned(64)));
+	volatile u_int64_t reg __aligned(64);
 } tsunami_reg;
 					/* notes */
 typedef struct { 
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 0b662659cc058..8e0f9bc0036e3 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -113,7 +113,7 @@ struct  savexmm {
 	} sv_fp[8];
 	struct xmmacc	sv_xmm[8];
 	u_char sv_pad[224];
-} __attribute__((aligned(16)));
+} __aligned(16);
 
 union	savefpu {
 	struct	save87	sv_87;
diff --git a/sys/amd64/include/npx.h b/sys/amd64/include/npx.h
index 0b662659cc058..8e0f9bc0036e3 100644
--- a/sys/amd64/include/npx.h
+++ b/sys/amd64/include/npx.h
@@ -113,7 +113,7 @@ struct  savexmm {
 	} sv_fp[8];
 	struct xmmacc	sv_xmm[8];
 	u_char sv_pad[224];
-} __attribute__((aligned(16)));
+} __aligned(16);
 
 union	savefpu {
 	struct	save87	sv_87;
diff --git a/sys/boot/ia64/ski/main.c b/sys/boot/ia64/ski/main.c
index 01b407d4652e3..cd3c479690d21 100644
--- a/sys/boot/ia64/ski/main.c
+++ b/sys/boot/ia64/ski/main.c
@@ -49,7 +49,7 @@ struct arch_switch	archsw;		/* MI/MD interface boundary */
 void
 __start(void)
 {
-	static char stack[16384] __attribute__((aligned (16)));
+	static char stack[16384] __aligned(16);
 	static char malloc[512*1024];
 	int i;
 
diff --git a/sys/boot/ia64/skiload/main.c b/sys/boot/ia64/skiload/main.c
index 01b407d4652e3..cd3c479690d21 100644
--- a/sys/boot/ia64/skiload/main.c
+++ b/sys/boot/ia64/skiload/main.c
@@ -49,7 +49,7 @@ struct arch_switch	archsw;		/* MI/MD interface boundary */
 void
 __start(void)
 {
-	static char stack[16384] __attribute__((aligned (16)));
+	static char stack[16384] __aligned(16);
 	static char malloc[512*1024];
 	int i;
 
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 0b662659cc058..8e0f9bc0036e3 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -113,7 +113,7 @@ struct  savexmm {
 	} sv_fp[8];
 	struct xmmacc	sv_xmm[8];
 	u_char sv_pad[224];
-} __attribute__((aligned(16)));
+} __aligned(16);
 
 union	savefpu {
 	struct	save87	sv_87;
diff --git a/sys/ia64/include/reg.h b/sys/ia64/include/reg.h
index b2e0604e7f3b9..8ba6e7d08bfcc 100644
--- a/sys/ia64/include/reg.h
+++ b/sys/ia64/include/reg.h
@@ -33,7 +33,7 @@
 
 struct ia64_fpreg {
 	uint64_t	fpr_bits[2];
-} __attribute__ ((aligned (16)));
+} __aligned(16);
 
 #define _IA64_FPREG_DEFINED
 
diff --git a/sys/ia64/include/signal.h b/sys/ia64/include/signal.h
index b5fefe2c0a3e6..760396cd80785 100644
--- a/sys/ia64/include/signal.h
+++ b/sys/ia64/include/signal.h
@@ -57,7 +57,7 @@ typedef long	sig_atomic_t;
 
 struct ia64_fpreg {
 	unsigned long	fpr_bits[2];
-} __attribute__ ((aligned (16)));
+} __aligned(16);
 
 #define _IA64_FPREG_DEFINED
 
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 2d584f885c671..3d0161ce0f0b6 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -116,16 +116,22 @@
 #define	__dead2
 #define	__pure2
 #define	__unused
+#define	__packed
+#define	__aligned
 #endif
 #if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7
 #define	__dead2		__attribute__((__noreturn__))
 #define	__pure2		__attribute__((__const__))
 #define	__unused
+#define	__packed
+#define	__aligned
 #endif
 #if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ == 3
 #define	__dead2		__attribute__((__noreturn__))
 #define	__pure2		__attribute__((__const__))
 #define	__unused	__attribute__((__unused__))
+#define	__packed	__attribute__((__packed__))
+#define	__aligned(x)	__attribute__((__aligned__(x)))
 #endif
 
 /* XXX: should use `#if __STDC_VERSION__ < 199901'. */