fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

unix/alloc: Remove unused MICROPY_FORCE_PLAT_ALLOC_EXEC option.

Browse Source 
The `MICROPY_FORCE_PLAT_ALLOC_EXEC` config option was made obsolete by
commit 97966254577167f4c50200af1af89109a275da1c, so remove it.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2024-09-26 22:35:48 +10:00
parent 1291718916
commit 70a01550c9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/unix/alloc.c
View File

@ -32,7 +32,7 @@
#include "py/mpstate.h" #include "py/mpstate.h"
#if MICROPY_EMIT_NATIVE || (MICROPY_PY_FFI && MICROPY_FORCE_PLAT_ALLOC_EXEC) #if MICROPY_EMIT_NATIVE
#if defined(__OpenBSD__) || defined(__MACH__) #if defined(__OpenBSD__) || defined(__MACH__)
#define MAP_ANONYMOUS MAP_ANON #define MAP_ANONYMOUS MAP_ANON
@ -80,4 +80,4 @@ void mp_unix_free_exec(void *ptr, size_t size) {
MP_REGISTER_ROOT_POINTER(void *mmap_region_head); MP_REGISTER_ROOT_POINTER(void *mmap_region_head);
#endif // MICROPY_EMIT_NATIVE || (MICROPY_PY_FFI && MICROPY_FORCE_PLAT_ALLOC_EXEC) #endif // MICROPY_EMIT_NATIVE

5
ports/unix/mpconfigport.h
View File

@ -170,11 +170,6 @@ void mp_unix_alloc_exec(size_t min_size, void **ptr, size_t *size);
void mp_unix_free_exec(void *ptr, size_t size); void mp_unix_free_exec(void *ptr, size_t size);
#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) mp_unix_alloc_exec(min_size, ptr, size) #define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) mp_unix_alloc_exec(min_size, ptr, size)
#define MP_PLAT_FREE_EXEC(ptr, size) mp_unix_free_exec(ptr, size) #define MP_PLAT_FREE_EXEC(ptr, size) mp_unix_free_exec(ptr, size)
#ifndef MICROPY_FORCE_PLAT_ALLOC_EXEC
// Use MP_PLAT_ALLOC_EXEC for any executable memory allocation, including for FFI
// (overriding libffi own implementation)
#define MICROPY_FORCE_PLAT_ALLOC_EXEC (1)
#endif
// If enabled, configure how to seed random on init. // If enabled, configure how to seed random on init.
#ifdef MICROPY_PY_RANDOM_SEED_INIT_FUNC #ifdef MICROPY_PY_RANDOM_SEED_INIT_FUNC