Merge branch 'bug-fix'

ssrg-vt · Feb 12, 2018 · 821c6ee · 821c6ee
2 parents fd578a9 + 8a38745
commit 821c6ee
Show file tree

Hide file tree

Showing 15 changed files with 817 additions and 317 deletions.
diff --git a/install_compiler.py b/install_compiler.py
@@ -93,10 +93,10 @@ def setup_argument_parsing():
                         help="Skip installation of util scripts",
                         action="store_true",
                         dest="skip_utils_install")
-    process_opts.add_argument("--skip-namespace",
-                        help="Skip building namespace tools (deprecated)",
-                        action="store_false",
-                        dest="skip_namespace")
+    process_opts.add_argument("--install-namespace",
+                        help="Install namespace tools (deprecated)",
+                        action="store_true",
+                        dest="install_namespace")
     process_opts.add_argument("--install-call-info-library",
                         help="Install application call information library",
                         action="store_true",
@@ -782,7 +782,7 @@ def main(args):
     if not args.skip_utils_install:
         install_utils(args.base_path, args.install_path, args.threads)
 
-    if not args.skip_namespace:
+    if args.install_namespace:
         build_namespace(args.base_path)
 
 if __name__ == '__main__':

diff --git a/lib/migration/Makefile b/lib/migration/Makefile
@@ -78,7 +78,8 @@ $(BUILD_POWERPC)/%.o: src/%.c $(HDR_POWERPC)
 	@$(OPT) $(OPT_FLAGS) -o $@.bc $@.bc
 	@$(CC) $(CFLAGS_POWERPC) -o $@ $@.bc
 
-$(LIB_POWERPC): $(BUILD_POWERPC)/.dir $(HDR_POWERPC) $(OBJ_POWERPC)
+$(OBJ_POWERPC): $(BUILD_POWERPC)/.dir
+$(LIB_POWERPC): $(HDR_POWERPC) $(OBJ_POWERPC)
 	@echo " [AR] $(LIB_POWERPC)"
 	@rm -f $(LIB_POWERPC)
 	@$(AR) $(ARFLAGS) $(LIB_POWERPC) $(OBJ_POWERPC) &> /dev/null
@@ -89,7 +90,8 @@ $(BUILD_ARM)/%.o: src/%.c $(HDR_ARM)
 	@$(OPT) $(OPT_FLAGS) -o $@.bc $@.bc
 	@$(CC) $(CFLAGS_ARM) -o $@ $@.bc
 
-$(LIB_ARM): $(BUILD_ARM)/.dir $(HDR_ARM) $(OBJ_ARM)
+$(OBJ_ARM): $(BUILD_ARM)/.dir
+$(LIB_ARM): $(HDR_ARM) $(OBJ_ARM)
 	@echo " [AR] $(LIB_ARM)"
 	@rm -f $(LIB_ARM)
 	@$(AR) $(ARFLAGS) $(LIB_ARM) $(OBJ_ARM) &> /dev/null
@@ -100,7 +102,8 @@ $(BUILD_X86)/%.o: src/%.c $(HDR_X86)
 	@$(OPT) $(OPT_FLAGS) -o $@.bc $@.bc
 	@$(CC) $(CFLAGS_X86) -o $@ $@.bc
 
-$(LIB_X86): $(BUILD_X86)/.dir $(HDR_X86) $(OBJ_X86)
+$(OBJ_X86): $(BUILD_X86)/.dir
+$(LIB_X86): $(HDR_X86) $(OBJ_X86)
 	@echo " [AR] $(LIB_X86)"
 	@rm -f $(LIB_X86)
 	@$(AR) $(ARFLAGS) $(LIB_X86) $(OBJ_X86) &> /dev/null

diff --git a/lib/stack_depth/Makefile b/lib/stack_depth/Makefile
@@ -20,7 +20,9 @@ build/%.o: %.cpp $(HDR)
 	@echo " [CXX] $<"
 	@$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(BIN): $(BUILD)/.dir $(OBJ)
+$(OBJ): $(BUILD)/.dir
+
+$(BIN): $(OBJ)
 	@rm -f $(BIN)
 	@echo " [AR] $@"
 	@ar -cq $(BIN) $(OBJ)

diff --git a/lib/stack_transformation/Makefile b/lib/stack_transformation/Makefile
@@ -113,11 +113,12 @@ build/powerpc64/%.o: src/%.c $(LIB_HDR)
 	@echo " [CC-powerpc64] $<"
 	@$(CC_POWERPC64) $(CFLAGS) $(LOC_POWERPC64) -o $@ -c $<
 
-$(LIB_POWERPC64): $(BUILD_POWERPC64)/arch/powerpc64/.dir \
-                  $(BUILD_POWERPC64)/arch/x86_64/.dir \
-                  $(BUILD_POWERPC64)/arch/aarch64/.dir \
-                  $(LIB_OBJ_POWERPC64) \
-                  $(LIB_ARCH_OBJ_POWERPC64)
+$(LIB_OBJ_POWERPC64): $(BUILD_POWERPC64)/.dir
+$(LIB_ARCH_OBJ_POWERPC64): $(BUILD_POWERPC64)/arch/powerpc64/.dir \
+                           $(BUILD_POWERPC64)/arch/x86_64/.dir \
+                           $(BUILD_POWERPC64)/arch/aarch64/.dir
+
+$(LIB_POWERPC64): $(LIB_OBJ_POWERPC64) $(LIB_ARCH_OBJ_POWERPC64)
 	@echo " [AR-powerpc64] $@"
 	@rm -f $(LIB_POWERPC64)
 	@$(AR) -cq $(LIB_POWERPC64) $(LIB_OBJ_POWERPC64) $(LIB_ARCH_OBJ_POWERPC64)
@@ -154,11 +155,12 @@ build/aarch64/%.o: src/%.c $(LIB_HDR)
 	@echo " [CC-aarch64] $<"
 	@$(CC_AARCH64) $(CFLAGS) $(LOC_AARCH64) -o $@ -c $<
 
-$(LIB_AARCH64): $(BUILD_AARCH64)/arch/aarch64/.dir \
-                $(BUILD_AARCH64)/arch/powerpc64/.dir \
-                $(BUILD_AARCH64)/arch/x86_64/.dir \
-                $(LIB_OBJ_AARCH64) \
-                $(LIB_ARCH_OBJ_AARCH64)
+$(LIB_OBJ_AARCH64): $(BUILD_AARCH64)/.dir
+$(LIB_ARCH_OBJ_AARCH64): $(BUILD_AARCH64)/arch/powerpc64/.dir \
+                         $(BUILD_AARCH64)/arch/x86_64/.dir \
+                         $(BUILD_AARCH64)/arch/aarch64/.dir
+
+$(LIB_AARCH64): $(LIB_OBJ_AARCH64) $(LIB_ARCH_OBJ_AARCH64)
 	@echo " [AR-aarch64] $@"
 	@rm -f $(LIB_AARCH64)
 	@$(AR) -cq $(LIB_AARCH64) $(LIB_OBJ_AARCH64) $(LIB_ARCH_OBJ_AARCH64)
@@ -195,11 +197,12 @@ build/x86_64/%.o: src/%.c $(LIB_HDR)
 	@echo " [CC-x86_64] $<"
 	@$(CC_X86_64) $(CFLAGS) $(LOC_X86_64) -o $@ -c $<
 
-$(LIB_X86_64): $(BUILD_X86_64)/arch/aarch64/.dir \
-               $(BUILD_X86_64)/arch/powerpc64/.dir \
-               $(BUILD_X86_64)/arch/x86_64/.dir \
-                $(LIB_OBJ_X86_64) \
-                $(LIB_ARCH_OBJ_X86_64)
+$(LIB_OBJ_X86_64): $(BUILD_X86_64)/.dir
+$(LIB_ARCH_OBJ_X86_64): $(BUILD_X86_64)/arch/powerpc64/.dir \
+                        $(BUILD_X86_64)/arch/x86_64/.dir \
+                        $(BUILD_X86_64)/arch/aarch64/.dir
+
+$(LIB_X86_64): $(LIB_OBJ_X86_64) $(LIB_ARCH_OBJ_X86_64)
 	@echo " [AR-x86_64] $@"
 	@rm -f $(LIB_X86_64)
 	@$(AR) -cq $(LIB_X86_64) $(LIB_OBJ_X86_64) $(LIB_ARCH_OBJ_X86_64)

diff --git a/patches/llvm/clang-3.7.1.patch b/patches/llvm/clang-3.7.1.patch
@@ -810,7 +810,7 @@ Index: lib/CodeGen/PopcornUtil.cpp
 ===================================================================
 --- lib/CodeGen/PopcornUtil.cpp	(nonexistent)
 +++ lib/CodeGen/PopcornUtil.cpp	(working copy)
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,87 @@
 +//===--- PopcornUtil.cpp - LLVM Popcorn Linux Utilities -------------------===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -851,6 +851,7 @@ Index: lib/CodeGen/PopcornUtil.cpp
 +    break;
 +  case Triple::ArchType::x86_64:
 +    Opts->CPU = "x86-64";
++    Opts->FPMath = "sse";
 +    Opts->FeaturesAsWritten.push_back("+sse");
 +    Opts->FeaturesAsWritten.push_back("+sse2");
 +    Opts->FeaturesAsWritten.push_back("+rtm");