[llvm-commits] [test-suite] r40031 - in /test-suite/trunk: Makefile.programs SingleSource/Benchmarks/Shootout-C++/Makefile

[Evan Cheng]

Author: evancheng
Date: Wed Jul 18 19:45:52 2007
New Revision: 40031

URL: http://llvm.org/viewvc/llvm-project?rev=40031&view=rev
Log:
If eh is required, link (llc binaries) with g++.

Modified:
    test-suite/trunk/Makefile.programs
    test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/Makefile

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=40031&r1=40030&r2=40031&view=diff

==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Wed Jul 18 19:45:52 2007
@@ -109,7 +109,9 @@
 # the LINK_WITH_LLVMGCC_LIBS variable is set, then the link is done that
 # way. Unfortunately, this can't help JIT because it is always linked with
 # the libraries of lli.
+ifndef LLVMGCCLD
 LLVMGCCLD := $(CC)
+endif
 ifdef LINK_WITH_LLVMGCC_LIBS
 #LLVMGCCLD := $(CC) -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib/debug -L$(LLVMGCCDIR)/lib
 LLVMGCCLD := $(CC) -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
@@ -319,6 +321,7 @@
 # expensive) support for it.
 ifdef REQUIRES_EH_SUPPORT
 LLCFLAGS += -enable-correct-eh-support
+LLVMGCCLD := $(CXX)
 endif
 
 # Pass target specific llc flags

Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/Makefile?rev=40031&r1=40030&r2=40031&view=diff

==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/Makefile Wed Jul 18 19:45:52 2007
@@ -1,7 +1,6 @@
 LEVEL = ../../..
 CXXFLAGS += -Wno-deprecated
 CPPFLAGS += -Wno-deprecated
-LLVMGCCLD := $(CXX)
 REQUIRES_EH_SUPPORT=1
 FP_TOLERANCE = 0.00000001