diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:57:57 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:57:57 +0200 |
| commit | dd06ee01e06300725f46c85df18faace2d01d9d6 (patch) | |
| tree | 8cdc08ff7c6730971e32e9bde2c49d784755228e /erts/lib_src | |
| parent | 8b4659d5246166cef9b8e9aa91c644e3b3ec66d5 (diff) | |
| parent | 4eabd78146594a9cd75eb9dc62ba449f7b6b8eb5 (diff) | |
| download | otp-dd06ee01e06300725f46c85df18faace2d01d9d6.tar.gz otp-dd06ee01e06300725f46c85df18faace2d01d9d6.tar.bz2 otp-dd06ee01e06300725f46c85df18faace2d01d9d6.zip | |
Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maint
* jjhoo/mingw_compile_fix_forceinline/OTP-11945:
Do not use __always_inline__ attribute unless gcc vsn >= 3.1.1
Add ETHR_FORCE_INLINE define to hide compiler specific directives
Diffstat (limited to 'erts/lib_src')
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 7 | ||||
| -rw-r--r-- | erts/lib_src/common/ethr_mutex.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index 5a271c5268..8bf7656bb0 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -25,6 +25,7 @@ # include <windows.h> #endif +#include "ethread.h" #include "erl_misc_utils.h" #if defined(__WIN32__) @@ -191,7 +192,7 @@ struct erts_cpu_info_t_ { #if defined(__WIN32__) -static __forceinline int +static ETHR_FORCE_INLINE int get_proc_affinity(erts_cpu_info_t *cpuinfo, cpu_set_t *cpuset) { DWORD_PTR pamask; @@ -206,7 +207,7 @@ get_proc_affinity(erts_cpu_info_t *cpuinfo, cpu_set_t *cpuset) } } -static __forceinline int +static ETHR_FORCE_INLINE int set_thr_affinity(cpu_set_t *set) { if (*set == (cpu_set_t) 0) @@ -1157,7 +1158,7 @@ read_topology(erts_cpu_info_t *cpuinfo) #define ERTS_MU_RELATION_CACHE 2 /* RelationCache */ #define ERTS_MU_RELATION_PROCESSOR_PACKAGE 3 /* RelationProcessorPackage */ -static __forceinline int +static ETHR_FORCE_INLINE int rel_cmp_val(int r) { switch (r) { diff --git a/erts/lib_src/common/ethr_mutex.c b/erts/lib_src/common/ethr_mutex.c index 72b44033ad..4e56efaf8b 100644 --- a/erts/lib_src/common/ethr_mutex.c +++ b/erts/lib_src/common/ethr_mutex.c @@ -1433,7 +1433,7 @@ void LeaveCriticalSection(CRITICAL_SECTION *cs) #define ETHR_CND_WAIT__ ((ethr_sint32_t) 0x11dead11) #define ETHR_CND_WAKEUP__ ((ethr_sint32_t) 0x11beef11) -static __forceinline void +static ETHR_FORCE_INLINE void cond_wakeup(ethr_ts_event *tse) { ETHR_ASSERT(ethr_atomic32_read(&tse->uaflgs) == ETHR_CND_WAIT__); @@ -1574,7 +1574,7 @@ ethr_cond_wait(ethr_cond *cnd, ethr_mutex *mtx) return 0; } -static __forceinline void +static ETHR_FORCE_INLINE void posix_compliant_mtx_enqueue(ethr_mutex *mtx, ethr_ts_event *tse_start, ethr_ts_event *tse_end) @@ -1614,7 +1614,7 @@ posix_compliant_mtx_enqueue(ethr_mutex *mtx, } } -static __forceinline void +static ETHR_FORCE_INLINE void enqueue_cond_wakeups(ethr_ts_event *queue, int posix_compliant) { if (queue) { |