Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b21ef04c authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am ed2abf42: Merge "Use standard arm assembly syntax." 

* commit 'ed2abf42':
  Use standard arm assembly syntax.
parents 672a10bc ed2abf42

media/libstagefright/codecs/amrwbenc/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ LOCAL_SRC_FILES += \ 


endif



# ARMV5E/Filt_6k_7k_opt.s does not compile with Clang.

LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as



LOCAL_MODULE := libstagefright_amrwbenc



LOCAL_ARM_MODE := arm

media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s

+1 −1
Original line number Diff line number Diff line
@@ -99,6 +99,6 @@ LOOP: 
           LDMFD   	r13!, {r4 - r12, r15}



	   @ENDP

	   .END

	   .end

media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s

+1 −1
Original line number Diff line number Diff line
@@ -75,6 +75,6 @@ Dot_product12_end: 


          LDMFD   	    r13!, {r4 - r12, r15}

          @ENDFUNC

          .END

          .end

media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s

+1 −1
Original line number Diff line number Diff line
@@ -183,6 +183,6 @@ Filt_6k_7k_end: 
Lable1:

          .word   		fir_6k_7k-Lable1

          @ENDFUNC

          .END

          .end

media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s

+1 −1
Original line number Diff line number Diff line
@@ -226,6 +226,6 @@ Norm_corr_asm_end: 
        ADD            r13, r13, #voSTACK

        LDMFD          r13!, {r4 - r12, r15}



        .END

        .end