diff options
| author | joerg <joerg@FreeBSD.org> | 2005-03-02 21:33:29 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 2005-03-02 21:33:29 +0000 |
| commit | c85a3e95f78bb183ec62ae6ef948265e7ade6b7a (patch) | |
| tree | 69c98a86a28838e983d8eca9ba158f46450df8c1 /sys/i386/isa | |
| parent | 2307c11d0fa1ac2133cff99d6c1a90c711b15f61 (diff) | |
| download | FreeBSD-src-c85a3e95f78bb183ec62ae6ef948265e7ade6b7a.zip FreeBSD-src-c85a3e95f78bb183ec62ae6ef948265e7ade6b7a.tar.gz | |
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
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/npx.c | 6 | ||||
| -rw-r--r-- | sys/i386/isa/prof_machdep.c | 20 |
2 files changed, 11 insertions, 15 deletions
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 4a80533d..6db8970 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -95,7 +95,7 @@ __FBSDID("$FreeBSD$"); #define NPX_DISABLE_I586_OPTIMIZED_BZERO (1 << 1) #define NPX_DISABLE_I586_OPTIMIZED_COPYIO (1 << 2) -#if (defined(__GNUC__) && !defined(lint)) || defined(__INTEL_COMPILER) +#if defined(__GNUCLIKE_ASM) && !defined(lint) #define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr))) #define fnclex() __asm("fnclex") @@ -113,7 +113,7 @@ __FBSDID("$FreeBSD$"); : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") -#else /* !((__GNUC__ && !lint ) || __INTEL_COMPILER) */ +#else /* !(__GNUCLIKE_ASM && !lint) */ void fldcw(caddr_t addr); void fnclex(void); @@ -130,7 +130,7 @@ void fxrstor(caddr_t addr); void start_emulating(void); void stop_emulating(void); -#endif /* (__GNUC__ && !lint ) || __INTEL_COMPILER */ +#endif /* __GNUCLIKE_ASM && !lint */ #ifdef CPU_ENABLE_SSE #define GET_FPU_CW(thread) \ diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c index 57d2342..616be3e 100644 --- a/sys/i386/isa/prof_machdep.c +++ b/sys/i386/isa/prof_machdep.c @@ -69,7 +69,7 @@ static struct gmonparam saved_gmp; #endif #endif /* GUPROF */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ GM_STATE = 0 \n\ GMON_PROF_OFF = 3 \n\ @@ -122,9 +122,9 @@ __cyg_profile_func_enter: \n\ .mcount_exit: \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#else /* !__GNUCLIKE_ASM */ +#error this file needs to be ported to your compiler +#endif /* __GNUCLIKE_ASM */ #ifdef GUPROF /* @@ -133,7 +133,7 @@ __cyg_profile_func_enter: \n\ * dependent file together with cputime(), __mcount and [.]mcount. cputime() * can't just be put in machdep.c because it has to be compiled without -pg. */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ .text \n\ # \n\ @@ -168,9 +168,7 @@ __cyg_profile_func_exit: \n\ .mexitcount_exit: \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#endif /* __GNUCLIKE_ASM */ /* * Return the time elapsed since the last call. The units are machine- @@ -353,7 +351,7 @@ stopguprof(gp) } #else /* !GUPROF */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ .text \n\ .p2align 4,0x90 \n\ @@ -361,7 +359,5 @@ __asm(" \n\ " __XSTRING(HIDENAME(mexitcount)) ": \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#endif /* __GNUCLIKE_ASM */ #endif /* GUPROF */ |
