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

Commit c8518616 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 02f68c4b: am 4800e20e: Merge "system/core: rename aarch64 target to arm64" 

* commit '02f68c4b':
  system/core: rename aarch64 target to arm64
parents 72235773 02f68c4b

include/cutils/atomic-inline.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern "C" { 
#endif



#if defined(__aarch64__)

#include <cutils/atomic-aarch64.h>

#include <cutils/atomic-arm64.h>

#elif defined(__arm__)

#include <cutils/atomic-arm.h>

#elif defined(__i386__) || defined(__x86_64__)

libbacktrace/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -148,10 +148,10 @@ LOCAL_CFLAGS += \ 
	-DGTEST_OS_LINUX_ANDROID \

	-DGTEST_HAS_STD_STRING \



ifeq ($(TARGET_ARCH),aarch64)

ifeq ($(TARGET_ARCH),arm64)

  $(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain)

  LOCAL_CFLAGS += -fno-stack-protector

endif # aarch64

endif # arm64



LOCAL_CONLYFLAGS += \

	$(common_conlyflags) \

libpixelflinger/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -52,11 +52,11 @@ endif 


LOCAL_SHARED_LIBRARIES := libcutils liblog



ifeq ($(TARGET_ARCH),aarch64)

PIXELFLINGER_SRC_FILES += arch-aarch64/t32cb16blend.S

PIXELFLINGER_SRC_FILES += arch-aarch64/col32cb16blend.S

PIXELFLINGER_SRC_FILES += codeflinger/Aarch64Assembler.cpp

PIXELFLINGER_SRC_FILES += codeflinger/Aarch64Disassembler.cpp

ifeq ($(TARGET_ARCH),arm64)

PIXELFLINGER_SRC_FILES += arch-arm64/t32cb16blend.S

PIXELFLINGER_SRC_FILES += arch-arm64/col32cb16blend.S

PIXELFLINGER_SRC_FILES += codeflinger/Arm64Assembler.cpp

PIXELFLINGER_SRC_FILES += codeflinger/Arm64Disassembler.cpp

PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer

endif

libpixelflinger/arch-aarch64/col32cb16blend.S→libpixelflinger/arch-arm64/col32cb16blend.S

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    .text

    .align



    .global scanline_col32cb16blend_aarch64

    .global scanline_col32cb16blend_arm64



//

// This function alpha blends a fixed color into a destination scanline, using
@@ -46,7 +46,7 @@ 
// w2 = count





scanline_col32cb16blend_aarch64:

scanline_col32cb16blend_arm64:



    lsr         w5, w1, #24                     // shift down alpha

    mov         w9, #0xff                       // create mask