Add -relocation-model=pic so that the test works

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 00c5ef268d79922cfbff36ada93d5480234c7f7a..8825c53d5b19b1f6a866d0d98985ff13b850f02a 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,14 +1,14 @@
 #===- test/Makefile ----------------------------------------*- Makefile -*--===#
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 #===------------------------------------------------------------------------===#
 
-LEVEL  = ..
-DIRS   = 
+LEVEL = ..
+DIRS  =
 
 #
 # Make Dejagnu the default for testing
@@ -32,6 +32,10 @@ CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
 RUNTESTFLAGS += --tool $(CLEANED_TESTSUITE)
 endif
 
+ifdef VG
+VALGRIND := valgrind --tool=memcheck --quiet --trace-children=yes --error-exitcode=3 --leak-check=full
+endif
+
 IGNORE_TESTS :=
 
 ifndef RUNLLVM2CPP
@@ -51,7 +55,7 @@ check-local:: site.exp
          $(RUNTEST) $(RUNTESTFLAGS) )
 else
 check-local:: site.exp
-       @echo "*** dejagnu not found.  Make sure runtest is in your PATH, then reconfigure llvm."
+       @echo "*** dejagnu not found.  Make sure 'runtest' is in your PATH, then reconfigure LLVM."
 endif
 
 ifdef TESTONE
@@ -77,7 +81,16 @@ endif
 clean::
        $(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
 
-site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
+# dsymutil is used on the Darwin to manipulate DWARF debugging information.
+ifeq ($(OS),Darwin)
+DSYMUTIL=dsymutil
+else
+DSYMUTIL=true
+endif
+
+FORCE:
+
+site.exp: FORCE
        @echo 'Making a new site.exp file...'
        @echo '## these variables are automatically generated by make ##' >site.tmp
        @echo '# Do not edit here.  If you wish to override these values' >>site.tmp
@@ -95,14 +108,18 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp
        @echo 'set gccpath "$(CC)"' >>site.tmp
        @echo 'set gxxpath "$(CXX)"' >>site.tmp
-       @echo 'set compile_c "$(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -c "' >>site.tmp
-       @echo 'set compile_cxx "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) - c"' >> site.tmp
-       @echo 'set link "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags)"' >>site.tmp
-       @echo 'set llvmgcc "$(LLVMGCC)"' >> site.tmp
-       @echo 'set llvmgxx "$(LLVMGCC)"' >> site.tmp
+       @echo 'set compile_c "' $(CC) $(CPP.Flags) $(CompileCommonOpts) -c '"' >>site.tmp
+       @echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) -c '"' >> site.tmp
+       @echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp
+       @echo 'set llvmgcc "$(LLVMGCC) $(EXTRA_OPTIONS)"' >> site.tmp
+       @echo 'set llvmgxx "$(LLVMGCC) $(EXTRA_OPTIONS)"' >> site.tmp
        @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp
        @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
        @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp
+       @echo 'set valgrind "$(VALGRIND)"' >> site.tmp
+       @echo 'set grep "$(GREP)"' >>site.tmp
+       @echo 'set gas "$(GAS)"' >>site.tmp
+       @echo 'set llvmdsymutil "$(DSYMUTIL)"' >>site.tmp
        @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
        @test ! -f site.exp || \
        sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp