generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 421e911a: Merge "Simplify defining the linker architecture macro."

Browse Source 
* commit '421e911a0bebd24bf197b092d17a3000cfec2c15':
  Simplify defining the linker architecture macro.
This commit is contained in:
Elliott Hughes 2013-10-25 09:04:31 -07:00 committed by Android Git Automerger
commit 6b7fc098c4
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
linker/Android.mk
View File

@ -33,21 +33,10 @@ LOCAL_CPPFLAGS += \
# We need to access Bionic private headers in the linker.
LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -DANDROID_ARM_LINKER
endif
ifeq ($(TARGET_ARCH),mips)
LOCAL_CFLAGS += -DANDROID_MIPS_LINKER
endif
ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += -DANDROID_X86_LINKER
endif
ifeq ($(TARGET_ARCH),x86_64)
LOCAL_CFLAGS += -DANDROID_X86_64_LINKER
endif
# Make the target architecture available at compile time.
# TODO: do we really need this? why not just use __aarch64__, __arm__, __i386__, __mips__, __x86_64__?
uppercase_target_arch := $(shell tr '[:lower:]' '[:upper:]' <<< $(TARGET_ARCH))
LOCAL_CFLAGS += -DANDROID_$(uppercase_target_arch)_LINKER
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86_64))
LOCAL_MODULE := linker64