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/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