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

am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."

Browse Source 
* commit '59726beda5bec7e3db9d0c403a0ef11d0a7f182f':
  Rename crtstart variables as crtbegin, to match reality.
This commit is contained in:
Elliott Hughes 2012-09-10 12:01:04 -07:00 committed by Android Git Automerger
commit e8b4d67a37
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libc/Android.mk
View File

@ -614,23 +614,23 @@ libc_crt_target_cflags += \
# static C++ destructors are properly called on dlclose(). # static C++ destructors are properly called on dlclose().
# #
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
libc_crtstart_extension := c libc_crtbegin_extension := c
libc_crt_target_so_cflags := libc_crt_target_so_cflags :=
endif endif
ifeq ($(TARGET_ARCH),mips) ifeq ($(TARGET_ARCH),mips)
libc_crtstart_extension := S libc_crtbegin_extension := S
libc_crt_target_so_cflags := -fPIC libc_crt_target_so_cflags := -fPIC
endif endif
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
libc_crtstart_extension := S libc_crtbegin_extension := S
libc_crt_target_so_cflags := -fPIC libc_crt_target_so_cflags := -fPIC
endif endif
ifeq ($(libc_crtstart_extension),) ifeq ($(libc_crtbegin_extension),)
$(error $(TARGET_ARCH) not supported) $(error $(TARGET_ARCH) not supported)
endif endif
libc_crt_target_so_cflags += $(libc_crt_target_cflags) libc_crt_target_so_cflags += $(libc_crt_target_cflags)
libc_crt_target_crtstart_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.$(libc_crtstart_extension) libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.$(libc_crtbegin_extension)
libc_crt_target_crtstart_so_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.$(libc_crtstart_extension) libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.$(libc_crtbegin_extension)
# See the comment in crtbrand.c for the reason why we need to generate # See the comment in crtbrand.c for the reason why we need to generate
# crtbrand.s before generating crtbrand.o. # crtbrand.s before generating crtbrand.o.
@ -651,7 +651,7 @@ $(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.s
ALL_GENERATED_SOURCES += $(GEN) ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
$(GEN): $(libc_crt_target_crtstart_so_file) $(GEN): $(libc_crt_target_crtbegin_so_file)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) \ $(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $< -MD -MF $(@:%.o=%.d) -o $@ -c $<
@ -681,7 +681,7 @@ ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static1.o GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static1.o
$(GEN): $(libc_crt_target_crtstart_file) $(GEN): $(libc_crt_target_crtbegin_file)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(TARGET_CC) $(libc_crt_target_cflags) \ $(hide) $(TARGET_CC) $(libc_crt_target_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $< -MD -MF $(@:%.o=%.d) -o $@ -c $<
@ -696,7 +696,7 @@ $(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static1.o $(TARGET_OUT_INT
ALL_GENERATED_SOURCES += $(GEN) ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic1.o GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic1.o
$(GEN): $(libc_crt_target_crtstart_file) $(GEN): $(libc_crt_target_crtbegin_file)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(TARGET_CC) $(libc_crt_target_cflags) \ $(hide) $(TARGET_CC) $(libc_crt_target_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $< -MD -MF $(@:%.o=%.d) -o $@ -c $<