Commit 4cd3f395 authored by Raymond Toy's avatar Raymond Toy
Browse files

Merge branch 'branch-21f' into 'master'

Fix #442:  Make release 21f

Closes #442

See merge request !322
parents d537a8a3 23de5fc0
Loading
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ variables:
  download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/$year/$month"
  download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/$year/$month"
  version: "$year-$month-x86"
  version: "$year-$month-x86"
  tar_ext: "xz"
  tar_ext: "xz"
  bootstrap: ""
  bootstrap: "-B boot-21f"


# Default install configuration to download the cmucl tarballs to use
# Default install configuration to download the cmucl tarballs to use
# for building.
# for building.
@@ -129,6 +129,7 @@ linux:install:
    - if: $CI_PIPELINE_SOURCE == "schedule"
    - if: $CI_PIPELINE_SOURCE == "schedule"
    - if: $CI_PIPELINE_SOURCE == "push"
    - if: $CI_PIPELINE_SOURCE == "push"
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    - if: $CI_PIPELINE_SOURCE == "branch"


linux:build:
linux:build:
  <<: *build_configuration
  <<: *build_configuration
+68 −0
Original line number Original line Diff line number Diff line
;;;;
;;;; Boot file for changing the fasl file version numbers to 21f.
;;;;

(in-package :c)

(setf lisp::*enable-package-locked-errors* nil)

;;;
;;; Note that BYTE-FASL-FILE-VERSION is a constant.
;;;
;;; (Be sure to change BYTE-FASL-FILE-VERSION in
;;; compiler/byte-comp.lisp to the correct value too!)
;;;
#-cmu21f
(setf (symbol-value 'byte-fasl-file-version)       #x21f)
#-cmu21f
(setf (backend-fasl-file-version *target-backend*) #x21f)

;;;
;;; Don't check fasl versions in the compiling Lisp because we'll
;;; load files compiled with the new version numbers.
;;;
#-cmu21f
(setq lisp::*skip-fasl-file-version-check* t)

;;;
;;; This is here because BYTE-FASL-FILE-VERSION is constant-folded in
;;; OPEN-FASL-FILE.  To make the new version number take effect, we
;;; have to redefine the function.
;;;
#-cmu21f
(defun open-fasl-file (name where &optional byte-p)
  (declare (type pathname name))
  (let* ((stream (open name :direction :output
			    :if-exists :new-version
			    :element-type '(unsigned-byte 8)
			    :class 'binary-text-stream))
	 (res (make-fasl-file :stream stream)))
    (multiple-value-bind
	(version f-vers f-imp)
	(if byte-p
	    (values "Byte code"
		    byte-fasl-file-version
		    (backend-byte-fasl-file-implementation *backend*))
	    (values (backend-version *backend*)
		    (backend-fasl-file-version *backend*)
		    (backend-fasl-file-implementation *backend*)))
      (format stream
	      "FASL FILE output from ~A.~@
	       Compiled ~A on ~A~@
	       Compiler ~A, Lisp ~A~@
	       Targeted for ~A, FASL version ~X~%"
	      where
	      (ext:format-universal-time nil (get-universal-time))
	      (machine-instance) compiler-version
	      (lisp-implementation-version)
	      version f-vers)
      ;;
      ;; Terminate header.
      (dump-byte 255 res)
      ;;
      ;; Specify code format.
      (dump-fop 'lisp::fop-long-code-format res)
      (dump-byte f-imp res)
      (dump-unsigned-32 f-vers res))
    res))
+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@
;; 0-9 followed by a single hex digit in the range a-f.  Then the
;; 0-9 followed by a single hex digit in the range a-f.  Then the
;; version looks like a decimal number followed by a minor release
;; version looks like a decimal number followed by a minor release
;; letter of a to f.
;; letter of a to f.
(defconstant byte-fasl-file-version #x21e)
(defconstant byte-fasl-file-version #x21f)


(let* ((version-string (format nil "~X" byte-fasl-file-version)))
(let* ((version-string (format nil "~X" byte-fasl-file-version)))
  ;; Add :cmu<n> to *features*
  ;; Add :cmu<n> to *features*
+49 −0
Original line number Original line Diff line number Diff line
@@ -109,6 +109,38 @@ msgstr ""
"Readthay afesay ushpay ofway alvay ontoway ethay istlay inway ethay ectorvay "
"Readthay afesay ushpay ofway alvay ontoway ethay istlay inway ethay ectorvay "
"elementway."
"elementway."


#: src/code/x86-vm.lisp
msgid "The bit in the x87 FPU control word that controls the infinity mode."
msgstr ""

#: src/code/x86-vm.lisp
msgid "The bits in the x87 FPU control word for the rounding mode."
msgstr ""

#: src/code/x86-vm.lisp
msgid "The bits in the x87 FPU contol word for the FP operation precision."
msgstr ""

#: src/code/x86-vm.lisp
msgid ""
"The bits in the x87 FPU control word indicating the exceptions that\n"
" are enabled."
msgstr ""

#: src/code/x86-vm.lisp
msgid ""
"Alist for the x87 precison control.  The car is the symbolic\n"
" precision and the cdr is the value for the precision control field."
msgstr ""

#: src/code/x86-vm.lisp
msgid "Print SSE2 floating modes word in a human-readable fashion."
msgstr ""

#: src/code/x86-vm.lisp
msgid "Print X87 floating modes word in a human-readable fashion."
msgstr ""

#: src/code/load.lisp
#: src/code/load.lisp
msgid "Top-Level Form"
msgid "Top-Level Form"
msgstr "Optay-Evellay Ormfay"
msgstr "Optay-Evellay Ormfay"
@@ -179,6 +211,23 @@ msgstr "Askmay otay etgay ethay ixnumfay agtay"
msgid "Maximum number of bits in a positive fixnum"
msgid "Maximum number of bits in a positive fixnum"
msgstr "Aximummay umbernay ofway itsbay inway away ositivepay ixnumfay"
msgstr "Aximummay umbernay ofway itsbay inway away ositivepay ixnumfay"


#: src/compiler/x86/parms.lisp
msgid ""
"The bits in the FP mode that hold the accrued exceptions that have\n"
" occurred since the bits were reset."
msgstr ""

#: src/compiler/x86/parms.lisp
msgid "The bits in the FP mode that hold FP exceptions that are enabled."
msgstr ""

#: src/compiler/x86/parms.lisp
msgid ""
"The bits in the FP mode that hold the current exception.  However\n"
" for x86, there aren't separate bits for this, so we use the stick\n"
" bits from the accrued exceptions"
msgstr ""

#: src/compiler/x86/vm.lisp
#: src/compiler/x86/vm.lisp
msgid "Redefining SC number ~D from ~S to ~S."
msgid "Redefining SC number ~D from ~S to ~S."
msgstr "Edefiningray SC umbernay ~D omfray ~S otay ~S."
msgstr "Edefiningray SC umbernay ~D omfray ~S otay ~S."
+55 −2
Original line number Original line Diff line number Diff line
@@ -5197,7 +5197,7 @@ msgstr ""
msgid ""
msgid ""
"WITH-STRING-CODEPOINT-ITERATOR ((next string) &body body)\n"
"WITH-STRING-CODEPOINT-ITERATOR ((next string) &body body)\n"
"  provides a method of looping through a string from the beginning to\n"
"  provides a method of looping through a string from the beginning to\n"
"  the end of the string prodcucing successive codepoints from the\n"
"  the end of the string producing successive codepoints from the\n"
"  string.  NEXT is bound to a generator macro that, within the scope\n"
"  string.  NEXT is bound to a generator macro that, within the scope\n"
"  of the invocation, returns one or two values. The first value tells\n"
"  of the invocation, returns one or two values. The first value tells\n"
"  whether any objects remain in the string. When the first value is\n"
"  whether any objects remain in the string. When the first value is\n"
@@ -5663,7 +5663,7 @@ msgstr ""
msgid ""
msgid ""
"WITH-STRING-GLYPH-ITERATOR ((next string) &body body)\n"
"WITH-STRING-GLYPH-ITERATOR ((next string) &body body)\n"
"  provides a method of looping through a string from the beginning to\n"
"  provides a method of looping through a string from the beginning to\n"
"  the end of the string prodcucing successive glyphs from the string.\n"
"  the end of the string producing successive glyphs from the string.\n"
"  NEXT is bound to a generator macro that, within the scope of the\n"
"  NEXT is bound to a generator macro that, within the scope of the\n"
"  invocation, returns one or three values. The first value tells\n"
"  invocation, returns one or three values. The first value tells\n"
"  whether any objects remain in the string. When the first value is\n"
"  whether any objects remain in the string. When the first value is\n"
@@ -11833,6 +11833,7 @@ msgid ""
"     (:EXPORT {symbol-name}*)\n"
"     (:EXPORT {symbol-name}*)\n"
"     (:INTERN {symbol-name}*)\n"
"     (:INTERN {symbol-name}*)\n"
"     (:SIZE <integer>)\n"
"     (:SIZE <integer>)\n"
"     (:LOCAL-NICKNAMES {({nickname package}*)})\n"
"   All options except :SIZE and :DOCUMENTATION can be used multiple times."
"   All options except :SIZE and :DOCUMENTATION can be used multiple times."
msgstr ""
msgstr ""
"Efinesday away ewnay ackagepay alledcay PACKAGE.  Eachway ofway OPTIONS "
"Efinesday away ewnay ackagepay alledcay PACKAGE.  Eachway ofway OPTIONS "
@@ -12285,6 +12286,58 @@ msgstr ""
"ofway ethay ymbolssay\n"
"ofway ethay ymbolssay\n"
"  oundfay insteadway ofway escribingday emthay."
"  oundfay insteadway ofway escribingday emthay."
#: src/code/package.lisp
msgid ""
"Returns an alist of (local-nickname . actual-package) describing the\n"
"  nicknames local to Package."
msgstr ""
#: src/code/package.lisp
msgid ""
"For the designated package Package (defaulting to *PACKAGE*), add\n"
"  Local-Nickname as a package local nickname to the package\n"
"  Actual-Package. Actual-Package and Package must be an package\n"
"  designator. Local-Nickname should be a string designator.\n"
"\n"
"  Returns the designated package.\n"
"\n"
"  Signals a continuable error if any of the following are true:\n"
"    - Local-Nickname is already a local nickname for a different package\n"
"    - Local-Nickname is one of \"CL\", \"COMMON-LISP\", or \"KEYWORD\""
msgstr ""
#: src/code/package.lisp
msgid "Local nickname cannot be \"CL\", \"COMMON-LISP\" or \"KEYWORD\""
msgstr ""
#: src/code/package.lisp
#, fuzzy
msgid "~A is already a local nickname for the package ~A in ~A"
msgstr "~Away isway away icknay-amenay orfay ethay ackagepay ~Away"
#: src/code/package.lisp
msgid ""
"~A cannot be a package local nickname for the global package~_ ~A with the "
"same name"
msgstr ""
#: src/code/package.lisp
msgid ""
"~A cannot be a package local nickname for the global package~_ ~A with "
"nickname ~A"
msgstr ""
#: src/code/package.lisp
msgid ""
"If Package has Old-Nickname as a local nickname, it is removed.\n"
"  Returns true if the nickname existed and was removed.  Otherwise\n"
" returns NIL."
msgstr ""
#: src/code/package.lisp
msgid "Returns a list of packages which have a local nickname for Package."
msgstr ""
#: src/code/reader.lisp
#: src/code/reader.lisp
msgid "Float format for 1.0E1"
msgid "Float format for 1.0E1"
msgstr "Oatflay ormatfay orfay 1.0E1"
msgstr "Oatflay ormatfay orfay 1.0E1"
Loading