commit 12949e5d3946cc5d5b53d52adf5a3b925bfca2c6
author Elliott Hughes <enh@google.com> Mon Sep 10 11:16:12 2012 -0700
committer Elliott Hughes <enh@google.com> Mon Sep 10 11:16:12 2012 -0700
tree 334e0b3a34de95125c1f5ef6d1745a3517c36d54
parent 67546bf209b2c5480aa4811b2bb3c42e7862af62

Rename crtstart variables as crtbegin, to match reality.

No functional change, but it's confusing that the variable
names don't match the filenames.

Change-Id: I7109f917797be2f056e69fddb92e4a7306281813

libc/Android.mk

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 @@
 # 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 @@
 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 @@
 
 
 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 @@
 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 $<