Skip to content

Commit

Permalink
Revert r246175 to get builder green again.
Browse files Browse the repository at this point in the history
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246185 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
lhames committed Aug 27, 2015
1 parent 6319498 commit 38941a6
Show file tree
Hide file tree
Showing 21 changed files with 11 additions and 128 deletions.
2 changes: 1 addition & 1 deletion docs/tutorial/LangImpl4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ if we add:

/// putchard - putchar that takes a double and returns 0.
extern "C" double putchard(double X) {
fputc((char)X, stderr);
putchar((char)X);
return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions examples/Kaleidoscope/Chapter4/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@ set(LLVM_LINK_COMPONENTS
add_kaleidoscope_chapter(Kaleidoscope-Ch4
toy.cpp
)

export_executable_symbols(Kaleidoscope-Ch4)
4 changes: 2 additions & 2 deletions examples/Kaleidoscope/Chapter4/toy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -632,13 +632,13 @@ static void MainLoop() {

/// putchard - putchar that takes a double and returns 0.
extern "C" double putchard(double X) {
fputc((char)X, stderr);
putchar((char)X);
return 0;
}

/// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" double printd(double X) {
fprintf(stderr, "%f\n", X);
printf("%f\n", X);
return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions examples/Kaleidoscope/Chapter5/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@ set(LLVM_LINK_COMPONENTS
add_kaleidoscope_chapter(Kaleidoscope-Ch5
toy.cpp
)

export_executable_symbols(Kaleidoscope-Ch5)
4 changes: 2 additions & 2 deletions examples/Kaleidoscope/Chapter5/toy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -906,13 +906,13 @@ static void MainLoop() {

/// putchard - putchar that takes a double and returns 0.
extern "C" double putchard(double X) {
fputc((char)X, stderr);
putchar((char)X);
return 0;
}

/// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" double printd(double X) {
fprintf(stderr, "%f\n", X);
printf("%f\n", X);
return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions examples/Kaleidoscope/Chapter6/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@ set(LLVM_LINK_COMPONENTS
add_kaleidoscope_chapter(Kaleidoscope-Ch6
toy.cpp
)

export_executable_symbols(Kaleidoscope-Ch6)
4 changes: 2 additions & 2 deletions examples/Kaleidoscope/Chapter6/toy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1024,13 +1024,13 @@ static void MainLoop() {

/// putchard - putchar that takes a double and returns 0.
extern "C" double putchard(double X) {
fputc((char)X, stderr);
putchar((char)X);
return 0;
}

/// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" double printd(double X) {
fprintf(stderr, "%f\n", X);
printf("%f\n", X);
return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions examples/Kaleidoscope/Chapter7/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@ set(LLVM_LINK_COMPONENTS
add_kaleidoscope_chapter(Kaleidoscope-Ch7
toy.cpp
)

export_executable_symbols(Kaleidoscope-Ch7)
4 changes: 2 additions & 2 deletions examples/Kaleidoscope/Chapter7/toy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1190,13 +1190,13 @@ static void MainLoop() {

/// putchard - putchar that takes a double and returns 0.
extern "C" double putchard(double X) {
fputc((char)X, stderr);
putchar((char)X);
return 0;
}

/// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" double printd(double X) {
fprintf(stderr, "%f\n", X);
printf("%f\n", X);
return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions examples/Kaleidoscope/Chapter8/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ set(LLVM_LINK_COMPONENTS
add_kaleidoscope_chapter(Kaleidoscope-Ch8
toy.cpp
)

export_executable_symbols(Kaleidoscope-Ch8)
4 changes: 2 additions & 2 deletions examples/Kaleidoscope/Chapter8/toy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1384,13 +1384,13 @@ static void MainLoop() {

/// putchard - putchar that takes a double and returns 0.
extern "C" double putchard(double X) {
fputc((char)X, stderr);
putchar((char)X);
return 0;
}

/// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" double printd(double X) {
fprintf(stderr, "%f\n", X);
printf("%f\n", X);
return 0;
}

Expand Down
14 changes: 0 additions & 14 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if(LLVM_BUILD_EXAMPLES)
set(ENABLE_EXAMPLES 1)
endif()

configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
Expand Down Expand Up @@ -100,16 +96,6 @@ if(TARGET ocaml_llvm)
)
endif()

if(LLVM_BUILD_EXAMPLES)
list(APPEND LLVM_TEST_DEPENDS
Kaleidoscope-Ch3
Kaleidoscope-Ch4
Kaleidoscope-Ch5
Kaleidoscope-Ch6
Kaleidoscope-Ch7
)
endif()

add_lit_testsuite(check-llvm "Running the LLVM regression tests"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
Expand Down
17 changes: 0 additions & 17 deletions test/Examples/Kaleidoscope/Chapter3.test

This file was deleted.

17 changes: 0 additions & 17 deletions test/Examples/Kaleidoscope/Chapter4.test

This file was deleted.

19 changes: 0 additions & 19 deletions test/Examples/Kaleidoscope/Chapter5.test

This file was deleted.

15 changes: 0 additions & 15 deletions test/Examples/Kaleidoscope/Chapter6.test

This file was deleted.

15 changes: 0 additions & 15 deletions test/Examples/Kaleidoscope/Chapter7.test

This file was deleted.

2 changes: 0 additions & 2 deletions test/Examples/lit.local.cfg

This file was deleted.

1 change: 0 additions & 1 deletion test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ lit.site.cfg: FORCE
@$(ECHOPATH) s=@HOST_ARCH@=$(HOST_ARCH)=g >> lit.tmp
@$(ECHOPATH) s=@HAVE_LIBZ@=$(HAVE_LIBZ)=g >> lit.tmp
@$(ECHOPATH) s=@HAVE_DIA_SDK@=0=g >> lit.tmp
@$(ECHOPATH) s=@ENABLE_EXAMPLES@=$(BUILD_EXAMPLES)=g >> lit.tmp
@sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
@-rm -f lit.tmp

Expand Down
6 changes: 0 additions & 6 deletions test/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,6 @@ for pattern in [r"\bbugpoint\b(?!-)",
r"\byaml2obj\b",
r"\byaml-bench\b",
r"\bverify-uselistorder\b",
r"\bKaleidoscope-Ch3\b",
r"\bKaleidoscope-Ch4\b",
r"\bKaleidoscope-Ch5\b",
r"\bKaleidoscope-Ch6\b",
r"\bKaleidoscope-Ch7\b",
r"\bKaleidoscope-Ch8\b",
# Handle these specially as they are strings searched
# for during testing.
r"\| \bcount\b",
Expand Down
1 change: 0 additions & 1 deletion test/lit.site.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
config.have_zlib = "@HAVE_LIBZ@"
config.have_dia_sdk = @HAVE_DIA_SDK@
config.enable_ffi = "@LLVM_ENABLE_FFI@"
config.test_examples = "@ENABLE_EXAMPLES@"

# Support substitution of the tools_dir with user parameters. This is
# used when we can't determine the tool dir at configuration time.
Expand Down

0 comments on commit 38941a6

Please sign in to comment.