ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am f91d63e2: am 34d0e782: Merge "To compile with llvm integrated assembler."

Browse source 
* commit 'f91d63e2b88291dcf7d2c03ccdcd1a7233e56363':
  To compile with llvm integrated assembler.
This commit is contained in:
Chih-hung Hsieh 2015-08-21 23:57:39 +00:00 • committed by Android Git Automerger
commit de74335cb2
8 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libpixelflinger/Android.mk
View file

@ -70,10 +70,6 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog
# libhardware, but this at least gets us built. # libhardware, but this at least gets us built.
LOCAL_SHARED_LIBRARIES += libhardware_legacy LOCAL_SHARED_LIBRARIES += libhardware_legacy
LOCAL_CFLAGS += -DWITH_LIB_HARDWARE LOCAL_CFLAGS += -DWITH_LIB_HARDWARE
# t32cb16blend.S does not compile with Clang.
LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
# arch-arm64/col32cb16blend.S does not compile with Clang.
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))

2
libpixelflinger/arch-arm64/col32cb16blend.S
View file

@ -26,7 +26,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
.text .text
.align .align 0
.global scanline_col32cb16blend_arm64 .global scanline_col32cb16blend_arm64

2
libpixelflinger/arch-arm64/t32cb16blend.S
View file

@ -26,7 +26,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
.text .text
.align .align 0
.global scanline_t32cb16blend_arm64 .global scanline_t32cb16blend_arm64

5
libpixelflinger/t32cb16blend.S
View file

@ -17,6 +17,7 @@
.text .text
.syntax unified
.align .align
.global scanline_t32cb16blend_arm .global scanline_t32cb16blend_arm
@ -146,7 +147,7 @@ scanline_t32cb16blend_arm:
tst r0, #0x3 tst r0, #0x3
beq aligned beq aligned
subs r2, r2, #1 subs r2, r2, #1
ldmlofd sp!, {r4-r7, lr} // return ldmfdlo sp!, {r4-r7, lr} // return
bxlo lr bxlo lr
last: last:
@ -197,6 +198,6 @@ aligned:
mov r4, r5 mov r4, r5
9: adds r2, r2, #1 9: adds r2, r2, #1
ldmlofd sp!, {r4-r7, lr} // return ldmfdlo sp!, {r4-r7, lr} // return
bxlo lr bxlo lr
b last b last

3
libpixelflinger/tests/arch-arm64/assembler/Android.mk
View file

@ -5,9 +5,6 @@ LOCAL_SRC_FILES:= \
arm64_assembler_test.cpp\ arm64_assembler_test.cpp\
asm_test_jacket.S asm_test_jacket.S
# asm_test_jacket.S does not compile with Clang.
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libpixelflinger libpixelflinger

2
libpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S
View file

@ -27,7 +27,7 @@
*/ */
.text .text
.align .align 0
.global asm_test_jacket .global asm_test_jacket

2
libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
View file

@ -5,8 +5,6 @@ LOCAL_SRC_FILES:= \
col32cb16blend_test.c \ col32cb16blend_test.c \
../../../arch-arm64/col32cb16blend.S ../../../arch-arm64/col32cb16blend.S
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES := LOCAL_C_INCLUDES :=

2
libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
View file

@ -5,8 +5,6 @@ LOCAL_SRC_FILES:= \
t32cb16blend_test.c \ t32cb16blend_test.c \
../../../arch-arm64/t32cb16blend.S ../../../arch-arm64/t32cb16blend.S
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES := LOCAL_C_INCLUDES :=