netchild's mega-patch to isolate compiler dependencies into a central

place.

This moves the dependency on GCC's and other compiler's features into
the central sys/cdefs.h file, while the individual source files can
then refer to #ifdef __COMPILER_FEATURE_FOO where they by now used to
refer to #if __GNUC__ > 3.1415 && __BARC__ <= 42.

By now, GCC and ICC (the Intel compiler) have been actively tested on
IA32 platforms by netchild.  Extension to other compilers is supposed
to be possible, of course.

Submitted by:	netchild
Reviewed by:	various developers on arch@, some time ago

1 files changed, 10 insertions, 6 deletions

diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 01f5c56..ecb84cd 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -38,6 +38,10 @@
 #ifndef _MACHINE_CPUFUNC_H_
 #define	_MACHINE_CPUFUNC_H_
 
+#ifndef _SYS_CDEFS_H_
+#error this file needs sys/cdefs.h as a prerequisite
+#endif
+
 struct region_descriptor;
 
 #define readb(va)	(*(volatile u_int8_t *) (va))
@@ -48,7 +52,7 @@ struct region_descriptor;
 #define writew(va, d)	(*(volatile u_int16_t *) (va) = (d))
 #define writel(va, d)	(*(volatile u_int32_t *) (va) = (d))
 
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
+#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE)
 
 static __inline void
 breakpoint(void)
@@ -126,12 +130,12 @@ halt(void)
 	__asm __volatile("hlt");
 }
 
-#if __GNUC__ < 2
+#if !defined(__GNUCLIKE_BUILTIN_CONSTANT_P) || __GNUCLIKE_ASM < 3
 
 #define	inb(port)		inbv(port)
 #define	outb(port, data)	outbv(port, data)
 
-#else /* __GNUC >= 2 */
+#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */
 
 /*
  * The following complications are to get around gcc not having a
@@ -178,7 +182,7 @@ outbc(u_int port, u_char data)
 	__asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port)));
 }
 
-#endif /* __GNUC <= 2 */
+#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P  && __GNUCLIKE_ASM >= 3*/
 
 static __inline u_char
 inbv(u_int port)
@@ -618,7 +622,7 @@ intr_restore(register_t eflags)
 	write_eflags(eflags);
 }
 
-#else /* !(__GNUC__ || __INTEL_COMPILER) */
+#else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */
 
 int	breakpoint(void);
 u_int	bsfl(u_int mask);
@@ -683,7 +687,7 @@ void	wbinvd(void);
 void	write_eflags(u_int ef);
 void	wrmsr(u_int msr, u_int64_t newval);
 
-#endif	/* __GNUC__ || __INTEL_COMPILER */
+#endif	/* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */
 
 void    reset_dbregs(void);