remove exit-afterwards? arg from impc:aot:compile-xtm-file

who ever used it? and several of the callsites were wrong
digego · May 30, 2016 · e9fe7ac · e9fe7ac
1 parent 87b8ec4
commit e9fe7ac
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -603,13 +603,13 @@ else(WIN32)
     if(PACKAGE)
       add_custom_target(${targetname}
         COMMAND extempore --nobase --noaudio --mcpu=generic --attr=none --port=${EXTEMPORE_AOT_COMPILE_PORT}
-        --eval "(impc:aot:compile-xtm-file \"${libfile}\" #t #t)"
+        --eval "(impc:aot:compile-xtm-file \"${libfile}\")"
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         VERBATIM)
     else(PACKAGE)
       add_custom_target(${targetname}
         COMMAND extempore --nobase --noaudio --port=${EXTEMPORE_AOT_COMPILE_PORT}
-        --eval "(impc:aot:compile-xtm-file \"${libfile}\" #t #t)"
+        --eval "(impc:aot:compile-xtm-file \"${libfile}\")"
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         VERBATIM)
     endif(PACKAGE)

diff --git a/compile-stdlib.sh b/compile-stdlib.sh
@@ -39,7 +39,7 @@ echo
 # check all the required shared libs are there
 for f in $AOT_LIBS
 do
-    $AOT_COMPILATION_COMMAND "(impc:aot:compile-xtm-file \"$f\" #t #t)"
+    $AOT_COMPILATION_COMMAND "(impc:aot:compile-xtm-file \"$f\" #t)"
     rc=$?
     if (($rc != 0))  ; then
         echo -e "\033[0;31mError AOT-compiling $f\033[0;00m"

diff --git a/extras/cmake/aot.cmake.in b/extras/cmake/aot.cmake.in
@@ -17,13 +17,13 @@ foreach(aot-lib ${AOT_LIBS})
   if(PACKAGE)
     # pass --attr=none when packaging
     execute_process(
-      COMMAND ./extempore --nobase --attr=none --port 17099 --eval "(impc:aot:compile-xtm-file \"${aot-lib}\" #t #t)"
+      COMMAND ./extempore --nobase --attr=none --port 17099 --eval "(impc:aot:compile-xtm-file \"${aot-lib}\")"
       WORKING_DIRECTORY @CMAKE_SOURCE_DIR@
       TIMEOUT 900 # 15 minutes
       RESULT_VARIABLE aot_retval)
   else(PACKAGE)
     execute_process(
-      COMMAND ./extempore --nobase --port 17099 --eval "(impc:aot:compile-xtm-file \"${aot-lib}\" #t #t)"
+      COMMAND ./extempore --nobase --port 17099 --eval "(impc:aot:compile-xtm-file \"${aot-lib}\")"
       WORKING_DIRECTORY @CMAKE_SOURCE_DIR@
       TIMEOUT 900 # 15 minutes
       RESULT_VARIABLE aot_retval)

diff --git a/extras/cmake/aot_extended.cmake.in b/extras/cmake/aot_extended.cmake.in
@@ -32,13 +32,13 @@ foreach(aot-lib ${AOT_LIBS})
   if(PACKAGE)
     # pass --attr=none when packaging
     execute_process(
-      COMMAND ./extempore --nobase --attr=none --port 17099 --eval "(impc:aot:compile-xtm-file \"${aot-lib}\" #t #t)"
+      COMMAND ./extempore --nobase --attr=none --port 17099 --eval "(impc:aot:compile-xtm-file \"${aot-lib}\")"
       WORKING_DIRECTORY @CMAKE_SOURCE_DIR@
       TIMEOUT 900 # 15 minutes
       RESULT_VARIABLE aot_retval)
   else(PACKAGE)
     execute_process(
-      COMMAND ./extempore --nobase --port 17099 --eval "(impc:aot:compile-xtm-file \"${aot-lib}\" #t #t)"
+      COMMAND ./extempore --nobase --port 17099 --eval "(impc:aot:compile-xtm-file \"${aot-lib}\")"
       WORKING_DIRECTORY @CMAKE_SOURCE_DIR@
       TIMEOUT 900 # 15 minutes
       RESULT_VARIABLE aot_retval)

diff --git a/runtime/llvmti.xtm b/runtime/llvmti.xtm
@@ -2761,7 +2761,7 @@
        (begin ,@forms)))
 
 (define impc:aot:compile-module
-  (lambda (module-name module exit-afterwards?)
+  (lambda (module-name module)
     (let* ((llc-path (sanitize-platform-path (string-append (get-llvm-path) "/bin/llc"))))
       (let* ((platform (sys:platform))
              (tmp-dir (unix-or-Windows "/tmp/extempore/" (string-append (sys:command-output "echo %TEMP%") "\\extempore\\")))
@@ -2835,15 +2835,15 @@
           (if (<> llc-res 0)
               (begin (print-with-colors 'red 'default #t
                                         (print "llc command failed with exit code " llc-res "\n"))
-                     (if exit-afterwards? (quit 1))))
+                     (quit 1)))
           (begin
             (print-with-colors 'black 'yellow #t (print " Compiling native shared library "))
             (print "\n  " link-command "\n\n"))
           (set! linker-res (sys:command link-command))
           (if (<> linker-res 0)
               (begin (print-with-colors 'red 'default #t
                                         (print "linking failed with exit code " linker-res "\n"))
-                     (if exit-afterwards? (quit 1)))
+                     (quit 1))
               (begin
                 (print-with-colors 'black 'green #t (print " Succesfully compiled "))
                 (print "\n  " output-shlib-path "\n\n"))))))))
@@ -2939,7 +2939,7 @@
     (Windows-add-libdir-to-PATH))
 
 (define impc:aot:compile-xtm-file
-  (lambda (lib-path exit-afterwards?)
+  (lambda (lib-path)
     (let ((start-time (now))
           (in-file-port (or
                          (open-input-file (sanitize-platform-path lib-path))
@@ -2988,7 +2988,7 @@
                         (let ((module (impc:compiler:flush-jit-compilation-queue)))
                           (if (not module)
                               (impc:compiler:print-compiler-error "Failed compiling LLVM IR"))
-                          (impc:aot:compile-module libname-no-extension module exit-afterwards?))
+                          (impc:aot:compile-module libname-no-extension module))
                         ;; (impc:aot:insert-footer libname-no-extension)
                         (close-port *impc:aot:current-output-port*)
                         (set! *impc:aot:current-lib-name* "xtmdylib")
@@ -2997,15 +2997,15 @@
                                     (print "Successfully wrote AOT-compilation file to ")
                                     (print-with-colors 'green 'default #f (print aot-compilation-file-path "\n\n"))
                                     (impc:aot:print-compilation-details start-time)
-                                    (if exit-afterwards? (quit 0)))
+                                    (quit 0))
                              (begin (print-with-colors 'black 'red #t (print " Error "))
                                     (print "\n\nsomething went wrong in writing the output file ")
                                     (print-with-colors 'red 'faultde #t (print aot-compilation-file-path "\n"))
-                                    (if exit-afterwards? (quit 1)))))
+                                    (quit 1))))
                       (begin (print-with-colors 'black 'red #t
                                                 (print " Error "))
                              (print "\n\ncannot write AOT-compilation file at " aot-compilation-file-path "\n")
-                             (if exit-afterwards? (quit 2)))))))))))
+                             (quit 2))))))))))
 
 
 (define icr:new-zone

diff --git a/tests/core/aot-compilation.xtm b/tests/core/aot-compilation.xtm
@@ -9,7 +9,7 @@
 ;; to run these tests, first precompile the test library. In a shell
 ;; in the Extempore directory,
 
-;; extempore --eval "(impc:aot:compile-xtm-file \"libs/contrib/aot-compilation.xtm\" #t #t)"
+;; extempore --eval "(impc:aot:compile-xtm-file \"libs/contrib/aot-compilation.xtm\")"
 
 ;;; Code: