diff options
| author | Damien George <damien@micropython.org> | 2021-07-09 14:19:15 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-07-12 17:08:10 +1000 |
| commit | 136369d72f5b99ec23c9c9f178a590bde968e2ee (patch) | |
| tree | 6d75116e1e11a4fbd5bf9765062350016e303375 /py | |
| parent | 4d546713ec8858cbf908de45de11cbfc46a20971 (diff) | |
all: Update to point to files in new shared/ directory.
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'py')
| -rw-r--r-- | py/modbuiltins.c | 2 | ||||
| -rw-r--r-- | py/mpconfig.h | 2 | ||||
| -rw-r--r-- | py/py.mk | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/py/modbuiltins.c b/py/modbuiltins.c index ac41942b9..c9a49685a 100644 --- a/py/modbuiltins.c +++ b/py/modbuiltins.c @@ -230,7 +230,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_hex_obj, mp_builtin_hex); #if MICROPY_PY_BUILTINS_INPUT #include "py/mphal.h" -#include "lib/mp-readline/readline.h" +#include "shared/readline/readline.h" // A port can define mp_hal_readline if they want to use a custom function here #ifndef mp_hal_readline diff --git a/py/mpconfig.h b/py/mpconfig.h index d40637dfa..48c4c6d34 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -1063,7 +1063,7 @@ typedef double mp_float_t; #endif // Whether to provide the built-in input() function. The implementation of this -// uses mp-readline, so can only be enabled if the port uses this readline. +// uses shared/readline, so can only be enabled if the port uses this readline. #ifndef MICROPY_PY_BUILTINS_INPUT #define MICROPY_PY_BUILTINS_INPUT (0) #endif @@ -209,8 +209,8 @@ PY_EXTMOD_O_BASENAME = \ extmod/vfs_lfs.o \ extmod/utime_mphal.o \ extmod/uos_dupterm.o \ - lib/embed/abort_.o \ - lib/utils/printf.o \ + shared/libc/abort_.o \ + shared/libc/printf.o \ # prepend the build destination prefix to the py object files PY_CORE_O = $(addprefix $(BUILD)/, $(PY_CORE_O_BASENAME)) @@ -272,7 +272,7 @@ $(HEADER_BUILD)/moduledefs.h: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER # Standard C functions like memset need to be compiled with special flags so # the compiler does not optimise these functions in terms of themselves. CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto -$(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN) +$(BUILD)/shared/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN) # Force nlr code to always be compiled with space-saving optimisation so # that the function preludes are of a minimal and predictable form. |