Skip to content

Commit

Permalink
Remove legacy esp8266 toolchain support (#2794)
Browse files Browse the repository at this point in the history
This PR removes legacy toolchain cruft from the framework.

- Old esp8266 libc support not required. All esp-quick-toolchain compiler versions use newlib.
- Change compiler version check to error. Code won't work with old toolchains.
- Remove use of GCC_VERSION_COMPATIBLE from UPnP library. Framework does check, libraries don't need to.
  • Loading branch information
mikee47 authored Jun 10, 2024
1 parent 52ee9d0 commit 759b89a
Show file tree
Hide file tree
Showing 15 changed files with 6 additions and 291 deletions.
4 changes: 1 addition & 3 deletions Sming/Arch/Esp8266/Components/gdbstub/component.mk
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,5 @@ ifeq ($(GDB_UART_SWAP),1)
APP_CFLAGS += -DGDB_UART_SWAP=1
endif

#
ifeq ($(USE_NEWLIB),1)
# All supported compiler versions now use unpatched GDB
APP_CFLAGS += -DGDBSTUB_GDB_PATCHED=0
endif
8 changes: 0 additions & 8 deletions Sming/Arch/Esp8266/Components/libc/component.mk
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
COMPONENT_SRCDIRS :=
COMPONENT_INCDIRS := include
COMPONENT_SRCDIRS := src

COMPONENT_DOXYGEN_INPUT := include/sys

ifeq ($(USE_NEWLIB),1)
COMPONENT_SRCDIRS += src/newlib
EXTRA_LIBS += m c gcc
else
COMPONENT_SRCDIRS += src/oldlib
LIBDIRS += $(COMPONENT_PATH)/lib
EXTRA_LIBS += microc microgcc setjmp
endif

ifndef MAKE_CLEAN

Expand Down
Binary file removed Sming/Arch/Esp8266/Components/libc/lib/libmicroc.a
Binary file not shown.
Binary file not shown.
Binary file removed Sming/Arch/Esp8266/Components/libc/lib/libsetjmp.a
Binary file not shown.
7 changes: 0 additions & 7 deletions Sming/Arch/Esp8266/Components/libc/src/oldlib/README.rst

This file was deleted.

139 changes: 0 additions & 139 deletions Sming/Arch/Esp8266/Components/libc/src/oldlib/pgmspace.c

This file was deleted.

48 changes: 0 additions & 48 deletions Sming/Arch/Esp8266/Components/libc/src/oldlib/strcspn.c

This file was deleted.

22 changes: 0 additions & 22 deletions Sming/Arch/Esp8266/Components/libc/src/oldlib/strerror.c

This file was deleted.

52 changes: 0 additions & 52 deletions Sming/Arch/Esp8266/Components/libc/src/oldlib/strspn.c

This file was deleted.

3 changes: 0 additions & 3 deletions Sming/Arch/Esp8266/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,5 @@ ifeq (,$(wildcard $(XTENSA_TOOLS_ROOT)))
$(error ESP_HOME not set correctly: "$(ESP_HOME)")
endif

# Identifies which library we're building with
USE_NEWLIB = $(GCC_VERSION_COMPATIBLE)

# => Tools
MEMANALYZER = $(PYTHON) $(ARCH_TOOLS)/memanalyzer.py $(OBJDUMP)$(TOOL_EXT)
2 changes: 1 addition & 1 deletion Sming/Libraries/UPnP
Submodule UPnP updated 1 files
+0 −4 component.mk
4 changes: 2 additions & 2 deletions Sming/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,10 @@ GCC_MIN_MAJOR_VERSION := 8
GCC_VERSION_COMPATIBLE := $(shell expr $$(echo $(GCC_VERSION) | cut -f1 -d.) \>= $(GCC_MIN_MAJOR_VERSION))

ifeq ($(GCC_VERSION_COMPATIBLE),0)
$(warning ***** Please, upgrade your GCC compiler to version $(GCC_MIN_MAJOR_VERSION) or newer *****)
ifneq ($(GCC_UPGRADE_URL),)
$(info Instructions for upgrading your compiler can be found here: $(GCC_UPGRADE_URL))
endif
endif
$(error Please, upgrade your GCC compiler to version $(GCC_MIN_MAJOR_VERSION) or newer.)
endif
endif

Expand Down
8 changes: 2 additions & 6 deletions docs/source/getting-started/linux/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ Debian (Ubuntu) and Fedora systems can use the scripted installer.
dnf install -y git

3. Fetch the Sming repository

::
3. Fetch the Sming repository::

git clone https://github.com/SmingHub/Sming /opt/sming

4. Run the installer

::
4. Run the installer::

source /opt/sming/Tools/install.sh all

Expand Down

0 comments on commit 759b89a

Please sign in to comment.