[llvm-commits] [test-suite] r51418 - in /test-suite/branches/release_23: External/SPEC/CFP2006/444.namd/ External/SPEC/CFP2006/447.dealII/ External/SPEC/CFP2006/450.soplex/ External/SPEC/CFP2006/453.povray/ External/SPEC/CINT2000/252.eon/ External/SPEC/CINT2006/471.omnetpp/ External/SPEC/CINT2006/473.astar/ External/SPEC/CINT2006/483.xalancbmk/ SingleSource/Regression/C++/ SingleSource/Regression/C++/EH/ SingleSource/UnitTests/Integer/ SingleSource/UnitTests/SetjmpLongjmp/C++/

Tanya Lattner tonic at nondot.org
Wed May 21 22:29:32 PDT 2008 

Author: tbrethou
Date: Thu May 22 00:29:32 2008
New Revision: 51418

URL: http://llvm.org/viewvc/llvm-project?rev=51418&view=rev
Log:
Merge from mainline.
Move definition of LDFLAGS ahead of the include
that uses it.

Modified:
    test-suite/branches/release_23/External/SPEC/CFP2006/444.namd/Makefile
    test-suite/branches/release_23/External/SPEC/CFP2006/447.dealII/Makefile
    test-suite/branches/release_23/External/SPEC/CFP2006/450.soplex/Makefile
    test-suite/branches/release_23/External/SPEC/CFP2006/453.povray/Makefile
    test-suite/branches/release_23/External/SPEC/CINT2000/252.eon/Makefile
    test-suite/branches/release_23/External/SPEC/CINT2006/471.omnetpp/Makefile
    test-suite/branches/release_23/External/SPEC/CINT2006/473.astar/Makefile
    test-suite/branches/release_23/External/SPEC/CINT2006/483.xalancbmk/Makefile
    test-suite/branches/release_23/SingleSource/Regression/C++/EH/Makefile
    test-suite/branches/release_23/SingleSource/Regression/C++/Makefile
    test-suite/branches/release_23/SingleSource/UnitTests/Integer/Makefile
    test-suite/branches/release_23/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile

Modified: test-suite/branches/release_23/External/SPEC/CFP2006/444.namd/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/External/SPEC/CFP2006/444.namd/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/External/SPEC/CFP2006/444.namd/Makefile (original)
+++ test-suite/branches/release_23/External/SPEC/CFP2006/444.namd/Makefile Thu May 22 00:29:32 2008
@@ -8,10 +8,11 @@
 
 FP_ABSTOLERANCE = 0.00001
 
-include ../../Makefile.spec2006
 
 RUN_OPTIONS      = --input namd.input --iterations 1 --output namd.out
 STDOUT_FILENAME := namd.out
 
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lm
+
+include ../../Makefile.spec2006

Modified: test-suite/branches/release_23/External/SPEC/CFP2006/447.dealII/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/External/SPEC/CFP2006/447.dealII/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/External/SPEC/CFP2006/447.dealII/Makefile (original)
+++ test-suite/branches/release_23/External/SPEC/CFP2006/447.dealII/Makefile Thu May 22 00:29:32 2008
@@ -13,8 +13,6 @@
         -DBOOST_DISABLE_THREADS   \
         -I$(SPEC_BENCH_DIR)/src/include
 
-include ../../Makefile.spec2006
-
 ifeq ($(RUN_TYPE),test)
   RUN_OPTIONS := 8
 else
@@ -25,3 +23,5 @@
 
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lm
+
+include ../../Makefile.spec2006

Modified: test-suite/branches/release_23/External/SPEC/CFP2006/450.soplex/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/External/SPEC/CFP2006/450.soplex/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/External/SPEC/CFP2006/450.soplex/Makefile (original)
+++ test-suite/branches/release_23/External/SPEC/CFP2006/450.soplex/Makefile Thu May 22 00:29:32 2008
@@ -8,8 +8,6 @@
 
 FP_ABSTOLERANCE = 1.0e-5
 
-include ../../Makefile.spec2006
-
 CPPFLAGS += -DNDEBUG
 
 ifeq ($(RUN_TYPE),test)
@@ -24,3 +22,5 @@
 
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lstdc++ -lm
+
+include ../../Makefile.spec2006

Modified: test-suite/branches/release_23/External/SPEC/CFP2006/453.povray/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/External/SPEC/CFP2006/453.povray/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/External/SPEC/CFP2006/453.povray/Makefile (original)
+++ test-suite/branches/release_23/External/SPEC/CFP2006/453.povray/Makefile Thu May 22 00:29:32 2008
@@ -8,8 +8,6 @@
 
 FP_ABSTOLERANCE = 0
 
-include ../../Makefile.spec2006
-
 ifeq ($(RUN_TYPE),test)
   FP_TOLERANCE     = 0.0002
   RUN_OPTIONS      = SPEC-benchmark-test
@@ -22,3 +20,6 @@
 
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lstdc++ -lm
+
+include ../../Makefile.spec2006
+

Modified: test-suite/branches/release_23/External/SPEC/CINT2000/252.eon/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/External/SPEC/CINT2000/252.eon/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/External/SPEC/CINT2000/252.eon/Makefile (original)
+++ test-suite/branches/release_23/External/SPEC/CINT2000/252.eon/Makefile Thu May 22 00:29:32 2008
@@ -60,7 +60,6 @@
             mrInstance.cc mrMaterial.cc mrPhongAreaTriangleLuminaire.cc \
             mrSolidTexture.cc mrSphere.cc mrSurface.cc mrSurfaceTexture.cc \
             mrXYRectangle.cc mrXZRectangle.cc mrYZRectangle.cc myrand.cc)
-include ../../Makefile.spec2000
 
 # Yes, we know this is an old crufty C++ benchmark.  Don't tell us about it GCC!
 CXXFLAGS += -fno-exceptions -Wno-deprecated -Wno-non-template-friend 
@@ -68,3 +67,5 @@
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lm
 
+include ../../Makefile.spec2000
+

Modified: test-suite/branches/release_23/External/SPEC/CINT2006/471.omnetpp/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/External/SPEC/CINT2006/471.omnetpp/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/External/SPEC/CINT2006/471.omnetpp/Makefile (original)
+++ test-suite/branches/release_23/External/SPEC/CINT2006/471.omnetpp/Makefile Thu May 22 00:29:32 2008
@@ -56,14 +56,14 @@
             -I$(SPEC_BENCH_DIR)/src               \
             -I$(SPEC_BENCH_DIR)/src/include
 
-include ../../Makefile.spec2006
-
 RUN_OPTIONS      = omnetpp.ini
 STDOUT_FILENAME := omnetpp.log
 
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lm
 
+include ../../Makefile.spec2006
+
 ##===----------------------------------------------------------------------===##
 # Copy the source files to the working directory. Some files may have
 # the same names but are in different directories, so we add a prefix

Modified: test-suite/branches/release_23/External/SPEC/CINT2006/473.astar/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/External/SPEC/CINT2006/473.astar/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/External/SPEC/CINT2006/473.astar/Makefile (original)
+++ test-suite/branches/release_23/External/SPEC/CINT2006/473.astar/Makefile Thu May 22 00:29:32 2008
@@ -8,8 +8,6 @@
 
 FP_TOLERANCE = 0.001
 
-include ../../Makefile.spec2006
-
 ifeq ($(ENDIAN),big)
   CPPFLAGS += -DSPEC_CPU_BIG_ENDIAN
 else
@@ -26,3 +24,6 @@
 
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lm
+
+include ../../Makefile.spec2006
+

Modified: test-suite/branches/release_23/External/SPEC/CINT2006/483.xalancbmk/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/External/SPEC/CINT2006/483.xalancbmk/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/External/SPEC/CINT2006/483.xalancbmk/Makefile (original)
+++ test-suite/branches/release_23/External/SPEC/CINT2006/483.xalancbmk/Makefile Thu May 22 00:29:32 2008
@@ -19,8 +19,6 @@
             -I$(SPEC_BENCH_DIR)/src/xercesc/util/Transcoders/Iconv    \
             -I$(SPEC_BENCH_DIR)/src/xalanc/include
 
-include ../../Makefile.spec2006
-
 ifeq ($(OS),Darwin)
   CPPFLAGS += -DSPEC_CPU_MACOSX
 endif
@@ -35,3 +33,6 @@
 
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lstdc++ -lm
+
+include ../../Makefile.spec2006
+

Modified: test-suite/branches/release_23/SingleSource/Regression/C++/EH/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/SingleSource/Regression/C%2B%2B/EH/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/SingleSource/Regression/C++/EH/Makefile (original)
+++ test-suite/branches/release_23/SingleSource/Regression/C++/EH/Makefile Thu May 22 00:29:32 2008
@@ -1,6 +1,6 @@
 LEVEL = ../../../..
 REQUIRES_EH_SUPPORT = 1
 
-include $(LEVEL)/SingleSource/Makefile.singlesrc
 CFLAGS += -std=c99
 LDFLAGS += -lstdc++
+include $(LEVEL)/SingleSource/Makefile.singlesrc

Modified: test-suite/branches/release_23/SingleSource/Regression/C++/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/SingleSource/Regression/C%2B%2B/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/SingleSource/Regression/C++/Makefile (original)
+++ test-suite/branches/release_23/SingleSource/Regression/C++/Makefile Thu May 22 00:29:32 2008
@@ -6,6 +6,6 @@
 #
 LEVEL = ../../..
 DIRS=EH
-include $(LEVEL)/SingleSource/Makefile.singlesrc
 CFLAGS += -std=c99
 LDFLAGS += -lstdc++
+include $(LEVEL)/SingleSource/Makefile.singlesrc

Modified: test-suite/branches/release_23/SingleSource/UnitTests/Integer/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/SingleSource/UnitTests/Integer/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/SingleSource/UnitTests/Integer/Makefile (original)
+++ test-suite/branches/release_23/SingleSource/UnitTests/Integer/Makefile Thu May 22 00:29:32 2008
@@ -32,9 +32,9 @@
 
 USE_REFERENCE_OUTPUT := 1
 
-include $(LEVEL)/SingleSource/Makefile.singlesrc
 
 LDFLAGS += -lstdc++
 ifeq (1,$(ENABLE_LARGE_INTEGERS))
 CPPFLAGS += -DENABLE_LARGE_INTEGERS
 endif
+include $(LEVEL)/SingleSource/Makefile.singlesrc

Modified: test-suite/branches/release_23/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_23/SingleSource/UnitTests/SetjmpLongjmp/C%2B%2B/Makefile?rev=51418&r1=51417&r2=51418&view=diff

==============================================================================
--- test-suite/branches/release_23/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile (original)
+++ test-suite/branches/release_23/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile Thu May 22 00:29:32 2008
@@ -1,5 +1,5 @@
 # SingleSource/UnitTests/SetjmpLongjmp/Makefile
 LEVEL = ../../../..
 REQUIRES_EH_SUPPORT = 1
-include $(LEVEL)/SingleSource/Makefile.singlesrc
 LDFLAGS += -lstdc++
+include $(LEVEL)/SingleSource/Makefile.singlesrc

More information about the llvm-commits mailing list