diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-02-07 04:45:55 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-02-07 04:45:55 +0000 |
| commit | 1bb96cae88abab102c9ae631612881617be1e73f (patch) | |
| tree | 682f4a34cb4a5cbbc473053efa634bc8501c042a /m4 | |
| parent | 8e338b7d04bbcc89fb7927e7f9332830cbfe1001 (diff) | |
| download | ATCD-1bb96cae88abab102c9ae631612881617be1e73f.tar.gz | |
ChangeLogTag:Sun Feb 6 20:44:26 2000 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/compiler.m4 | 8 | ||||
| -rw-r--r-- | m4/features.m4 | 2 | ||||
| -rw-r--r-- | m4/threads.m4 | 22 |
3 files changed, 30 insertions, 2 deletions
diff --git a/m4/compiler.m4 b/m4/compiler.m4 index 85c3563968b..b4db61fc364 100644 --- a/m4/compiler.m4 +++ b/m4/compiler.m4 @@ -179,9 +179,11 @@ changequote([, ])dnl ;; aCC) CXXFLAGS="$CXXFLAGS" - ACE_CXXFLAGS="$ACE_CXXFLAGS +W829,302" + ACE_CXXFLAGS="$ACE_CXXFLAGS +W302,495,667,829" DCXXFLAGS="-g" OCXXFLAGS="" + WERROR="+We67" + # Warning 67: Invalid pragma name -- needed for ACE_LACKS_PRAGMA_ONCE ;; *) if test -n "$GXX"; then @@ -262,6 +264,10 @@ changequote([, ])dnl if (CC -V 2>&1 | egrep 'Compilers 5\.0' > /dev/null); then CXXFLAGS="$CXXFLAGS -library=iostream,no%Cstd -instances=explicit" + dnl Inlining appears to cause link problems with early + dnl releases of CC 5.0. + AC_DEFINE(ACE_LACKS_INLINE_FUNCTIONS) + if test "$ace_user_enable_exceptions" != yes; then dnl See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h. AC_DEFINE(_RWSTD_NO_EXCEPTIONS) diff --git a/m4/features.m4 b/m4/features.m4 index 2b605a29a27..2817698a83f 100644 --- a/m4/features.m4 +++ b/m4/features.m4 @@ -406,7 +406,7 @@ query_aio_completions (void) // Wait for <milli_seconds> amount of time. // @@ Assigning <milli_seconds> to tv_sec. timespec timeout; - timeout.tv_sec = INT_MAX; + timeout.tv_sec = 5; timeout.tv_nsec = 0; // To get back the signal info. diff --git a/m4/threads.m4 b/m4/threads.m4 index ed9d8db0702..e6633662325 100644 --- a/m4/threads.m4 +++ b/m4/threads.m4 @@ -37,6 +37,23 @@ dnl AC_REQUIRE([AC_LANG_CPLUSPLUS]) ACE_CACHE_CHECK(if compiler may need a thread flag, ace_cv_feature_may_need_thread_flag, [ + ifelse(AC_LANG, [CPLUSPLUS], + [ace_save_CXXFLAGS="$CXXFLAGS" + case "$target" in + *solaris2*) + dnl Sun C++ 4.2/5.0 weirdness + dnl Sun C++ 4.2/5.0 links a thread function stub library in + dnl the single threaded case, which causes the link test in + dnl ACE_CHECK_THREAD_FLAGS to pass. + if (CC -V 2>&1 | egrep 'Compilers 4\.2' > /dev/null) \ + || (CC -V 2>&1 | egrep 'Compilers 5\.0' > /dev/null); then + CXXFLAGS="-xnolib" + fi + ;; + esac + ], + [ace_save_CFLAGS="$CFLAGS"]) + ACE_CHECK_THREAD_FLAGS( [ ace_cv_feature_may_need_thread_flag=no @@ -44,6 +61,11 @@ dnl AC_REQUIRE([AC_LANG_CPLUSPLUS]) [ ace_cv_feature_may_need_thread_flag=yes ]) + dnl Reset the flags to a consistent state. + dnl This prevents duplicate flags from being added to + dnl the C/CXXFLAGS variable. + ifelse(AC_LANG, [CPLUSPLUS], + [CXXFLAGS="$ace_save_CXXFLAGS"],[CFLAGS="$ace_save_CFLAGS"]) ], [ dnl The compiler/platform has no thread support linked in by default |