nixpkgs/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch
Keshav Kini 9a32d3d136 acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable.  Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.

There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.

Future work: modularize the build so that we can support multiple
different subsets of the standard library.  A lot of the stuff in this
complete build is probably superfluous to almost all users.  Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it.  So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-08-01 23:38:54 -07:00

30 lines
914 B
Diff

From b0ccf68f277d0bd5e6fc9d41742f31ddda99a955 Mon Sep 17 00:00:00 2001
From: Keshav Kini <keshav.kini@gmail.com>
Date: Mon, 1 Jun 2020 21:42:24 -0700
Subject: [PATCH 2/2] Restrict RDTSC to x86
Backported from [1]. According to Curtis Dunham, this should fix the ACL2 base
system build on ARM.
[1]: https://github.com/acl2/acl2/commit/292fa2ccc6217e6307d7bb8373eb90f5d258ea5e
---
memoize-raw.lisp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/memoize-raw.lisp b/memoize-raw.lisp
index 205e78653..478198dee 100644
--- a/memoize-raw.lisp
+++ b/memoize-raw.lisp
@@ -189,7 +189,7 @@
;; RDTSC nonsense, but we still can report mysterious results since we have no
;; clue about which core we are running on in CCL (or, presumably, SBCL).
-#+(or ccl sbcl)
+#+(and (or ccl sbcl) x86-64)
(eval-when
(:execute :compile-toplevel :load-toplevel)
(when #+ccl (fboundp 'ccl::rdtsc)
--
2.25.4