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

resolved conflicts for merge of 50a83255 to gingerbread-plus-aosp

Browse Source 
Change-Id: Idf1971120bbdd52676f95aa3aa69f62342dc012e
This commit is contained in:
David 'Digit' Turner 2011-07-11 21:39:06 +02:00
commit 3a13102637
2 changed files with 77 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libc/Android.mk
View File

@ -508,7 +508,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.
@ -555,18 +561,24 @@ ifneq ($(filter arm x86,$(TARGET_ARCH)),)
# that will call __cxa_finalize(&__dso_handle) in order to ensure that
# static C++ destructors are properly called on dlclose().
#
libc_crt_target_so_cflags := $(libc_crt_target_cflags)
ifeq ($(TARGET_ARCH),x86)
# This flag must be added for x86 targets, but not for ARM
libc_crt_target_so_cflags += -fPIC
endif
GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_so.o
$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.S
@mkdir -p $(dir $@)
$(TARGET_CC) $(libc_crt_target_cflags) -fPIC -o $@ -c $<
$(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $<
ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_so.o
$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend_so.S
@mkdir -p $(dir $@)
$(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $<
$(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $<
ALL_GENERATED_SOURCES += $(GEN)
endif # TARGET_ARCH == x86
endif # TARGET_ARCH == x86 || TARGET_ARCH == arm
GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o