Rename subdir 'Target' variable to 'Implementation' to be less overloaded.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@93718 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Makefile b/Makefile
index 09e419a..2c66c2d 100644
--- a/Makefile
+++ b/Makefile
@@ -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): $$<"
diff --git a/lib/Makefile.mk b/lib/Makefile.mk
index ee04e0f..1ed8c11 100644
--- a/lib/Makefile.mk
+++ b/lib/Makefile.mk
@@ -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)
diff --git a/lib/arm/Makefile.mk b/lib/arm/Makefile.mk
index d3c3cb4..1dade0f 100644
--- a/lib/arm/Makefile.mk
+++ b/lib/arm/Makefile.mk
@@ -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)
diff --git a/lib/i386/Makefile.mk b/lib/i386/Makefile.mk
index 7ab112d..20f95e6 100644
--- a/lib/i386/Makefile.mk
+++ b/lib/i386/Makefile.mk
@@ -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)
diff --git a/lib/ppc/Makefile.mk b/lib/ppc/Makefile.mk
index 41ccdba..519d654 100644
--- a/lib/ppc/Makefile.mk
+++ b/lib/ppc/Makefile.mk
@@ -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)
diff --git a/lib/x86_64/Makefile.mk b/lib/x86_64/Makefile.mk
index df72156..09037b9 100644
--- a/lib/x86_64/Makefile.mk
+++ b/lib/x86_64/Makefile.mk
@@ -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)
diff --git a/make/lib_info.mk b/make/lib_info.mk
index d7fc607..1c673f3 100644
--- a/make/lib_info.mk
+++ b/make/lib_info.mk
@@ -42,4 +42,3 @@
$(foreach key,$(SubDirKeys),\
$(foreach fn,$(basename $($(key).ObjNames)),\
$(call Append,AvailableIn.$(fn),$(key))))
-
diff --git a/make/lib_util.mk b/make/lib_util.mk
index 768558b..0ff6626 100644
--- a/make/lib_util.mk
+++ b/make/lib_util.mk
@@ -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 = \
diff --git a/make/subdir.mk b/make/subdir.mk
index cf767f8..4b1b83e 100644
--- a/make/subdir.mk
+++ b/make/subdir.mk
@@ -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