diff options
author | Paul Belanger <paul.belanger@polybeacon.com> | 2010-09-09 22:53:44 +0000 |
---|---|---|
committer | Paul Belanger <paul.belanger@polybeacon.com> | 2010-09-09 22:53:44 +0000 |
commit | 73c22a15b9c3ad03b6477da939559339bfd14e59 (patch) | |
tree | 3270b0cafc747018c94803463fe64bc04a22ec68 /codecs/gsm | |
parent | 74ebe3890389c75b0e2bf8d19ef767a38a59c082 (diff) |
Merged revisions 285819 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r285819 | pabelanger | 2010-09-09 18:52:31 -0400 (Thu, 09 Sep 2010) | 22 lines
Merged revisions 285818 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r285818 | pabelanger | 2010-09-09 18:49:19 -0400 (Thu, 09 Sep 2010) | 15 lines
Merged revisions 285817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r285817 | pabelanger | 2010-09-09 18:34:35 -0400 (Thu, 09 Sep 2010) | 8 lines
GCC 4.2.x optimizations result in improper behavior of GSM codec
(closes issue #17688)
Reported by: pprindeville
Patches:
asterisk-trunk-bugid11243.patch uploaded by pprindeville (license 347)
Tested by: mkeuter, pprindeville
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/gsm')
-rw-r--r-- | codecs/gsm/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index f8a4c477a..bef4d40d7 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -37,6 +37,14 @@ WAV49 = -DWAV49 ######### ppro's, etc, as well as the AMD K6 and K7. The compile will ######### probably require gcc. +# Due to the gsm codec beeing broken when compiled with gcc version 4.2 +# and optimization higher than -O2 we are checking for that version and +# set the optimization to -O2 in this case. + +ifeq ($(shell $(CC) -v 2>&1 | awk '/^gcc version/ { split($$3, v, "."); printf "%s.%s\n", v[1], v[2]; }' ),4.2) +OPTIMIZE=-O2 +endif + ifeq (,$(findstring $(shell uname -s),Darwin SunOS)) ifeq (,$(strip $(findstring $(PROC) ,"x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips "))) ifeq (,$(strip $(findstring $(shell uname -m) ,"ppc ppc64 alpha armv4l s390 "))) |