xnu-7195.50.7.100.1.tar.gz

[apple/xnu.git] / tools / tests / affinity / Makefile

diff --git a/tools/tests/affinity/Makefile b/tools/tests/affinity/Makefile
index 5f45973ab8924f237e43f99e4b27d03cd0957912..7096bdc5bd41db94fd7353a0e2f529bc86eca249 100644 (file)
--- a/tools/tests/affinity/Makefile
+++ b/tools/tests/affinity/Makefile
@@ -4,28 +4,8 @@ CC:=$(shell xcrun -sdk "$(SDKROOT)" -find cc)
 
 SYMROOT?=$(shell /bin/pwd)
 
-ifdef RC_ARCHS
-    ARCHS:=$(RC_ARCHS)
-  else
-    ifeq "$(Embedded)" "YES"
-      ARCHS:=armv7 armv7s arm64
-    else
-      ARCHS:=x86_64 i386
-  endif
-endif
-
-# These are convenience functions for filtering based on substrings, as the
-# normal filter functions only accept one wildcard.
-FILTER_OUT_SUBSTRING=$(strip $(foreach string,$(2),$(if $(findstring $(1),$(string)),,$(string))))
-FILTER_SUBSTRING=$(strip $(foreach string,$(2),$(if $(findstring $(1),$(string)),$(string),)))
-
-ARCH_32:=$(call FILTER_OUT_SUBSTRING,64,$(ARCHS))
-ARCH_64:=$(call FILTER_SUBSTRING,64,$(ARCHS))
-
-ARCH_32_FLAGS := $(patsubst %, -arch %, $(ARCH_32))
-ARCH_64_FLAGS := $(patsubst %, -arch %, $(ARCH_64))
-
 CFLAGS :=-g -isysroot $(SDKROOT) -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
+CFLAGS += -Wl,-sectcreate,__INFO_FILTER,__disable,/dev/null
 
 DSTROOT?=$(shell /bin/pwd)
 SRCROOT?=$(shell /bin/pwd)
@@ -34,18 +14,18 @@ SOURCES := sets.c pool.c tags.c
 ARCH_32_TARGETS := $(addprefix $(DSTROOT)/, sets pool tags)
 ARCH_64_TARGETS := $(addprefix $(DSTROOT)/, sets64 pool64 tags64)
 
-TARGETS := $(if $(ARCH_64), $(ARCH_64_TARGETS)) $(if $(ARCH_32), $(ARCH_32_TARGETS))
+TARGETS := $(if $(ARCH_CONFIGS_64), $(ARCH_64_TARGETS)) $(if $(ARCH_CONFIGS_32), $(ARCH_32_TARGETS))
 
 
 all:   $(TARGETS)
 
 $(ARCH_32_TARGETS): $(DSTROOT)/%: $(SRCROOT)/%.c
-       $(CC) $(CFLAGS) $(ARCH_32_FLAGS) $< -o $(SYMROOT)/$(notdir $@) # 32-bit fat
+       $(CC) $(CFLAGS) $(ARCH_FLAGS_32) $< -o $(SYMROOT)/$(notdir $@) # 32-bit fat
        if [ ! -e $@ ]; then ditto $(SYMROOT)/$(notdir $@) $@; fi
 
 .SECONDEXPANSION:
 $(ARCH_64_TARGETS): $(DSTROOT)/%: $(SRCROOT)/$$(subst 64,,%).c
-       $(CC) $(CFLAGS) $(ARCH_64_FLAGS) $< -o $(SYMROOT)/$(notdir $@) # 64-bit fat
+       $(CC) $(CFLAGS) $(ARCH_FLAGS_64) $< -o $(SYMROOT)/$(notdir $@) # 64-bit fat
        if [ ! -e $@ ]; then ditto $(SYMROOT)/$(notdir $@) $@; fi
 
 clean: