<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a1dc6c3e4a6e6245054d7045d5408e8486694925">https://github.com/macports/macports-ports/commit/a1dc6c3e4a6e6245054d7045d5408e8486694925</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a1dc6c3e4a6 kremlin-devel: fix arm64 build and drop -march=native, -mtune=native flags.
</span>a1dc6c3e4a6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a1dc6c3e4a6e6245054d7045d5408e8486694925
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Mon May 10 20:59:02 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> kremlin-devel: fix arm64 build and drop -march=native, -mtune=native flags.
</span>---
lang/fstar/Portfile | 4 ++-
.../patch-kremlib-builtin-readcyclecounter | 29 ++++++++++++++++++++++
.../files/kremlin-devel/patch-kremlib-march-native | 11 ++++++++
3 files changed, 43 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/Portfile b/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a9b50d39ab..ad607477d57 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,7 +247,7 @@ subport kremlin {
</span> subport kremlin-devel {
github.setup ${github.author} ${fstar.project} 6e60e33aac1551c1ae20e4e02cb66a188935990b
version 20210322-[string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums rmd160 84737f24e0ad98da156cf831e7b8d2053225fa26 \
sha256 5623af7134c23cf3727884b2e2f2545f0e1d9dded5ceb48e2dacf4aa6f6b2bfe \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,6 +256,8 @@ subport kremlin-devel {
</span> patchfiles-append kremlin-devel/patch-clang-driver-options \
kremlin-devel/patch-fstar-discover-path \
kremlin-devel/patch-fstar-driver-no-lax \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ kremlin-devel/patch-kremlib-march-native \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kremlin-devel/patch-kremlib-builtin-readcyclecounter \
</span> kremlin-devel/patch-test_system_system.h
depends_lib-append port:ocaml-sedlex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/kremlin-devel/patch-kremlib-builtin-readcyclecounter b/lang/fstar/files/kremlin-devel/patch-kremlib-builtin-readcyclecounter
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d845e8c9686
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/files/kremlin-devel/patch-kremlib-builtin-readcyclecounter
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kremlib/c/testlib.c.orig 2021-05-10 21:03:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kremlib/c/testlib.c 2021-05-10 21:08:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,23 +5,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _MSC_VER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TestLib_cycles TestLib_cpucycles(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned hi, lo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __asm__ __volatile__("rdtsc" : "=a"(lo), "=d"(hi));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ((unsigned long long)lo) | (((unsigned long long)hi) << 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __builtin_readcyclecounter();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TestLib_cycles TestLib_cpucycles_begin(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned hi, lo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __asm__ __volatile__ ("CPUID\n\t" "RDTSC\n\t" "mov %%edx, %0\n\t" "mov %%eax, %1\n\t": "=r" (hi), "=r" (lo):: "%rax", "%rbx", "%rcx", "%rdx");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ( (uint64_t)lo)|( ((uint64_t)hi)<<32 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __builtin_readcyclecounter();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TestLib_cycles TestLib_cpucycles_end(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned hi, lo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __asm__ __volatile__ ("RDTSCP\n\t" "mov %%edx, %0\n\t" "mov %%eax, %1\n\t" "CPUID\n\t": "=r" (hi), "=r" (lo):: "%rax", "%rbx", "%rcx", "%rdx");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ( (uint64_t)lo)|( ((uint64_t)hi)<<32 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __builtin_readcyclecounter();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/kremlin-devel/patch-kremlib-march-native b/lang/fstar/files/kremlin-devel/patch-kremlib-march-native
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b5e5d472383
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/files/kremlin-devel/patch-kremlib-march-native
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kremlib/Makefile.orig 2021-05-10 20:56:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kremlib/Makefile 2021-05-10 20:56:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Compilation, only works after the stage above has run and C files exist #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += -O3 -march=native -mtune=native
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export CFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compile-all: compile-dist-generic $(MINI_DIR)/Makefile.include $(UINT128_DIR)/Makefile.include
</span></pre><pre style='margin:0'>
</pre>