diff -urNp -x '*.orig' uClibc-0.9.33.2.org/extra/Configs/Config.in uClibc-0.9.33.2/extra/Configs/Config.in
--- uClibc-0.9.33.2.org/extra/Configs/Config.in	2012-05-15 09:20:09.000000000 +0200
+++ uClibc-0.9.33.2/extra/Configs/Config.in	2021-04-09 09:42:09.833470098 +0200
@@ -1994,7 +1994,7 @@ menu "Library Installation Options"
 
 config RUNTIME_PREFIX
 	string "uClibc runtime library directory"
-	default "/usr/$(TARGET_ARCH)-linux-uclibc/"
+	default "/usr/$(TARGET_CPU)-linux-uclibc"
 	help
 	  RUNTIME_PREFIX is the directory into which the uClibc runtime
 	  libraries will be installed.   The result will look something
@@ -2012,7 +2012,7 @@ config RUNTIME_PREFIX
 
 config DEVEL_PREFIX
 	string "uClibc development environment directory"
-	default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/"
+	default "/usr/$(TARGET_CPU)-linux-uclibc/usr"
 	help
 	  DEVEL_PREFIX is the directory into which the uClibc development
 	  environment will be installed.   The result will look something
diff -urNp -x '*.orig' uClibc-0.9.33.2.org/extra/gcc-uClibc/Makefile uClibc-0.9.33.2/extra/gcc-uClibc/Makefile
--- uClibc-0.9.33.2.org/extra/gcc-uClibc/Makefile	2021-04-09 09:42:09.643467299 +0200
+++ uClibc-0.9.33.2/extra/gcc-uClibc/Makefile	2021-04-09 09:42:09.833470098 +0200
@@ -53,37 +53,37 @@ else
 endif
 
 gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
-	$(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
+	$(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_CPU)-uclibc-gcc
 	touch gcc-uClibc
 
 ld-uClibc:
-	@echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
-	@echo "# This file was autogenerated by make" >> $(TARGET_ARCH)-uclibc-ld
-	@echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >> $(TARGET_ARCH)-uclibc-ld
-	chmod a+x $(TARGET_ARCH)-uclibc-ld
+	@echo "#!/bin/sh" > $(TARGET_CPU)-uclibc-ld
+	@echo "# This file was autogenerated by make" >> $(TARGET_CPU)-uclibc-ld
+	@echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >> $(TARGET_CPU)-uclibc-ld
+	chmod a+x $(TARGET_CPU)-uclibc-ld
 	touch ld-uClibc
 
 install: all
 	install -d $(PREFIX)$(DEVEL_PREFIX)/bin;
 	install -d $(PREFIX)$(RUNTIME_PREFIX)/bin;
-	install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/
-	install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/
-	ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
-	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc
-	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc
-	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld  $(PREFIX)$(DEVEL_PREFIX)/bin/ld
+	install -m 755 $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/
+	install -m 755 $(TARGET_CPU)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/
+	ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-cc
+	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc
+	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc
+	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-ld  $(PREFIX)$(DEVEL_PREFIX)/bin/ld
 ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
-	ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++
-	ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++
-	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++
-	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++
+	ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-g++
+	ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-c++
+	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++
+	ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++
 endif
 	for app in addr2line ar as cpp nm objcopy \
 	    objdump ranlib size strings strip; do \
 	  APPNAME=`which $(CROSS)$${app}`; \
 	  if [ -x "$$APPNAME" ] ; then \
 	  ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \
-	  ln -fs "$$APPNAME" $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \
+	  ln -fs "$$APPNAME" $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-$${app}; \
 	  fi; \
 	done