diff --git a/site/source/docs/tools_reference/settings_reference.rst b/site/source/docs/tools_reference/settings_reference.rst index 865d3aba04ed5..3de33688fa1d3 100644 --- a/site/source/docs/tools_reference/settings_reference.rst +++ b/site/source/docs/tools_reference/settings_reference.rst @@ -467,9 +467,8 @@ sent value to memory and loaded the received type from the same memory (using truncs/extends/ reinterprets). This means that when types do not match the emulated values may not match (this is true of native too, for that matter - this is all undefined behavior). This approaches appears good enough to -support Python, which is the main use case motivating this feature. - -.. note:: This setting is deprecated +support Python (the original motiviation for this feature) and Glib (the +continued motivation). Default value: false diff --git a/src/settings.js b/src/settings.js index 1ba7733434ea9..e95eb350a465b 100644 --- a/src/settings.js +++ b/src/settings.js @@ -342,9 +342,9 @@ var SAFE_HEAP_LOG = false; // truncs/extends/ reinterprets). This means that when types do not match the // emulated values may not match (this is true of native too, for that matter - // this is all undefined behavior). This approaches appears good enough to -// support Python, which is the main use case motivating this feature. +// support Python (the original motiviation for this feature) and Glib (the +// continued motivation). // [link] -// [deprecated] var EMULATE_FUNCTION_POINTER_CASTS = false; // Print out exceptions in emscriptened code. diff --git a/test/test_other.py b/test/test_other.py index d51cb3c79e1e3..f95e438f1b27a 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -5733,7 +5733,7 @@ def test_bad_function_pointer_cast(self, opts, wasm, safe): if safe: cmd += ['-sSAFE_HEAP'] if emulate_casts: - cmd += ['-sEMULATE_FUNCTION_POINTER_CASTS', '-Wno-deprecated'] + cmd += ['-sEMULATE_FUNCTION_POINTER_CASTS'] if relocatable: cmd += ['-sRELOCATABLE'] # disables asm-optimized safe heap print(cmd) @@ -12598,7 +12598,7 @@ def test_setjmp_emulated_casts(self): } } ''') - self.do_runf('src.c', 'ok\ndone\n', emcc_args=['-Wno-deprecated', '-sEMULATE_FUNCTION_POINTER_CASTS']) + self.do_runf('src.c', 'ok\ndone\n', emcc_args=['-sEMULATE_FUNCTION_POINTER_CASTS']) def test_no_lto(self): # This used to fail because settings.LTO didn't reflect `-fno-lto`. diff --git a/tools/settings.py b/tools/settings.py index 8970cff20e7b4..c47194d1b09af 100644 --- a/tools/settings.py +++ b/tools/settings.py @@ -124,7 +124,6 @@ 'CLOSURE_WARNINGS': 'use -Wclosure instead', 'LEGALIZE_JS_FFI': 'to disable JS type legalization use `-sWASM_BIGINT` or `-sSTANDALONE_WASM`', 'ASYNCIFY_EXPORTS': 'please use JSPI_EXPORTS instead', - 'EMULATE_FUNCTION_POINTER_CASTS': 'lack of usage', 'MAYBE_WASM2JS': 'lack of usage', }