Merged revisions 107409 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r107409 | kpfleming | 2008-03-11 09:09:49 -0500 (Tue, 11 Mar 2008) | 13 lines

Merged revisions 107408 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107408 | kpfleming | 2008-03-11 09:07:59 -0500 (Tue, 11 Mar 2008) | 5 lines

check for compiler support for -fno-strict-overflow before using it (tested with Debian's gcc 4.3, 4.1 and 3.4)

(closes issue #12179)
Reported by: Netview

........

................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107410 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 27 insertions, 3 deletions

diff --git a/configure b/configure
index b913c425c..8421948b5 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 104045 .
+# From configure.ac Revision: 107406 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -964,6 +964,7 @@ HAS_POLL
 GC_CFLAGS
 GC_LDFLAGS
 AST_DECLARATION_AFTER_STATEMENT
+AST_NO_STRICT_OVERFLOW
 GSM_INTERNAL
 CONFIG_NETSNMP
 PG_CONFIG
@@ -17508,6 +17509,18 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
+{ echo "$as_me:$LINENO: checking for -fno-strict-overflow" >&5
+echo $ECHO_N "checking for -fno-strict-overflow... $ECHO_C" >&6; }
+if $(${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+   AST_NO_STRICT_OVERFLOW=-fno-strict-overflow
+else
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+	AST_NO_STRICT_OVERFLOW=
+fi
+
 
 { echo "$as_me:$LINENO: checking for sysinfo" >&5
 echo $ECHO_N "checking for sysinfo... $ECHO_C" >&6; }
@@ -50944,6 +50957,7 @@ HAS_POLL!$HAS_POLL$ac_delim
 GC_CFLAGS!$GC_CFLAGS$ac_delim
 GC_LDFLAGS!$GC_LDFLAGS$ac_delim
 AST_DECLARATION_AFTER_STATEMENT!$AST_DECLARATION_AFTER_STATEMENT$ac_delim
+AST_NO_STRICT_OVERFLOW!$AST_NO_STRICT_OVERFLOW$ac_delim
 GSM_INTERNAL!$GSM_INTERNAL$ac_delim
 CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim
 PG_CONFIG!$PG_CONFIG$ac_delim
@@ -50967,7 +50981,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 3834a1626..13d6c72de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,6 +478,15 @@ else
 fi
 AC_SUBST(AST_DECLARATION_AFTER_STATEMENT)
 
+AC_MSG_CHECKING(for -fno-strict-overflow)
+if $(${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+   AC_MSG_RESULT(yes)
+   AST_NO_STRICT_OVERFLOW=-fno-strict-overflow
+else
+	AC_MSG_RESULT(no)
+	AST_NO_STRICT_OVERFLOW=
+fi
+AC_SUBST(AST_NO_STRICT_OVERFLOW)
 
 AC_MSG_CHECKING(for sysinfo)
 AC_LINK_IFELSE(
diff --git a/main/Makefile b/main/Makefile
index 13ac5e685..91e878344 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -132,7 +132,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
 
 channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
 
-stdtime/localtime.o: ASTCFLAGS+=-fno-strict-overflow
+stdtime/localtime.o: ASTCFLAGS+=$(AST_NO_STRICT_OVERFLOW)
 
 AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
 AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
diff --git a/makeopts.in b/makeopts.in
index 1b150a94b..8cce87628 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -64,6 +64,7 @@ sysconfdir = @sysconfdir@
 AST_DEVMODE=@AST_DEVMODE@
 
 AST_DECLARATION_AFTER_STATEMENT=@AST_DECLARATION_AFTER_STATEMENT@
+AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
 
 ASOUND_INCLUDE=@ALSA_INCLUDE@
 ASOUND_LIB=@ALSA_LIB@