diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-16 19:06:31 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-10-28 15:13:36 -0700 |
| commit | 86d16a053eeff3bd432695471d8942e99b2db598 (patch) | |
| tree | 015ff57b5c3bf67a0ef1405d57019691275ccbee /libc/arch-x86 | |
| parent | b378c27226cc264c9273c5011235ec78a8b256da (diff) | |
| download | bionic-86d16a053eeff3bd432695471d8942e99b2db598.zip bionic-86d16a053eeff3bd432695471d8942e99b2db598.tar.gz bionic-86d16a053eeff3bd432695471d8942e99b2db598.tar.bz2 | |
Clean up the architecture-specific makefiles.
Group things appropriately and name each group.
Bug: 18160821
(cherry picked from commit 7c02d9428ca18ac600f7ba7d51bb24ca71e733f6)
Change-Id: I863242515af44058154d03e2d8c34678e682d66a
Diffstat (limited to 'libc/arch-x86')
| -rw-r--r-- | libc/arch-x86/x86.mk | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/libc/arch-x86/x86.mk b/libc/arch-x86/x86.mk index d90b1ce..2c90317 100644 --- a/libc/arch-x86/x86.mk +++ b/libc/arch-x86/x86.mk @@ -1,27 +1,40 @@ -# x86 specific configs +# 32-bit x86. -# These are shared by all the 32-bit targets, but not the 64-bit ones. -libc_common_src_files_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 \ -# Fortify implementations of libc functions. +# +# Default implementations of functions that are commonly optimized. +# + libc_common_src_files_x86 += \ bionic/__memcpy_chk.cpp \ bionic/__memset_chk.cpp \ bionic/__strcpy_chk.cpp \ bionic/__strcat_chk.cpp \ - upstream-freebsd/lib/libc/string/wmemmove.c \ +libc_freebsd_src_files_x86 += \ + upstream-freebsd/lib/libc/string/wmemmove.c \ -# These are shared by all the 32-bit targets, but not the 64-bit ones. -libc_bionic_src_files_x86 := \ - bionic/mmap.cpp +# +# Inherently architecture-specific functions. +# -########################################## -### CPU specific source files libc_bionic_src_files_x86 += \ arch-x86/bionic/__bionic_clone.S \ arch-x86/bionic/_exit_with_stack_teardown.S \ @@ -42,9 +55,6 @@ endif include $(arch_variant_mk) libc_common_additional_dependencies += $(arch_variant_mk) -libc_netbsd_src_files_x86 := \ - upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \ - arch_variant_mk := libc_crt_target_cflags_x86 := \ |