mirror of
https://github.com/postgres/postgres.git
synced 2025-05-03 22:24:49 +03:00
Back-port HEAD's configure fixes to select appropriate compiler switches
for Intel's icc and AIX's xlc.
This commit is contained in:
Tom Lane
parent
e33ab5b6d5
commit
804e7c5c53
180
configure
vendored
180
configure
vendored
@ -2713,12 +2713,66 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$GCC" = yes; then
|
||||
CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
|
||||
# Some versions of GCC support some additional useful warning flags.
|
||||
# Check whether they are supported, and add them to CFLAGS if so.
|
||||
|
||||
# Some versions of GCC support some additional useful warning flags.
|
||||
# Check whether they are supported, and add them to CFLAGS if so.
|
||||
echo "$as_me:$LINENO: checking if $CC supports -Wdeclaration-after-statement" >&5
|
||||
if test "$GCC" = yes; then
|
||||
|
||||
# ICC pretends to be GCC but it's lying; it doesn't support these options.
|
||||
# So we have to check if "GCC" is really ICC.
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef __INTEL_COMPILER
|
||||
choke me
|
||||
#endif
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ICC=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ICC=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
if test "$ICC" = no; then
|
||||
CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
|
||||
|
||||
echo "$as_me:$LINENO: checking if $CC supports -Wdeclaration-after-statement" >&5
|
||||
echo $ECHO_N "checking if $CC supports -Wdeclaration-after-statement... $ECHO_C" >&6
|
||||
pgac_save_CFLAGS=$CFLAGS
|
||||
CFLAGS="$pgac_save_CFLAGS -Wdeclaration-after-statement"
|
||||
@ -2771,7 +2825,7 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
echo "$as_me:$LINENO: checking if $CC supports -Wendif-labels" >&5
|
||||
echo "$as_me:$LINENO: checking if $CC supports -Wendif-labels" >&5
|
||||
echo $ECHO_N "checking if $CC supports -Wendif-labels... $ECHO_C" >&6
|
||||
pgac_save_CFLAGS=$CFLAGS
|
||||
CFLAGS="$pgac_save_CFLAGS -Wendif-labels"
|
||||
@ -2824,6 +2878,64 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
else
|
||||
# Intel compiler has a bug/misoptimization in checking for
|
||||
# division by NAN (NaN == 0), -mp1 fixes it, so add it to the
|
||||
# CFLAGS.
|
||||
echo "$as_me:$LINENO: checking if $CC supports -mp1" >&5
|
||||
echo $ECHO_N "checking if $CC supports -mp1... $ECHO_C" >&6
|
||||
pgac_save_CFLAGS=$CFLAGS
|
||||
CFLAGS="$pgac_save_CFLAGS -mp1"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
CFLAGS="$pgac_save_CFLAGS"
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
|
||||
# Disable strict-aliasing rules; needed for gcc 3.3+
|
||||
echo "$as_me:$LINENO: checking if $CC supports -fno-strict-aliasing" >&5
|
||||
@ -2879,6 +2991,61 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
elif test x"${CC}" = x"xlc"; then
|
||||
# AIX xlc has to have strict aliasing turned off too
|
||||
echo "$as_me:$LINENO: checking if $CC supports -qnoansialias" >&5
|
||||
echo $ECHO_N "checking if $CC supports -qnoansialias... $ECHO_C" >&6
|
||||
pgac_save_CFLAGS=$CFLAGS
|
||||
CFLAGS="$pgac_save_CFLAGS -qnoansialias"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
CFLAGS="$pgac_save_CFLAGS"
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
|
||||
# supply -g if --enable-debug
|
||||
@ -2897,7 +3064,6 @@ fi
|
||||
# Check if the compiler still works with the template settings
|
||||
echo "$as_me:$LINENO: checking whether the C compiler still works" >&5
|
||||
echo $ECHO_N "checking whether the C compiler still works... $ECHO_C" >&6
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
|
||||
32
configure.in
32
configure.in
@ -1,5 +1,5 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl $PostgreSQL: pgsql/configure.in,v 1.431.2.12 2006/07/11 16:15:03 tgl Exp $
|
||||
dnl $PostgreSQL: pgsql/configure.in,v 1.431.2.13 2006/08/07 20:08:43 tgl Exp $
|
||||
dnl
|
||||
dnl Developers, please strive to achieve this order:
|
||||
dnl
|
||||
@ -250,16 +250,34 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$GCC" = yes; then
|
||||
CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
|
||||
# Some versions of GCC support some additional useful warning flags.
|
||||
# Check whether they are supported, and add them to CFLAGS if so.
|
||||
|
||||
# Some versions of GCC support some additional useful warning flags.
|
||||
# Check whether they are supported, and add them to CFLAGS if so.
|
||||
PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
|
||||
PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
|
||||
if test "$GCC" = yes; then
|
||||
|
||||
# ICC pretends to be GCC but it's lying; it doesn't support these options.
|
||||
# So we have to check if "GCC" is really ICC.
|
||||
AC_TRY_COMPILE([], [@%:@ifndef __INTEL_COMPILER
|
||||
choke me
|
||||
@%:@endif], [ICC=[yes]], [ICC=[no]])
|
||||
|
||||
if test "$ICC" = no; then
|
||||
CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
|
||||
|
||||
PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
|
||||
PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
|
||||
else
|
||||
# Intel compiler has a bug/misoptimization in checking for
|
||||
# division by NAN (NaN == 0), -mp1 fixes it, so add it to the
|
||||
# CFLAGS.
|
||||
PGAC_PROG_CC_CFLAGS_OPT([-mp1])
|
||||
fi
|
||||
|
||||
# Disable strict-aliasing rules; needed for gcc 3.3+
|
||||
PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing])
|
||||
elif test x"${CC}" = x"xlc"; then
|
||||
# AIX xlc has to have strict aliasing turned off too
|
||||
PGAC_PROG_CC_CFLAGS_OPT([-qnoansialias])
|
||||
fi
|
||||
|
||||
# supply -g if --enable-debug
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user