[test-suite] r213208 - Fix oversights in Makefiles where target x86_64h wasn't being checked.

[Akira Hatanaka]

Author: ahatanak
Date: Wed Jul 16 17:52:22 2014
New Revision: 213208

URL: http://llvm.org/viewvc/llvm-project?rev=213208&view=rev
Log:
Fix oversights in Makefiles where target x86_64h wasn't being checked.

<rdar://problem/17638809>


Modified:
    test-suite/trunk/External/Makefile
    test-suite/trunk/External/Nurbs/Makefile
    test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile
    test-suite/trunk/External/SPEC/CINT95/Makefile
    test-suite/trunk/SingleSource/UnitTests/Makefile
    test-suite/trunk/SingleSource/UnitTests/Vector/Makefile

Modified: test-suite/trunk/External/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Makefile?rev=213208&r1=213207&r2=213208&view=diff
==============================================================================
--- test-suite/trunk/External/Makefile (original)
+++ test-suite/trunk/External/Makefile Wed Jul 16 17:52:22 2014
@@ -11,7 +11,7 @@ include $(LEVEL)/Makefile.config
 PARALLEL_DIRS := SPEC Povray Namd FPGrowth BoxedSim skidmarks10
 
 ifneq (,$(findstring x86,$(ARCH)))
-# Nurbs uses SSE and only works on x86 and x86_64.
+# Nurbs uses SSE and only works on x86, x86_64, and x86_64h.
 PARALLEL_DIRS += Nurbs
 endif
 

Modified: test-suite/trunk/External/Nurbs/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Nurbs/Makefile?rev=213208&r1=213207&r2=213208&view=diff
==============================================================================
--- test-suite/trunk/External/Nurbs/Makefile (original)
+++ test-suite/trunk/External/Nurbs/Makefile Wed Jul 16 17:52:22 2014
@@ -9,7 +9,7 @@ CPPFLAGS =
 LDFLAGS = -lstdc++
 LIBS += -lstdc++
 
-ifeq ($(ARCH),x86_64)
+ifeq ($(ARCH),$(filter $(ARCH),x86_64 x86_64h))
   CPPFLAGS += -DDWORD_IS_ULL
 endif
 

Modified: test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile?rev=213208&r1=213207&r2=213208&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile Wed Jul 16 17:52:22 2014
@@ -20,7 +20,7 @@ endif
 ifeq ($(ARCH),Alpha)
   CPPFLAGS += -DALPHA -DLINUX
 endif
-ifeq ($(ARCH),x86_64)
+ifeq ($(ARCH),$(filter $(ARCH),x86_64 x86_64h))
   CPPFLAGS += -DLONG_HAS_64BITS
 endif
 ifeq ($(ARCH),PowerPC)

Modified: test-suite/trunk/External/SPEC/CINT95/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/Makefile?rev=213208&r1=213207&r2=213208&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT95/Makefile Wed Jul 16 17:52:22 2014
@@ -17,7 +17,7 @@ endif
 # Get the $(ARCH) setting
 include $(LEVEL)/Makefile.config
 
-ifeq ($(ARCH),x86_64)
+ifeq ($(ARCH),$(filter $(ARCH),x86_64 x86_64h))
 PARALLEL_DIRS := $(filter-out 126.gcc, $(PARALLEL_DIRS))
 endif
 

Modified: test-suite/trunk/SingleSource/UnitTests/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Makefile?rev=213208&r1=213207&r2=213208&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Makefile (original)
+++ test-suite/trunk/SingleSource/UnitTests/Makefile Wed Jul 16 17:52:22 2014
@@ -28,8 +28,8 @@ PROGRAMS_TO_SKIP += AtomicOps
 endif
 endif
 
-# The ms_struct tests only make sense on x86_64.
-ifneq ($(ARCH),x86_64)
+# The ms_struct tests only make sense on x86_64 and x86_64h.
+ifeq (,$(filter $(ARCH),x86_64 x86_64h))
 PROGRAMS_TO_SKIP += ms_struct-bitfield-init-1 ms_struct-bitfield-init ms_struct-bitfield ms_struct_pack_layout-1 ms_struct_pack_layout ms_struct-bitfield-1
 endif
 

Modified: test-suite/trunk/SingleSource/UnitTests/Vector/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/Makefile?rev=213208&r1=213207&r2=213208&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/Makefile (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/Makefile Wed Jul 16 17:52:22 2014
@@ -12,7 +12,7 @@ endif
 ifeq ($(ARCH),x86)
 DIRS += SSE
 endif
-ifeq ($(ARCH),x86_64)
+ifeq ($(ARCH),$(filter $(ARCH),x86_64 x86_64h))
 DIRS += SSE
 endif