[llvm-commits] [compiler-rt] r93718 - in /compiler-rt/trunk: Makefile lib/Makefile.mk lib/arm/Makefile.mk lib/i386/Makefile.mk lib/ppc/Makefile.mk lib/x86_64/Makefile.mk make/lib_info.mk make/lib_util.mk make/subdir.mk

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jan 18 00:49:09 2010
New Revision: 93718

URL: http://llvm.org/viewvc/llvm-project?rev=93718&view=rev
Log:
Rename subdir 'Target' variable to 'Implementation' to be less overloaded.

Modified:
    compiler-rt/trunk/Makefile
    compiler-rt/trunk/lib/Makefile.mk
    compiler-rt/trunk/lib/arm/Makefile.mk
    compiler-rt/trunk/lib/i386/Makefile.mk
    compiler-rt/trunk/lib/ppc/Makefile.mk
    compiler-rt/trunk/lib/x86_64/Makefile.mk
    compiler-rt/trunk/make/lib_info.mk
    compiler-rt/trunk/make/lib_util.mk
    compiler-rt/trunk/make/subdir.mk

Modified: compiler-rt/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/Makefile?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/Makefile (original)
+++ compiler-rt/trunk/Makefile Mon Jan 18 00:49:09 2010
@@ -177,8 +177,8 @@
 $(call Set,ActiveObjects,$(ObjNames:%=$(ActiveObjPath)/%))
 
 # Add to the input list for the appropriate library and update the dependency.
-$(call Append,$(Target).Inputs.$(ActiveConfig).$(ActiveArch),$(ActiveObjects))
-$(ProjObjRoot)/$(ActiveConfig)/$(ActiveArch)/libcompiler_rt.$(Target).a: $(ActiveObjects)
+$(call Append,$(Implementation).Inputs.$(ActiveConfig).$(ActiveArch),$(ActiveObjects))
+$(ProjObjRoot)/$(ActiveConfig)/$(ActiveArch)/libcompiler_rt.$(Implementation).a: $(ActiveObjects)
 
 $(ActiveObjPath)/%.o: $(ActiveSrcPath)/%.s $(Dependencies) $(ActiveObjPath)/.dir
 	$(Summary) "  ASSEMBLE:  $(ActiveConfig)/$(ActiveArch): $$<"

Modified: compiler-rt/trunk/lib/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/Makefile.mk?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/lib/Makefile.mk (original)
+++ compiler-rt/trunk/lib/Makefile.mk Mon Jan 18 00:49:09 2010
@@ -11,7 +11,7 @@
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
 ObjNames := $(Sources:%.c=%.o)
-Target := Generic
+Implementation := Generic
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard $(Dir)/*.h)

Modified: compiler-rt/trunk/lib/arm/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/Makefile.mk?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/lib/arm/Makefile.mk (original)
+++ compiler-rt/trunk/lib/arm/Makefile.mk Mon Jan 18 00:49:09 2010
@@ -13,7 +13,7 @@
 AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
 ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
-Target := Optimized
+Implementation := Optimized
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard lib/*.h $(Dir)/*.h)

Modified: compiler-rt/trunk/lib/i386/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/i386/Makefile.mk?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/lib/i386/Makefile.mk (original)
+++ compiler-rt/trunk/lib/i386/Makefile.mk Mon Jan 18 00:49:09 2010
@@ -13,7 +13,7 @@
 AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
 ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
-Target := Optimized
+Implementation := Optimized
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard lib/*.h $(Dir)/*.h)

Modified: compiler-rt/trunk/lib/ppc/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ppc/Makefile.mk?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/lib/ppc/Makefile.mk (original)
+++ compiler-rt/trunk/lib/ppc/Makefile.mk Mon Jan 18 00:49:09 2010
@@ -13,7 +13,7 @@
 AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
 ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
-Target := Optimized
+Implementation := Optimized
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard lib/*.h $(Dir)/*.h)

Modified: compiler-rt/trunk/lib/x86_64/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/x86_64/Makefile.mk?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/lib/x86_64/Makefile.mk (original)
+++ compiler-rt/trunk/lib/x86_64/Makefile.mk Mon Jan 18 00:49:09 2010
@@ -13,7 +13,7 @@
 AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
 ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
-Target := Optimized
+Implementation := Optimized
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard lib/*.h $(Dir)/*.h)

Modified: compiler-rt/trunk/make/lib_info.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/lib_info.mk?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/make/lib_info.mk (original)
+++ compiler-rt/trunk/make/lib_info.mk Mon Jan 18 00:49:09 2010
@@ -42,4 +42,3 @@
 $(foreach key,$(SubDirKeys),\
   $(foreach fn,$(basename $($(key).ObjNames)),\
     $(call Append,AvailableIn.$(fn),$(key))))
-

Modified: compiler-rt/trunk/make/lib_util.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/lib_util.mk?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/make/lib_util.mk (original)
+++ compiler-rt/trunk/make/lib_util.mk Mon Jan 18 00:49:09 2010
@@ -19,20 +19,20 @@
 # defined with a certain specificity.
 SelectFunctionDirs_Opt_ConfigAndArch = $(strip \
   $(foreach key,$(AvailableIn.$(3)),\
-    $(if $(and $(call streq,Optimized,$($(key).Target)),\
+    $(if $(and $(call streq,Optimized,$($(key).Implementation)),\
                $(call contains,$($(key).OnlyConfigs),$(1)),\
                $(call contains,$($(key).OnlyArchs),$(2))),$(key),)))
 SelectFunctionDirs_Opt_Config = $(strip \
   $(foreach key,$(AvailableIn.$(3)),\
-    $(if $(and $(call streq,Optimized,$($(key).Target)),\
+    $(if $(and $(call streq,Optimized,$($(key).Implementation)),\
                $(call contains,$($(key).OnlyConfigs),$(1))),$(key),)))
 SelectFunctionDirs_Opt_Arch = $(strip \
   $(foreach key,$(AvailableIn.$(3)),\
-    $(if $(and $(call streq,Optimized,$($(key).Target)),\
+    $(if $(and $(call streq,Optimized,$($(key).Implementation)),\
                $(call contains,$($(key).OnlyArchs),$(2))),$(key),)))
 SelectFunctionDirs_Gen = $(strip \
   $(foreach key,$(AvailableIn.$(3)),\
-    $(if $(call streq,Generic,$($(key).Target)),$(key))))
+    $(if $(call streq,Generic,$($(key).Implementation)),$(key))))
 
 # Helper function to select the right set of dirs in generic priority order.
 SelectFunctions_Gen = \

Modified: compiler-rt/trunk/make/subdir.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/subdir.mk?rev=93718&r1=93717&r2=93718&view=diff

==============================================================================
--- compiler-rt/trunk/make/subdir.mk (original)
+++ compiler-rt/trunk/make/subdir.mk Mon Jan 18 00:49:09 2010
@@ -3,8 +3,8 @@
 # Subdirectory makefiles must define:
 #   SubDirs - The subdirectories to traverse.
 #   ObjNames - The objects available in that directory.
-#   Target - The library configuration the objects should go in (Generic or
-#            Optimized)
+#   Implementation - The library configuration the objects should go in (Generic or
+#                    Optimized)
 #   Dependencies - Any dependences for the object files.
 #
 # Subdirectory makefiles may define:
@@ -44,7 +44,7 @@
 
 # The list of variables which are intended to be overridden in a subdirectory
 # makefile.
-RequiredSubdirVariables := SubDirs ObjNames Target Dependencies
+RequiredSubdirVariables := SubDirs ObjNames Implementation Dependencies
 OptionalSubdirVariables := OnlyArchs OnlyConfigs
 
 # Template: subdir_traverse_template subdir