diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-10 12:01:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-10 12:01:04 -0700 |
| commit | e8b4d67a37e27ffc34086562ad13dcd9316a8249 (patch) | |
| tree | 334e0b3a34de95125c1f5ef6d1745a3517c36d54 | |
| parent | f9920563dabc21a5c741ef630e6ca8fe66fbbe5b (diff) | |
| parent | 59726beda5bec7e3db9d0c403a0ef11d0a7f182f (diff) | |
| download | bionic-e8b4d67a37e27ffc34086562ad13dcd9316a8249.zip bionic-e8b4d67a37e27ffc34086562ad13dcd9316a8249.tar.gz bionic-e8b4d67a37e27ffc34086562ad13dcd9316a8249.tar.bz2 | |
am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
* commit '59726beda5bec7e3db9d0c403a0ef11d0a7f182f':
Rename crtstart variables as crtbegin, to match reality.
| -rw-r--r-- | libc/Android.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 3340b86..c3759db 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -614,23 +614,23 @@ libc_crt_target_cflags += \ # static C++ destructors are properly called on dlclose(). # ifeq ($(TARGET_ARCH),arm) - libc_crtstart_extension := c + libc_crtbegin_extension := c libc_crt_target_so_cflags := endif ifeq ($(TARGET_ARCH),mips) - libc_crtstart_extension := S + libc_crtbegin_extension := S libc_crt_target_so_cflags := -fPIC endif ifeq ($(TARGET_ARCH),x86) - libc_crtstart_extension := S + libc_crtbegin_extension := S libc_crt_target_so_cflags := -fPIC endif -ifeq ($(libc_crtstart_extension),) +ifeq ($(libc_crtbegin_extension),) $(error $(TARGET_ARCH) not supported) endif 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_crtstart_so_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.$(libc_crtstart_extension) +libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.$(libc_crtbegin_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 # crtbrand.s before generating crtbrand.o. @@ -651,7 +651,7 @@ $(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.s ALL_GENERATED_SOURCES += $(GEN) 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 $@) $(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) \ -MD -MF $(@:%.o=%.d) -o $@ -c $< @@ -681,7 +681,7 @@ ALL_GENERATED_SOURCES += $(GEN) GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static1.o -$(GEN): $(libc_crt_target_crtstart_file) +$(GEN): $(libc_crt_target_crtbegin_file) @mkdir -p $(dir $@) $(hide) $(TARGET_CC) $(libc_crt_target_cflags) \ -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) GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic1.o -$(GEN): $(libc_crt_target_crtstart_file) +$(GEN): $(libc_crt_target_crtbegin_file) @mkdir -p $(dir $@) $(hide) $(TARGET_CC) $(libc_crt_target_cflags) \ -MD -MF $(@:%.o=%.d) -o $@ -c $< |