am 6b6ebeca: am 3a131026: resolved conflicts for merge of 50a83255 to gingerbread-plus-aosp
* commit '6b6ebeca985fb3843b56b507ac4ac1be44080a9c': enable support for large files (> 2G) Enable functional DSO object destruction x86: Enable -fstack-protector Update X86 Bionic CRT files for unwind/exceptions bionic, libthread_db x86 fixes Updated gcc 4.4.3 IA toolchain doesn't require the .ctors list Remove an extra register move. Replace __atomic_XXX with GCC __sync_XXX intrinsics. move some typedefs to procfs.h required by gdbserver build use consistent guards for off_t and size_t defines for IA Simplify variable typing for IA builds sigsetmask.c was not processing the "mask" argument. Add defines for CAIF support Remove extra/unneeded copy of fenv.h Use proper variable typing Update ATOM string routines to latest Fix undefined reference to dl_iterate_phdr for x86 Fix missing NL ptrace.c Fix source file format to unix from dos
This commit is contained in:
commit
30e30acf10
@ -509,7 +509,13 @@ ifeq ($(TARGET_ARCH),arm)
|
||||
libc_common_cflags += -DHAVE_ARM_TLS_REGISTER
|
||||
endif
|
||||
else # !arm
|
||||
libc_crt_target_cflags :=
|
||||
ifeq ($(TARGET_ARCH),x86)
|
||||
libc_crt_target_cflags := -m32
|
||||
|
||||
# Enable recent IA friendly memory routines (such as for Atom)
|
||||
# These will not work on the earlier x86 machines
|
||||
libc_common_cflags += -mtune=i686 -DUSE_SSSE3 -DUSE_SSE2
|
||||
endif # x86
|
||||
endif # !arm
|
||||
|
||||
# Define ANDROID_SMP appropriately.
|
||||
|
Loading…
x
Reference in New Issue
Block a user