[FFmpeg-cvslog] r24945 - trunk/configure

[mru]

Author: mru
Date: Thu Aug 26 14:52:10 2010
New Revision: 24945

Log:
configure: select warning suppression syntax based on armcc version

Release 4.1 changed the flag used to pass options through the gcc
translation layer.  Detect which version is used, and choose the
appropriate flag.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Aug 26 12:03:14 2010	(r24944)
+++ trunk/configure	Thu Aug 26 14:52:10 2010	(r24945)
@@ -1845,6 +1845,7 @@ elif $cc --vsn 2>/dev/null | grep -q "AR
         --configure_sysroot="$sysroot"        \
         --configure_cpp_headers="$sysinclude" >>$logfile 2>&1 ||
         die "Error creating armcc configuration file."
+    $cc --vsn | grep -q RVCT && armcc_opt=rvct || armcc_opt=armcc
     cc="$cc --arm_linux_config_file=$armcc_conf --translate_gcc"
     as_default="${cross_prefix}gcc"
     CC_DEPFLAGS='-MMD'
@@ -2877,8 +2878,8 @@ elif enabled clang; then
     check_cflags -Qunused-arguments
 elif enabled armcc; then
     # 2523: use of inline assembler is deprecated
-    add_cflags -Wrvct,--diag_suppress=2523
-    add_cflags -Wrvct,--diag_suppress=1207
+    add_cflags -W${armcc_opt},--diag_suppress=2523
+    add_cflags -W${armcc_opt},--diag_suppress=1207
 elif enabled tms470; then
     add_cflags -pds=824 -pds=837
 fi