Subzero: Build both Debug and Release version of llvm2ice.

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 18 matching lines @@
         ../../../../third_party/llvm-build/Release+Asserts/bin)
 
 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
 

[jvoung (off chromium), 2014/09/26 19:15:25]

Yeah, not sure the best way to dedupe some of this, without say, adding
variables?

Then the variable could control the flags + the choice of build/$(foo)
directory. If you keep the binary name "llvm2ice" in both cases, but stash it
under build/$(foo), that might work? Then make clean would only clean one of
them, etc. and the other scripts would unfortunately need to be changed to find
llvm2ice under the build/$(foo) directory (but the other scripts would have been
testing the default one anyway).

[Jim Stichnoth, 2014/09/27 00:23:16]

OK, I took the suggestion of linking llvm2ice in build/Debug/ or build/Release/.
 Then, unconditionally, llvm2ice is rm'd from the top-level directory and
symlinked to the appropriate version.  The rm and symlink are done
unconditionally, even if nothing changed.

 $(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.
-OPTLEVEL := -O0
 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) -g $(HOST_FLAGS) \
+        -fno-exceptions  -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 \
         IceInst.cpp \
         IceInstX8632.cpp \
         IceIntrinsics.cpp \
         IceLiveness.cpp \
         IceMemoryRegion.cpp \
         IceOperand.cpp \
         IceRegAlloc.cpp \
         IceRNG.cpp \
         IceTargetLowering.cpp \
         IceTargetLoweringX8632.cpp \
         IceTranslator.cpp \
         IceTypeConverter.cpp \
         IceTypes.cpp \
         llvm2ice.cpp \
         PNaClTranslator.cpp
 
-OBJS=$(patsubst %.cpp, build/%.o, $(SRCS))
+OBJS_DBG=$(patsubst %.cpp, build/Debug/%.o, $(SRCS))
+OBJS_REL=$(patsubst %.cpp, build/Release/%.o, $(SRCS))
 
 # Keep all the first target so it's the default.
+# Note: llvm2ice_dbg is not built by default; "make llvm2ice_dbg" if needed.
 all: llvm2ice
 
 .PHONY: all
 
-llvm2ice: $(OBJS)
+llvm2ice: $(OBJS_REL)
+        $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -ldl \
+               -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
+llvm2ice_dbg: $(OBJS_DBG)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -ldl \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
 
 # TODO: Be more precise than "*.h" here and elsewhere.
-$(OBJS): build/%.o: src/%.cpp src/*.h src/*.def
-        $(CXX) -c $(CXXFLAGS) $< -o $@
+$(OBJS_DBG): build/Debug/%.o: src/%.cpp src/*.h src/*.def
+        $(CXX) -c -O0 $(CXXFLAGS) $< -o $@
+$(OBJS_REL): build/Release/%.o: src/%.cpp src/*.h src/*.def
+        $(CXX) -c -O2 $(CXXFLAGS) $< -o $@
 
-$(OBJS): | build
+$(OBJS_DBG): | build/Debug
+$(OBJS_REL): | build/Release
 
-build:
+build/Debug build/Release:
         @mkdir -p $@
 
 check-lit: llvm2ice
         LLVM_BIN_PATH=$(LLVM_BIN_PATH) \
         $(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit
 
 check: check-lit
         (cd crosstest; ./runtests.sh)
 
 # TODO: Fix the use of wildcards.
 # Assumes clang-format is within $PATH.
 format:
         clang-format -style=LLVM -i src/*.h src/*.cpp
 
 # Assumes clang-format-diff.py is within $PATH, and that the
 # clang-format it calls is also within $PATH.  This may require adding
 # a component to $PATH, or creating symlinks within some existing
 # $PATH component.  Uses the one in /usr/lib/clang-format/ if it
 # exists.
 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_dbg *.o build/