Skip to content

Commit 557bad2

Browse files
committed
build: remove experimental warning for arm32 assembly
1 parent 7d52166 commit 557bad2

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ jobs:
201201
matrix:
202202
configuration:
203203
- env_vars: {}
204-
- env_vars: { EXPERIMENTAL: 'yes', ASM: 'arm32' }
204+
- env_vars: { ASM: 'arm32' }
205205

206206
env:
207207
WRAPPER_CMD: 'qemu-arm'

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if(SECP256K1_TEST_OVERRIDE_WIDE_MULTIPLY)
8787
endif()
8888
mark_as_advanced(FORCE SECP256K1_TEST_OVERRIDE_WIDE_MULTIPLY)
8989

90-
set(SECP256K1_ASM "AUTO" CACHE STRING "Assembly to use: \"AUTO\", \"OFF\", \"x86_64\" or \"arm32\" (experimental). [default=AUTO]")
90+
set(SECP256K1_ASM "AUTO" CACHE STRING "Assembly to use: \"AUTO\", \"OFF\", \"x86_64\" or \"arm32\". [default=AUTO]")
9191
set_property(CACHE SECP256K1_ASM PROPERTY STRINGS "AUTO" "OFF" "x86_64" "arm32")
9292
check_string_option_value(SECP256K1_ASM)
9393
if(NOT SECP256K1_ASM STREQUAL "OFF")
@@ -111,9 +111,6 @@ endif()
111111

112112
option(SECP256K1_EXPERIMENTAL "Allow experimental configuration options." OFF)
113113
if(NOT SECP256K1_EXPERIMENTAL)
114-
if(SECP256K1_ASM STREQUAL "arm32")
115-
message(FATAL_ERROR "ARM32 assembly is experimental. Use -DSECP256K1_EXPERIMENTAL=ON to allow.")
116-
endif()
117114
endif()
118115

119116
set(SECP256K1_VALGRIND "AUTO" CACHE STRING "Build with extra checks for running inside Valgrind. [default=AUTO]")

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ Implementation details
3737
* Optimized implementation of arithmetic modulo the curve's field size (2^256 - 0x1000003D1).
3838
* Using 5 52-bit limbs
3939
* Using 10 26-bit limbs (including hand-optimized assembly for 32-bit ARM, by Wladimir J. van der Laan).
40-
* This is an experimental feature that has not received enough scrutiny to satisfy the standard of quality of this library but is made available for testing and review by the community.
4140
* Scalar operations
4241
* Optimized implementation without data-dependent branches of arithmetic modulo the curve's order.
4342
* Using 4 64-bit limbs (relying on __int128 support in the compiler).

configure.ac

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ AC_ARG_ENABLE(external_default_callbacks,
204204
AC_ARG_WITH([test-override-wide-multiply], [] ,[set_widemul=$withval], [set_widemul=auto])
205205

206206
AC_ARG_WITH([asm], [AS_HELP_STRING([--with-asm=x86_64|arm32|no|auto],
207-
[assembly to use (experimental: arm32) [default=auto]])],[req_asm=$withval], [req_asm=auto])
207+
[assembly to use [default=auto]])],[req_asm=$withval], [req_asm=auto])
208208

209209
AC_ARG_WITH([ecmult-window], [AS_HELP_STRING([--with-ecmult-window=SIZE],
210210
[window size for ecmult precomputation for verification, specified as integer in range [2..24].]
@@ -438,9 +438,7 @@ fi
438438
###
439439

440440
if test x"$enable_experimental" = x"no"; then
441-
if test x"$set_asm" = x"arm32"; then
442-
AC_MSG_ERROR([ARM32 assembly is experimental. Use --enable-experimental to allow.])
443-
fi
441+
:
444442
fi
445443

446444
###

0 commit comments

Comments
 (0)