Version update 1.2.0 -> 1.3.0 (fix crash on 64bit)tizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_unified/20170308.100415submit/tizen_ivi/20160217.000006submit/tizen_ivi/20160217.000000submit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_3.0_wearable/20161015.000004submit/tizen_3.0_tv/20161015.000004submit/tizen_3.0_mobile/20161015.000005submit/tizen_3.0_ivi/20161010.000005submit/tizen_3.0_common/20161104.104000submit/tizen_3.0.m2/20170104.093754submit/tizen/20150805.084143accepted/tizen/wearable/20150805.103244accepted/tizen/unified/20170309.040230accepted/tizen/tv/20150805.103220accepted/tizen/mobile/20150805.103211accepted/tizen/ivi/20160218.025231accepted/tizen/3.0/wearable/20161015.083554accepted/tizen/3.0/tv/20161016.005243accepted/tizen/3.0/mobile/20161015.033933accepted/tizen/3.0/ivi/20161011.055336accepted/tizen/3.0/common/20161114.111409accepted/tizen/3.0.m2/wearable/20170105.025349accepted/tizen/3.0.m2/tv/20170105.025253accepted/tizen/3.0.m2/mobile/20170105.025145tizen_3.0_tvtizen_3.0.m2tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_3.0_wearableaccepted/tizen_3.0_tvaccepted/tizen_3.0_mobileaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile

Change-Id: Ide07602a8064b14e88d8842c777d5f68db71d644
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

1 files changed, 6 insertions, 25 deletions

diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/norm_l.h b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/norm_l.h
index faea591..288b6c7 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/norm_l.h
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/norm_l.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,29 +86,9 @@ extern "C"
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if !( defined(PV_ARM_V5) || defined(PV_ARM_GCC_V5) )
 
-    /* C EQUIVALENT */
-    OSCL_IMPORT_REF Word16 norm_l(Word32 L_var1);
-
-#elif defined(PV_ARM_V5)
-
-    __inline Word16 norm_l(Word32 L_var1)
-    {
-        register Word32 var_out = 0;
-
-        __asm
-        {
-            CMP    L_var1, #0
-            EORNE  L_var1, L_var1, L_var1, LSL #1
-            CLZNE  var_out, L_var1
-        }
-
-        return ((Word16)var_out);
-    }
-
-#elif defined(PV_ARM_GCC_V5)
 
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))
     static inline Word16 norm_l(Word32 L_var1)
     {
         register Word32 var_out = 0;
@@ -116,7 +96,7 @@ extern "C"
         if (L_var1)
         {
             ra ^= (ra << 1);
-            asm volatile(
+            __asm__ volatile(
                 "clz %0, %1"
     : "=r"(var_out)
                         : "r"(ra)
@@ -124,6 +104,9 @@ extern "C"
         }
         return (var_out);
     }
+#else
+    /* C EQUIVALENT */
+    OSCL_IMPORT_REF Word16 norm_l(Word32 L_var1);
 
 #endif
     /*----------------------------------------------------------------------------
@@ -134,5 +117,3 @@ extern "C"
 #endif
 
 #endif
-
-