Merge branch '143-uiop-remember-single-multi-threaded-in-the-implemen…

…tation-identifier' into 'master' Resolve "uiop: Remember single/multi-threaded in the implementation-identifier." Closes #143 See merge request asdf/asdf!222
roswell · Aug 29, 2023 · 44f0a95 · 44f0a95
2 parents 55a2056 + 92fb0e6
commit 44f0a95
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/test/script-support.lisp b/test/script-support.lisp
@@ -26,8 +26,6 @@ Some constraints:
    #:with-test #:test-asdf #:debug-asdf
    #:run-test-script #:interactive-test #:test-load-systems
    #:verbose #:exit-lisp
-   #:assert-compare
-   #:assert-equal
    #:leave-test #:def-test-system
    #:action-name #:in-plan-p
    #:test-source #:test-fasl #:resolve-output #:output-location

diff --git a/test/test-utilities.script b/test/test-utilities.script
@@ -743,3 +743,11 @@
  #+(or clasp abcl ecl) '(ext:remove-package-local-nickname ext:package-local-nicknames ext:add-package-local-nickname)
  #+ccl '(ccl:remove-package-local-nickname ccl:package-local-nicknames ccl:add-package-local-nickname)
  #+lispworks '(hcl:remove-package-local-nickname hcl:package-local-nicknames hcl:add-package-local-nickname))
+
+#+sbcl #+sbcl
+(DBG "Ensure that SBCL threaded FASLs are distinguished from unthreaded ones.")
+(assert (not (string=
+              (let ((*features* (remove :sb-thread *features*)))
+                (uiop:implementation-identifier))
+              (let ((*features* (cons :sb-thread *features*)))
+                (uiop:implementation-identifier)))))
diff --git a/uiop/os.lisp b/uiop/os.lisp
@@ -217,7 +217,7 @@ then returning the non-empty string value of the variable"
                 ;; Note if not using International ACL
                 ;; see http://www.franz.com/support/documentation/8.1/doc/operators/excl/ics-target-case.htm
                 (excl:ics-target-case (:-ics "8"))
-                (and (member :smp *features*) "S"))
+                (and (member :smp *features*) "SBT"))
         #+armedbear (format nil "~a-fasl~a" s system::*fasl-version*)
         #+clisp
         (subseq s 0 (position #\space s)) ; strip build information (date, etc.)
@@ -259,7 +259,8 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie
              (or (implementation-type) (lisp-implementation-type))
              (lisp-version-string)
              (or (operating-system) (software-type))
-             (or (architecture) (machine-type))))))
+             (or (architecture) (machine-type))
+             #+sbcl (if (featurep :sb-thread) "S" "")))))
 
 
 ;;;; Other system information