Commit 7a512334 authored by Alexey Kopytov's avatar Alexey Kopytov

Bug #41710: MySQL 5.1.30 crashes on the latest OpenSolaris 10

 
Change the default optimization level for Sun Studio to "-O1". 
This is a workaround for a Sun Studio bug (see bug #41710 
comments for details): 
 
1. Use $GCC instead of $ac_cv_prog_gcc to check for gcc, since 
the first one is the only documented way to do it. 
 
2. Use $GXX instead of $ac_cv_prog_cxx_g to check for g++, 
since the latter is set to "yes" when the C++ compiler accepts 
"-g" which is the case for both g++ and CC. 
 
3. When building with Sun Studio, set the default values for 
CFLAGS/CXXFLAGS to "-O1", since unlike GCC, Sun Studio 
interprets "-O" as "-xO3" (see the manual pages for cc and CC). 
parent 7433b19a
...@@ -1756,7 +1756,7 @@ esac ...@@ -1756,7 +1756,7 @@ esac
# Build optimized or debug version ? # Build optimized or debug version ?
# First check for gcc and g++ # First check for gcc and g++
if test "$ac_cv_prog_gcc" = "yes" if test "$GCC" = "yes"
then then
DEBUG_CFLAGS="-g" DEBUG_CFLAGS="-g"
DEBUG_OPTIMIZE_CC="-O" DEBUG_OPTIMIZE_CC="-O"
...@@ -1764,9 +1764,16 @@ then ...@@ -1764,9 +1764,16 @@ then
else else
DEBUG_CFLAGS="-g" DEBUG_CFLAGS="-g"
DEBUG_OPTIMIZE_CC="" DEBUG_OPTIMIZE_CC=""
OPTIMIZE_CFLAGS="-O" case $SYSTEM_TYPE in
*solaris*)
OPTIMIZE_CFLAGS="-O1"
;;
*)
OPTIMIZE_CFLAGS="-O"
;;
esac
fi fi
if test "$ac_cv_prog_cxx_g" = "yes" if test "$GXX" = "yes"
then then
DEBUG_CXXFLAGS="-g" DEBUG_CXXFLAGS="-g"
DEBUG_OPTIMIZE_CXX="-O" DEBUG_OPTIMIZE_CXX="-O"
...@@ -1774,7 +1781,14 @@ then ...@@ -1774,7 +1781,14 @@ then
else else
DEBUG_CXXFLAGS="-g" DEBUG_CXXFLAGS="-g"
DEBUG_OPTIMIZE_CXX="" DEBUG_OPTIMIZE_CXX=""
OPTIMIZE_CXXFLAGS="-O" case $SYSTEM_TYPE in
*solaris*)
OPTIMIZE_CXXFLAGS="-O1"
;;
*)
OPTIMIZE_CXXFLAGS="-O"
;;
esac
fi fi
if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment