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

am 4a5c4711: am 9c710927: Merge "Use linker64 for the 64-bit linker."

Browse Source 
* commit '4a5c471162b79a12402ab41a68037a2453b83eaa':
  Use linker64 for the 64-bit linker.
This commit is contained in:
Elliott Hughes 2013-10-08 11:41:21 -07:00 committed by Android Git Automerger
commit 2f2e8b9778
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linker/Android.mk
View File

@ -14,7 +14,7 @@ LOCAL_SRC_FILES:= \
linker.cpp \ linker.cpp \
linker_environ.cpp \ linker_environ.cpp \
linker_phdr.cpp \ linker_phdr.cpp \
rt.cpp rt.cpp \
LOCAL_LDFLAGS := -shared -Wl,--exclude-libs,ALL LOCAL_LDFLAGS := -shared -Wl,--exclude-libs,ALL
@ -22,7 +22,6 @@ LOCAL_CFLAGS += -fno-stack-protector \
-Wstrict-overflow=5 \ -Wstrict-overflow=5 \
-fvisibility=hidden \ -fvisibility=hidden \
-Wall -Wextra -Werror \ -Wall -Wextra -Werror \
-g
# We need to access Bionic private headers in the linker. # We need to access Bionic private headers in the linker.
LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/ LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/
@ -43,7 +42,12 @@ ifeq ($(TARGET_ARCH),x86_64)
LOCAL_CFLAGS += -DANDROID_X86_64_LINKER LOCAL_CFLAGS += -DANDROID_X86_64_LINKER
endif endif
LOCAL_MODULE:= linker ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86_64))
LOCAL_MODULE := linker64
else
LOCAL_MODULE := linker
endif
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_STATIC_LIBRARIES := libc_nomalloc LOCAL_STATIC_LIBRARIES := libc_nomalloc