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

Commit 3f7149c1 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

Use standard arm assembly syntax. 

The output from gcc before and after this change,
and from llvm are identical, except the ADRL to ADR change.

In this case, old "ADRL r8, Table" is translated into
       add r8, pc, #1184   ; 0x4a0
       nop         ; (mov r0, r0)
and new "ADR r8, Table; NOP" is translated into equivalent:
       add r8, pc, #1184   ; 0x4a0
       nop         {0}

BUG: 21169627

Change-Id: I64130e99f6506494b9c4a6e0f1f850491d481242
parent 507afd8c

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