diff options
-rw-r--r-- | docs/TestingGuide.html | 3 | ||||
-rw-r--r-- | test/Makefile | 1 | ||||
-rw-r--r-- | test/lib/llvm.exp | 2 | ||||
-rw-r--r-- | test/site.exp.in | 1 | ||||
-rw-r--r-- | utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp | 1 | ||||
-rw-r--r-- | utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp | 1 |
6 files changed, 1 insertions, 8 deletions
diff --git a/docs/TestingGuide.html b/docs/TestingGuide.html index 43c414d4c9..a92dbe99a6 100644 --- a/docs/TestingGuide.html +++ b/docs/TestingGuide.html @@ -764,9 +764,6 @@ substitutions</a></div> <dt><b>llvmgcc_version</b> (%llvmgcc_version)</dt> <dd>The full version number of the <tt>llvm-gcc</tt> executable.</dd> - <dt><b>llvmgccmajvers</b> (%llvmgccmajvers)</dt> - <dd>The major version number of the <tt>llvm-gcc</tt> executable.</dd> - <dt><b>gccpath</b></dt> <dd>The full path to the C compiler used to <i>build </i> LLVM. Note that this might not be gcc.</dd> diff --git a/test/Makefile b/test/Makefile index e7776f8459..1d8da4c835 100644 --- a/test/Makefile +++ b/test/Makefile @@ -170,7 +170,6 @@ site.exp: FORCE @echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp @echo 'set llvmgcc "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp @echo 'set llvmgxx "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp - @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp @echo 'set bugpoint_topts $(BUGPOINT_TOPTS)' >> site.tmp @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp @echo 'set ocamlopt "$(OCAMLOPT) -cc \"$(CXX_FOR_OCAMLOPT)\" -I $(LibDir)/ocaml"' >> site.tmp diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp index 319cc11c71..941b4f1289 100644 --- a/test/lib/llvm.exp +++ b/test/lib/llvm.exp @@ -47,7 +47,7 @@ proc execOneLine { test PRS outcome lineno line } { # cases. proc substitute { line test tmpFile } { global srcroot objroot srcdir objdir subdir target_triplet - global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlopt + global llvmgcc llvmgxx llvmgcc_version ocamlopt global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir global llvmdsymutil valgrind grep gas bugpoint_topts set path [file join $srcdir $subdir] diff --git a/test/site.exp.in b/test/site.exp.in index f88d36198b..c0b487e155 100644 --- a/test/site.exp.in +++ b/test/site.exp.in @@ -18,7 +18,6 @@ set compile_cxx "@TEST_COMPILE_CXX_CMD@" set link "@TEST_LINK_CMD@" set llvmgcc "@LLVMGCC@" set llvmgxx "@LLVMGXX@" -set llvmgccmajvers "@LLVMGCCMAJVERS@" set bugpoint_topts "@BUGPOINT_TOPTS@" set shlibext "@SHLIBEXT@" set ocamlopt "@OCAMLOPT@" diff --git a/utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp b/utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp index 1d9c743268..7bb21abc27 100644 --- a/utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp +++ b/utils/lit/lit/ExampleTests/LLVM.InTree/test/site.exp @@ -19,7 +19,6 @@ set compile_cxx " /usr/bin/g++ -arch x86_64 -I/Users/ddunbar/llvm.obj.64/include set link " /usr/bin/g++ -arch x86_64 -I/Users/ddunbar/llvm.obj.64/include -I/Users/ddunbar/llvm.obj.64/test -I/Volumes/Data/ddunbar/llvm.obj.64/include -I/Volumes/Data/ddunbar/llvm/include -I/Volumes/Data/ddunbar/llvm/test -D_DEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -g -fno-exceptions -fno-common -Woverloaded-virtual -m64 -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -g -L/Users/ddunbar/llvm.obj.64/Debug/lib -L/Volumes/Data/ddunbar/llvm.obj.64/Debug/lib " set llvmgcc "/Users/ddunbar/llvm-gcc/install/bin/llvm-gcc -m64 " set llvmgxx "/Users/ddunbar/llvm-gcc/install/bin/llvm-gcc -m64 " -set llvmgccmajvers "4" set bugpoint_topts "-gcc-tool-args -m64" set shlibext ".dylib" set ocamlopt "/sw/bin/ocamlopt -cc \"g++ -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT\" -I /Users/ddunbar/llvm.obj.64/Debug/lib/ocaml" diff --git a/utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp b/utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp index 1d9c743268..7bb21abc27 100644 --- a/utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp +++ b/utils/lit/lit/ExampleTests/LLVM.OutOfTree/obj/test/site.exp @@ -19,7 +19,6 @@ set compile_cxx " /usr/bin/g++ -arch x86_64 -I/Users/ddunbar/llvm.obj.64/include set link " /usr/bin/g++ -arch x86_64 -I/Users/ddunbar/llvm.obj.64/include -I/Users/ddunbar/llvm.obj.64/test -I/Volumes/Data/ddunbar/llvm.obj.64/include -I/Volumes/Data/ddunbar/llvm/include -I/Volumes/Data/ddunbar/llvm/test -D_DEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -g -fno-exceptions -fno-common -Woverloaded-virtual -m64 -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -g -L/Users/ddunbar/llvm.obj.64/Debug/lib -L/Volumes/Data/ddunbar/llvm.obj.64/Debug/lib " set llvmgcc "/Users/ddunbar/llvm-gcc/install/bin/llvm-gcc -m64 " set llvmgxx "/Users/ddunbar/llvm-gcc/install/bin/llvm-gcc -m64 " -set llvmgccmajvers "4" set bugpoint_topts "-gcc-tool-args -m64" set shlibext ".dylib" set ocamlopt "/sw/bin/ocamlopt -cc \"g++ -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT\" -I /Users/ddunbar/llvm.obj.64/Debug/lib/ocaml" |