diff options
| author | John Högberg <john@erlang.org> | 2023-04-17 10:41:34 +0200 |
|---|---|---|
| committer | John Högberg <john@erlang.org> | 2023-04-17 10:41:34 +0200 |
| commit | 976d2c401ac74d948e1547c0c5e06e1116a90101 (patch) | |
| tree | f9ce807d28a8fd85fdb15827ebac6417b7d7b1aa /erts/configure | |
| parent | 5675c7dd3dc1727332596c67215109f7b217ecfa (diff) | |
| parent | 249d283ab7eda6e5b17c27ef8f7a4d0d2c70a3af (diff) | |
| download | erlang-976d2c401ac74d948e1547c0c5e06e1116a90101.tar.gz | |
Merge branch 'maint'
* maint:
Update configure scripts
erts: Fix ic/dc config tests and usage
Diffstat (limited to 'erts/configure')
| -rwxr-xr-x | erts/configure | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/erts/configure b/erts/configure index 2c76bc1587..64db499912 100755 --- a/erts/configure +++ b/erts/configure @@ -14193,7 +14193,7 @@ int main (void) { - __asm__ __volatile__("isb sy" : : : "memory"); + __asm__ __volatile__("isb sy\n" : : : "memory"); ; return 0; @@ -14227,7 +14227,7 @@ int main (void) { - char data[512]; __asm__ __volatile__("dc cvau, %0" : "r" (data) : : "memory"); + char data[512]; __asm__ __volatile__("dc cvau, %0\n" :: "r" (data) : "memory"); ; return 0; @@ -14261,7 +14261,7 @@ int main (void) { - char data[512]; __asm__ __volatile__("ic ivau, %0" : "r" (data) : : "memory"); + char data[512]; __asm__ __volatile__("ic ivau, %0\n" :: "r" (data) : "memory"); ; return 0; @@ -24539,7 +24539,27 @@ then : JIT_ARCH=x86 ;; arm64) - JIT_ARCH=arm + case "$OPSYS" in + win32|darwin) + # These platforms have dedicated system calls for clearing + # instruction cache, and don't require us to manually issue + # instruction barriers on all threads. + JIT_ARCH=arm + ;; + *) + # We need to use `DC CVAU`, `IC IVAU`, and `ISB SY` to clear + # instruction cache. These have already been tested as part of + # ETHR_CHK_GCC_ATOMIC_OPS([]). + + if test "$ethr_arm_isb_sy_instr_val$ethr_arm_dc_cvau_instr_val$ethr_arm_ic_ivau_instr_val" = "111"; then + JIT_ARCH=arm + else + enable_jit=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT disabled due to lack of cache-clearing instructions" >&5 +printf "%s\n" "$as_me: WARNING: JIT disabled due to lack of cache-clearing instructions" >&2;} + fi + ;; + esac ;; *) if test ${enable_jit} = yes; then |