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

Share LP32 makefile settings between arches

Browse Source 
Add <var>_32 to patch-up-arch-specific-flags, and move the LP32
cruft varaibles from the 32-bit arch specific makefiles into the
top level Android.mk.

Change-Id: Id3fcf6805d4af048c2524c94b1295416ebe7d057
This commit is contained in:
Colin Cross 2015-02-04 17:35:49 -08:00
parent 94335cc8e2
commit 1742a32aea
4 changed files with 19 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libc/Android.mk
View File

@ -513,6 +513,23 @@ libc_upstream_openbsd_src_files := \
libc_arch_static_src_files := \ libc_arch_static_src_files := \
bionic/dl_iterate_phdr_static.cpp \ bionic/dl_iterate_phdr_static.cpp \
# Various kinds of LP32 cruft.
# ========================================================
libc_bionic_src_files_32 += \
bionic/mmap.cpp \
libc_common_src_files_32 += \
bionic/legacy_32_bit_support.cpp \
bionic/ndk_cruft.cpp \
bionic/time64.c \
libc_netbsd_src_files_32 += \
upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \
libc_openbsd_src_files_32 += \
upstream-openbsd/lib/libc/stdio/putw.c \
# Define some common cflags # Define some common cflags
# ======================================================== # ========================================================
libc_common_cflags := \ libc_common_cflags := \
@ -569,12 +586,13 @@ libc_common_c_includes += \
$(LOCAL_PATH)/stdio \ $(LOCAL_PATH)/stdio \
# ======================================================== # ========================================================
# Add in the arch-specific flags. # Add in the arch or 32-bit specific flags
# Must be called with $(eval). # Must be called with $(eval).
# $(1): the LOCAL_ variable name # $(1): the LOCAL_ variable name
# $(2): the bionic variable name to pull in # $(2): the bionic variable name to pull in
define patch-up-arch-specific-flags define patch-up-arch-specific-flags
$(1)_$(TARGET_ARCH) += $($(2)_$(TARGET_ARCH)) $(1)_$(TARGET_ARCH) += $($(2)_$(TARGET_ARCH))
$(1)_32 += $($(2)_32)
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
$(1)_$(TARGET_2ND_ARCH) += $($(2)_$(TARGET_2ND_ARCH)) $(1)_$(TARGET_2ND_ARCH) += $($(2)_$(TARGET_2ND_ARCH))
endif endif

18
libc/arch-arm/arm.mk
View File

@ -1,23 +1,5 @@
# 32-bit arm. # 32-bit arm.
#
# Various kinds of LP32 cruft.
#
libc_bionic_src_files_arm += \
bionic/mmap.cpp \
libc_common_src_files_arm += \
bionic/legacy_32_bit_support.cpp \
bionic/ndk_cruft.cpp \
bionic/time64.c \
libc_netbsd_src_files_arm += \
upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \
libc_openbsd_src_files_arm += \
upstream-openbsd/lib/libc/stdio/putw.c \
# #
# Default implementations of functions that are commonly optimized. # Default implementations of functions that are commonly optimized.
# #

18
libc/arch-mips/mips.mk
View File

@ -1,23 +1,5 @@
# 32-bit mips. # 32-bit mips.
#
# Various kinds of LP32 cruft.
#
libc_bionic_src_files_mips += \
bionic/mmap.cpp \
libc_common_src_files_mips += \
bionic/legacy_32_bit_support.cpp \
bionic/ndk_cruft.cpp \
bionic/time64.c \
libc_netbsd_src_files_mips += \
upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \
libc_openbsd_src_files_mips += \
upstream-openbsd/lib/libc/stdio/putw.c \
# #
# Default implementations of functions that are commonly optimized. # Default implementations of functions that are commonly optimized.
# #

18
libc/arch-x86/x86.mk
View File

@ -1,23 +1,5 @@
# 32-bit x86. # 32-bit x86.
#
# Various kinds of LP32 cruft.
#
libc_bionic_src_files_x86 += \
bionic/mmap.cpp \
libc_common_src_files_x86 += \
bionic/legacy_32_bit_support.cpp \
bionic/ndk_cruft.cpp \
bionic/time64.c \
libc_netbsd_src_files_x86 += \
upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \
libc_openbsd_src_files_x86 += \
upstream-openbsd/lib/libc/stdio/putw.c \
# #
# Default implementations of functions that are commonly optimized. # Default implementations of functions that are commonly optimized.
# #