[svn-commits] pabelanger: branch 1.8 r285819 - in /branches/1.8: ./ codecs/gsm/Makefile

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Sep  9 17:52:31 2010
New Revision: 285819

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285819
Log:
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
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/codecs/gsm/Makefile

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/codecs/gsm/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/codecs/gsm/Makefile?view=diff&rev=285819&r1=285818&r2=285819
==============================================================================
--- branches/1.8/codecs/gsm/Makefile (original)
+++ branches/1.8/codecs/gsm/Makefile Thu Sep  9 17:52:31 2010
@@ -36,6 +36,14 @@
 ######### which support MMX instructions.  This should be newer pentiums,
 ######### 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 ")))