Allow conditional lit tests in Subzero, based on build flags.

Makefile.standalone

 # The following variables will likely need to be modified, depending on where
 # and how you built LLVM & Clang. They can be overridden in a command-line
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LLVM_BIN_PATH=<path> \
 #        LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
 # directory should contain the configure script, the include/ and lib/
@@ skipping 19 matching lines @@
 
 HOST_ARCH ?= x86_64
 ifeq ($(HOST_ARCH),x86_64)
   HOST_FLAGS = -m64 -stdlib=libc++
 else
   ifeq ($(HOST_ARCH),x86)
     HOST_FLAGS = -m32 -stdlib=libc++
   endif
 endif
 
+# The list of CXX defines that are dependent on build parameters.
+CXX_DEFINES =
+
+# The list of attributes associated with the built executable. 
+BUILD_ATTS = x86-32
+
 ifdef DEBUG
   OBJDIR = build/Debug
   OPTLEVEL = -O0
+  BUILD_ATTS := $(BUILD_ATTS) debug

[Jim Stichnoth, 2014/10/20 16:44:28]

I don't know if this is possible, but I wonder if += is workable for building up
BUILD_ATTS.

[Karl, 2014/10/20 21:00:42]

Done.

 else
   OBJDIR = build/Release
   OPTLEVEL = -O2
+  BUILD_ATTS := $(BUILD_ATTS) release
+endif
+
+ifdef MINIMAL
+  CXX_DEFINES := $(CXX_DEFINES) -DNO_TEXT_ASM -DNO_DUMP -DNO_LLVM_CL
+  OBJDIR := $(OBJDIR)+Min
+  BUILD_ATTS := $(BUILD_ATTS) minimal
+else
+  BUILD_ATTS := $(BUILD_ATTS) nonminimal
 endif
 
 ifdef NOASSERT
   ASSERTIONS = -DNDEBUG

[Jim Stichnoth, 2014/10/20 16:44:28]

Add noasserts to BUILD_ATTS, for flexibility and consistency?

[Karl, 2014/10/20 21:00:42]

Done.

 else
   ASSERTIONS =
   OBJDIR := $(OBJDIR)+Asserts
+  BUILD_ATTS := $(BUILD_ATTS) asserts
 endif
 
 $(info -----------------------------------------------)
 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH))
 $(info Using LLVM_BIN_PATH = $(LLVM_BIN_PATH))
 $(info Using LIBCXX_INSTALL_PATH = $(LIBCXX_INSTALL_PATH))
 $(info Using CLANG_PATH = $(CLANG_PATH))
 $(info Using HOST_ARCH     = $(HOST_ARCH))
 $(info -----------------------------------------------)
 
 LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags`
 LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \
                 `$(LLVM_BIN_PATH)/llvm-config --ldflags`
 
 # It's recommended that CXX matches the compiler you used to build LLVM itself.
 CCACHE := `command -v ccache`
 CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++
 
 CXXFLAGS := $(LLVM_CXXFLAGS) -std=c++11 -Wall -Wextra -Werror -fno-rtti \
-        -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g $(HOST_FLAGS) \
-        -Wno-error=unused-parameter -I$(LIBCXX_INSTALL_PATH)/include/c++/v1
+        -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) $(CXX_DEFINES) -g \
+        $(HOST_FLAGS) -Wno-error=unused-parameter \
+        -I$(LIBCXX_INSTALL_PATH)/include/c++/v1
 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib
 
 SRCS= \
         assembler.cpp \
         assembler_ia32.cpp \
         IceCfg.cpp \
         IceCfgNode.cpp \
         IceConverter.cpp \
         IceGlobalContext.cpp \
         IceGlobalInits.cpp \
@@ skipping 12 matching lines @@
         IceTypeConverter.cpp \
         IceTypes.cpp \
         llvm2ice.cpp \
         PNaClTranslator.cpp
 
 OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS))
 
 # Keep all the first target so it's the default.
 all: $(OBJDIR)/llvm2ice make_symlink
 
-make_symlink: $(OBJDIR)/llvm2ice
-        rm -f llvm2ice
+make_symlink: $(OBJDIR)/llvm2ice $(OBJDIR)/llvm2ice.build_atts
+        rm -f llvm2ice llvm2ice.build_atts

[Jim Stichnoth, 2014/10/20 16:44:28]

Can you change to rm -rf in case a directory of this name somehow gets in there?

[Karl, 2014/10/20 21:00:42]

Done.

         ln -s $(OBJDIR)/llvm2ice
+        ln -s $(OBJDIR)/llvm2ice.build_atts
 
 .PHONY: all make_symlink
 
 $(OBJDIR)/llvm2ice: $(OBJS)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -ldl \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
+        echo "$(BUILD_ATTS)" > $@.build_atts
 
 # TODO: Be more precise than "*.h" here and elsewhere.
 $(OBJS): $(OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
         $(CXX) -c $(CXXFLAGS) $< -o $@
 
 $(OBJS): | $(OBJDIR)
 
 $(OBJDIR):
         @mkdir -p $@
 
@@ skipping 17 matching lines @@
 ifeq (,$(wildcard /usr/lib/clang-format/clang-format-diff.py))
   CLANG_FORMAT_DIFF = clang-format-diff.py
 else
   CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py
 endif
 format-diff:
         git diff -U0 `git merge-base HEAD master` | \
         $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i
 
 clean:
-        rm -rf llvm2ice *.o build/
+        rm -rf llvm2ice llvm2ice.build_atts *.o $(OBJDIR)
+
+clean-all: clean
+        rm -rf build/