Rename -nolibc to -noclibs

nolibc already has a meaning for GCC 9+ and it acts by removing the whole LIB_SPEC which is not what we want here.
2022-02-03 19:39:52 +01:00 · 2022-02-03 19:39:52 +01:00 · 60958b4a7e
parent 8fb72487bd
commit 60958b4a7e
134 changed files with 138 additions and 138 deletions
--- a/arch/all-hosted/devs/hostdisk/mmakefile.src
+++ b/arch/all-hosted/devs/hostdisk/mmakefile.src
@ -6,7 +6,7 @@ USER_INCLUDES := -I$(SRCDIR)/arch/all-$(ARCH)/devs/hostdisk
 ifneq ($(FAMILY),)
 USER_INCLUDES += -I$(SRCDIR)/arch/all-$(FAMILY)/devs/hostdisk
 endif
-USER_LDFLAGS	= -nolibc -lstdc.static
+USER_LDFLAGS	= -noclibs -lstdc.static

 %build_module mmake=workbench-devs-hostdisk \
  modname=hostdisk modtype=device version=$(AROS_TARGET_PLATFORM) \
--- a/arch/all-hosted/filesys/emul_handler/mmakefile.src
+++ b/arch/all-hosted/filesys/emul_handler/mmakefile.src
@ -7,7 +7,7 @@ endif

 USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\""
 USER_INCLUDES := -I$(SRCDIR)/arch/all-$(ARCH)/filesys/emul_handler $(FAMILY_INCLUDES) -I$(SRCDIR)/$(CURDIR) -iquote $(SRCDIR)/rom/expansion -iquote $(SRCDIR)/rom/dosboot
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES	      := emul_init emul_handler filenames emul_host
 CONSOLE_FILES := boot
--- a/arch/all-hosted/hidd/x11/mmakefile.src
+++ b/arch/all-hosted/hidd/x11/mmakefile.src
@ -23,7 +23,7 @@ USER_CFLAGS := $(HOST_X11_CFLAGS)
 ## complaints with -O1 or higher optimizations enabled.
 USER_CFLAGS += -Wno-attributes

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 # TODO: What if the system is pure Darwin running a regular PC?
 ifeq ($(ARCH),darwin)
--- a/arch/all-linux/hidd/linuxfb/mmakefile.src
+++ b/arch/all-linux/hidd/linuxfb/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS		= -nolibc
+USER_LDFLAGS		= -noclibs
 USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES)

 ifneq ("","$(strip $(WARN_ERROR))")
--- a/arch/all-linux/hidd/pcilinux/mmakefile.src
+++ b/arch/all-linux/hidd/pcilinux/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES	:= pcilinux_init driverclass

--- a/arch/all-native/econsole/mmakefile.src
+++ b/arch/all-native/econsole/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES := econsole

--- a/arch/all-native/hidd/vgagfx/mmakefile.src
+++ b/arch/all-native/hidd/vgagfx/mmakefile.src
@ -9,7 +9,7 @@ FILES := \
        vgagfx_support \
        vgagfx_bitmapclass

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-hidd-vgagfx \
  modname=vgagfx modtype=hidd \
--- a/arch/all-pc/acpica/mmakefile.src
+++ b/arch/all-pc/acpica/mmakefile.src
@ -42,7 +42,7 @@ ACPICA_BASESOURCES = \

 NOWARN_FLAGS := $(NOWARN_STRICT_ALIASING)
 USER_CFLAGS := $(NOWARN_FLAGS) $(CFLAGS_NO_BUILTIN_VSNPRINTF)
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 # ACPICA debugging options
 ifeq ($(DEBUG_ACPI),yes)
--- a/arch/all-pc/debug/hyperv/mmakefile.src
+++ b/arch/all-pc/debug/hyperv/mmakefile.src
@ -8,7 +8,7 @@ include $(SRCDIR)/config/aros.cfg
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG
 #USER_CPPFLAGS += -DDEBUG=1
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 #USER_INCLUDES := -I $(SRCDIR)/rom/exec
 USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) -I$(SRCDIR)/arch/all-native/kernel \
--- a/arch/all-pc/hidds/hidd/mmakefile.src
+++ b/arch/all-pc/hidds/hidd/mmakefile.src
@ -7,7 +7,7 @@ HIDDDIR := rom/hidds/hidd
 USER_CPPFLAGS := -DAROS_USE_OOP \
               -D__OOP_NOLIBBASE__ \
               -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs
 USER_INCLUDES := -I$(SRCDIR)/$(CURDIR) -I$(SRCDIR)/$(HIDDDIR)

 %build_archspecific \
--- a/arch/all-unix/hidd/unixio/mmakefile.src
+++ b/arch/all-unix/hidd/unixio/mmakefile.src
@ -17,7 +17,7 @@ endif
 ## complaints with -O1 or higher optimizations enabled.
 USER_CFLAGS += -Wno-attributes

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 #MM- includes-generate: kernel-unixio-includes

--- a/arch/arm-native/soc/broadcom/2708/hidd/vc4gfx/mmakefile.src
+++ b/arch/arm-native/soc/broadcom/2708/hidd/vc4gfx/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES	:=	\
 	vc4gfx_init \
--- a/arch/arm-native/soc/broadcom/2708/usb/usb2otg/mmakefile.src
+++ b/arch/arm-native/soc/broadcom/2708/usb/usb2otg/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES := \
    usb2otg_device \
--- a/arch/m68k-all/test/mmakefile.src
+++ b/arch/m68k-all/test/mmakefile.src
@ -7,7 +7,7 @@ EXEDIR := $(AROS_TESTS)

 FILES=bcpl_strings

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_progs mmake=test-m68k-bcpl \
    files=$(FILES) targetdir=$(EXEDIR) \
--- a/arch/m68k-amiga/boot/mmakefile.src
+++ b/arch/m68k-amiga/boot/mmakefile.src
@ -357,7 +357,7 @@ $(GENDIR)/boot/objtest:
 $(GENDIR)/boot/objtest/%.tst : $(KOBJSDIR)/%.ko $(GENDIR)/boot/objtest
 	@$(ECHO) Test Linking $@...
 	$(KERNEL_CC) -Wl,-r \
-		-nolibc -nostartfiles -nostdlib \
+		-noclibs -nostartfiles -nostdlib \
 		-Wl,--defsym -Wl,start=0x0 \
 		-Wl,--defsym -Wl,SysBase=0x4 \
 		-Wl,--defsym -Wl,AbsExecBase=0x4 \
--- a/arch/m68k-amiga/c/mmakefile.src
+++ b/arch/m68k-amiga/c/mmakefile.src
@ -32,7 +32,7 @@ TARGET_ISA_AFLAGS:=$(ISA_MC68060_FLAGS)
 #MM workbench-c-m68k-setpatcharos : linklibs-loadseg
 #MM workbench-c-m68k-setpatch : kernel-setpatch-includes kernel-setpatch-linklib

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES := gdbstub

@ -49,7 +49,7 @@ FILES := gdbstop
 CFILES := SetPatchAROS
 AFILES := newstackswap
 USER_INCLUDES += -isystem $(SRCDIR)/rom/dos/include
-USER_LDFLAGS  := -nolibc
+USER_LDFLAGS  := -noclibs

 %build_prog mmake=workbench-c-m68k-setpatcharos progname=SetPatchAROS \
    files=$(CFILES) asmfiles=$(AFILES) targetdir=$(AROSARCHDIR) \
--- a/arch/m68k-amiga/devs/sagasd/mmakefile.src
+++ b/arch/m68k-amiga/devs/sagasd/mmakefile.src
@ -30,7 +30,7 @@ USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/include \
 USER_CFLAGS := -D__NOLIBBASE__ -O2 -DSIMULATE=0 \
               -DADATE="\"$(shell date "+%d.%m.%Y")\"" -fdata-sections -ffunction-sections -fno-zero-initialized-in-bss -fno-common

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 DEVICE_FILES := sagasd_device sdcmd

--- a/arch/m68k-amiga/hidd/p96gfx/mmakefile.src
+++ b/arch/m68k-amiga/hidd/p96gfx/mmakefile.src
@ -8,7 +8,7 @@ USER_CPPFLAGS := \
               -D__GRAPHICS_NOLIBBASE__ \
               -D__UTILITY_NOLIBBASE__ \
               -D__GRAPHICS_NOHIDDBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-amiga-m68k-p96gfx \
    modname=p96gfx modtype=hidd \
--- a/arch/m68k-amiga/hidd/parallel/mmakefile.src
+++ b/arch/m68k-amiga/hidd/parallel/mmakefile.src
@ -6,7 +6,7 @@ FILES	:=	ParallelClass ParallelUnitClass
 #MM- workbench-devs-amiga-m68k: amiga-m68k-hidd-parallel

 #USER_CPPLFAGS := -DDEBUG=1
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=amiga-m68k-hidd-parallel \
  modname=parallel modtype=hidd \
--- a/arch/m68k-amiga/hidd/pci-mediator/mmakefile.src
+++ b/arch/m68k-amiga/hidd/pci-mediator/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES=pci-mediator_init driverclass pci_resource

--- a/arch/m68k-amiga/hidd/pci-prometheus/mmakefile.src
+++ b/arch/m68k-amiga/hidd/pci-prometheus/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES=pci-prometheus_init driverclass pci_resource

--- a/arch/m68k-amiga/hidd/sagagfx/mmakefile.src
+++ b/arch/m68k-amiga/hidd/sagagfx/mmakefile.src
@ -3,7 +3,7 @@ include $(SRCDIR)/config/aros.cfg

 #MM hidd-m68k-sagagfx : kernel-hidd-gfx-includes devs-monitors-wrapper

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 SAGA_HIDD_SOURCES := \
        sagagfx_init \
--- a/arch/ppc-sam440/pci/mmakefile.src
+++ b/arch/ppc-sam440/pci/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-hidd-pci-amcc440 \
  modname=pci-amcc440 modtype=hidd \
--- a/arch/ppc-sam440/pci460/mmakefile.src
+++ b/arch/ppc-sam440/pci460/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-hidd-pci-amcc460 \
  modname=pci-amcc460 modtype=hidd \
--- a/compiler/crt/mmakefile.src
+++ b/compiler/crt/mmakefile.src
@ -350,7 +350,7 @@ NOWARN_FLAGS := $(NOWARN_NONNULL_COMPARE) $(NOWARN_UNUSED_VARIABLE) \
    $(NOWARN_PARENTHESES) $(NOWARN_UNINITIALIZED)

 USER_CFLAGS := $(NOWARN_FLAGS) $(CFLAGS_NO_BUILTIN)
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs
 USER_CPPFLAGS := \
        -Dlint '-D__FBSDID(x)=' 
 #USER_CPPFLAGS += -DDEBUG=1
@ -364,7 +364,7 @@ USER_CPPFLAGS := \
 ###############################################################################

 USER_CFLAGS := $(CFLAGS_NO_BUILTIN)
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs
 USER_CPPFLAGS := \
        -Dlint '-D__FBSDID(x)=' \
 #USER_CPPFLAGS += -DDEBUG=1
@ -478,7 +478,7 @@ USER_INCLUDES := \
    -include $(SRCDIR)/$(CURDIR)/__posixc_intbase.h \
    -iquote $(SRCDIR)/compiler/posixc

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 CRT := \
    $(SRCDIR)/compiler/crt/__crt_exec \
--- a/config/make.tmpl
+++ b/config/make.tmpl
@ -4579,7 +4579,7 @@ endif

 %(file): KOBJS    := $(KOBJS)
 %(file): LDFLAGS  := $(strip $(TMP_LDFLAGS) $(NOSTARTUP_LDFLAGS) \
-                    -nolibc -nosysbase -Wl,-Ur)
+                    -noclibs -nosysbase -Wl,-Ur)
 %(file): LDLIBS   := $(addprefix -l, %(uselibs)) -lstdc.static
 %(file): $(KOBJS) $(DEPLIBS) | $(TMP_DIRS)
 	$(Q)$(ECHO) "Kickstart  $(subst $(TARGETDIR)/,,$@)..."
--- a/developer/debug/test/crt/stdc/mmakefile.src
+++ b/developer/debug/test/crt/stdc/mmakefile.src
@ -71,7 +71,7 @@ USER_CFLAGS = $(STDC_BASE_CFLAGS) $(NOWARN_CFLAGS)
    files=$(STDCPRINTTESTFILES) targetdir=$(EXEDIR)

 # Force missing ProgCtx for this test
-USER_LDFLAGS := -nolibc -lcrtmod -lcrt
+USER_LDFLAGS := -noclibs -lcrtmod -lcrt

 %build_progs mmake=test-crt-stdc-modonly \
    files="modonly" targetdir=$(EXEDIR)
--- a/developer/debug/test/sdi/examples/libraries/mmakefile.src
+++ b/developer/debug/test/sdi/examples/libraries/mmakefile.src
@ -17,7 +17,7 @@ EXEDIR        := $(AROS_TESTS)/sdi
 FILES         := example_lib stubs-aros
 USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../..
 USER_CFLAGS   := -DAROS_ABI_V1
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module_simple mmake=test-sdi-libraries-library \
    modname=example modtype=library \
--- a/external/openurl/library/mmakefile.src
+++ b/external/openurl/library/mmakefile.src
@ -15,7 +15,7 @@ FILES:= libinit \

 USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../include
 USER_CFLAGS := -DAROS_ABI_V1
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 #MM- external-openurl-lib : linklibs external-openurl-includes

--- a/rom/bootloader/mmakefile.src
+++ b/rom/bootloader/mmakefile.src
@ -8,7 +8,7 @@ include $(SRCDIR)/config/aros.cfg
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
               -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-bootloader \
    modname=bootloader modtype=resource \
--- a/rom/card/mmakefile.src
+++ b/rom/card/mmakefile.src
@ -6,7 +6,7 @@ USER_CPPFLAGS := \
 USER_INCLUDES := -I$(SRCDIR)/arch/$(CPU)-$(ARCH)/card \
 		 -I$(SRCDIR)/arch/all-$(ARCH)/card
 USER_INCLUDES += -I$(SRCDIR)/rom/card
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 #MM kernel-card : includes kernel-card-$(ARCH)-$(CPU)

--- a/rom/debug/mmakefile.src
+++ b/rom/debug/mmakefile.src
@ -8,7 +8,7 @@ FILES       := debug_init
 STATICFUNCS := kdofmt kgetchar kmaygetchar kputstr _kprintf kvprintf

 USER_CPPFLAGS := -DHOST_OS_$(FAMILY) -D__UTILITY_NOLIBBASE__ -DNO_INLINE_STDARG
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 -include $(SRCDIR)/arch/all-$(ARCH)/debug/make.opts
 -include $(SRCDIR)/arch/$(CPU)-$(ARCH)/debug/make.opts
--- a/rom/devs/ahci/mmakefile.src
+++ b/rom/devs/ahci/mmakefile.src
@ -42,7 +42,7 @@ USER_CPPFLAGS += -D__BSD_VISIBLE
 # Enable AROS debugging
 #USER_CPPFLAGS += -DDEBUG=1

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-ahci \
  modname=ahci modtype=device \
--- a/rom/devs/ata/mmakefile.src
+++ b/rom/devs/ata/mmakefile.src
@ -16,7 +16,7 @@ INCLUDE_FILES := $(call WILDCARD, include/hardware/*.h)
 INCLUDE_FILES := $(call WILDCARD, include/hidd/*.h)
 %copy_includes path=hidd dir=include/hidd sdk=private

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 ATA_DEVICEFILES := \
    ata_init \
--- a/rom/devs/console/mmakefile.src
+++ b/rom/devs/console/mmakefile.src
@ -12,7 +12,7 @@ USER_CPPFLAGS := \
               -D__INTUITION_NOLIBBASE__ \
               -D__KEYMAP_NOLIBBASE__ \
               -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-console \
  modname=console modtype=device \
--- a/rom/devs/gameport/mmakefile.src
+++ b/rom/devs/gameport/mmakefile.src
@ -8,7 +8,7 @@ USER_INCLUDES := -I$(SRCDIR)/rom/devs
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
               -D__OOP_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-gameport \
  modname=gameport modtype=device \
--- a/rom/devs/input/mmakefile.src
+++ b/rom/devs/input/mmakefile.src
@ -12,7 +12,7 @@ FILES := processevents support
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
               -D__GRAPHICS_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-input \
  modname=input modtype=device \
--- a/rom/devs/keyboard/mmakefile.src
+++ b/rom/devs/keyboard/mmakefile.src
@ -8,7 +8,7 @@ USER_INCLUDES := -I$(SRCDIR)/rom/devs
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
               -D__OOP_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-keyboard \
  modname=keyboard modtype=device \
--- a/rom/devs/nvme/mmakefile.src
+++ b/rom/devs/nvme/mmakefile.src
@ -30,7 +30,7 @@ USER_CPPFLAGS := \
 # Enable AROS debugging
 #USER_CPPFLAGS += -DDEBUG=1

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-nvme \
  modname=nvme modtype=device \
--- a/rom/devs/scsi/mmakefile.src
+++ b/rom/devs/scsi/mmakefile.src
@ -14,7 +14,7 @@ INCLUDE_FILES := $(call WILDCARD, include/hardware/*.h)
 INCLUDE_FILES := $(call WILDCARD, include/hidd/*.h)
 %copy_includes path=hidd dir=include/hidd sdk=private

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 SCSI_DEVICEFILES :=             \
    scsi_init                   \
--- a/rom/devs/sdcard/mmakefile.src
+++ b/rom/devs/sdcard/mmakefile.src
@ -3,7 +3,7 @@ include $(SRCDIR)/config/aros.cfg

 USER_INCLUDES := -I $(SRCDIR)/$(CURDIR)
 USER_CPPFLAGS := -D__TIMER_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 SDCARDFILES = \
    sdcard_init \
--- a/rom/devs/trackdisk/mmakefile.src
+++ b/rom/devs/trackdisk/mmakefile.src
@ -7,7 +7,7 @@ include $(SRCDIR)/config/aros.cfg
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG
 USER_INCLUDES := -I$(TOP)/rom/devs
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-devs-trackdisk \
  modname=trackdisk modtype=device \
--- a/rom/dos/mmakefile.src
+++ b/rom/dos/mmakefile.src
@ -14,7 +14,7 @@ DOS_CPPFLAGS := \
 ifneq ($(REPOTYPE),)
    DOS_CPPFLAGS  += -DREPOTYPE=\"$(REPOTYPE)\" -DREPOREVISION=\"$(REPOREVISION)\" -DREPOID=\"$(REPOID)\"
 endif
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static
 ifeq ($(AROS_TARGET_CPU),m68k)
 # Make sure we optimize this code for size on m68k..
 OPTIMIZATION_CFLAGS := -Os
--- a/rom/dosboot/mmakefile.src
+++ b/rom/dosboot/mmakefile.src
@ -15,7 +15,7 @@ USER_CPPFLAGS := \
               -D__OOP_NOATTRBASES__ \
               -D__OOP_NOMETHODBASES__
 USER_INCLUDES := -I$(SRCDIR)/rom/devs -I$(GENDIR)/$(CURDIR)/dosboot
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-dosboot \
  modname=dosboot modtype=resource \
--- a/rom/efi/mmakefile.src
+++ b/rom/efi/mmakefile.src
@ -4,7 +4,7 @@ include $(SRCDIR)/config/aros.cfg
 FILES := efi_init
 FUNCS := findconfigtable

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-efi modname=efi modtype=resource \
  files="$(FILES) $(FUNCS)" usesdks="private"
--- a/rom/expansion/mmakefile.src
+++ b/rom/expansion/mmakefile.src
@ -27,7 +27,7 @@ endif

 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-expansion \
  modname=expansion modtype=library version=$(VERSION) \
--- a/rom/filesys/CDVDFS/src/mmakefile.src
+++ b/rom/filesys/CDVDFS/src/mmakefile.src
@ -38,7 +38,7 @@ USER_CPPFLAGS += -DNDEBUG -DDEBUG=0

 USER_CPPFLAGS += \
               -DAROS_KERNEL
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-fs-cdvdfs \
    modname=cdrom modtype=handler \
--- a/rom/filesys/SFS/FS/mmakefile.src
+++ b/rom/filesys/SFS/FS/mmakefile.src
@ -19,7 +19,7 @@ FILES := adminspaces \
 	 req

 USER_CPPFLAGS := -DSFS_BE -DADATE="\"$(shell date '+%d.%m.%Y')\""
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-fs-sfs \
    modname=sfs modtype=handler \
--- a/rom/filesys/afs/mmakefile.src
+++ b/rom/filesys/afs/mmakefile.src
@ -22,7 +22,7 @@ USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
 	       -D__INTUITION_NOLIBBASE__ \
 	       -DADATE="\"$(shell date '+%d.%m.%Y')\""
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-fs-afs \
    modname=afs modtype=handler \
--- a/rom/filesys/cdfs/mmakefile.src
+++ b/rom/filesys/cdfs/mmakefile.src
@ -5,7 +5,7 @@ FILES := cdfs bcache iso9660

 USER_CPPFLAGS += -D__NOLIBBASE__ -DADATE="\"$(shell date '+%d.%m.%Y')\""
 #USER_CPPFLAGS += -DDEBUG=1
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-fs-cdfs \
    modname=cdfs modtype=handler \
--- a/rom/filesys/console_handler/mmakefile.src
+++ b/rom/filesys/console_handler/mmakefile.src
@ -12,7 +12,7 @@ USER_CPPFLAGS := \
               -D__UTILITY_NOLIBBASE__ \
               -D__GRAPHICS_NOLIBBASE__

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 #MM- kernel-fs-con : includes linklibs kernel-fs-con-linklib

--- a/rom/filesys/fat/mmakefile.src
+++ b/rom/filesys/fat/mmakefile.src
@ -3,7 +3,7 @@ include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -D__NOLIBBASE__

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES := cache direntry date disk fat file lock main names notify ops packet\
 support timer volume
--- a/rom/filesys/pfs3/fs/mmakefile.src
+++ b/rom/filesys/pfs3/fs/mmakefile.src
@ -67,7 +67,7 @@ USER_CPPFLAGS := \
    -DAROS_KERNEL $(PFS3_CFLAGS) -DMIN_LIB_VERSION=36 \
 	-DREVDATE="\"$(shell date '+%d.%m.%Y')\""

-USER_LDFLAGS += -nolibc -nosysbase -Wl,--defsym -Wl,SysBase=0x4
+USER_LDFLAGS += -noclibs -nosysbase -Wl,--defsym -Wl,SysBase=0x4

 %build_module mmake=kernel-fs-pfs3 \
    modname=pfs3 modtype=handler \
--- a/rom/graphics/mmakefile.src
+++ b/rom/graphics/mmakefile.src
@ -6,7 +6,7 @@ USER_CFLAGS :=  $(AROSROM_MODULE_CFLAGS)
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
 	       -D__OOP_NOMETHODBASES__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES	  := \
 	intregions \
--- a/rom/hidds/acpi/button/mmakefile.src
+++ b/rom/hidds/acpi/button/mmakefile.src
@ -11,7 +11,7 @@ USER_CFLAGS      := $(NOWARN_FLAGS)
 USER_CPPFLAGS      := -DAROS_USE_OOP \
                    -D__OOP_NOLIBBASE__ \
                    -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-hidd-acpibutton \
  modname=acpibutton modtype=hidd \
--- a/rom/hidds/ata_pci/mmakefile.src
+++ b/rom/hidds/ata_pci/mmakefile.src
@ -8,7 +8,7 @@ USER_CPPFLAGS := \
        -D__OOP_NOATTRBASES__

 #USER_CPPFLAGS += -DDEBUG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-hidd-pciata \
    modname=ata_pci modtype=hidd \
--- a/rom/hidds/base/bus/mmakefile.src
+++ b/rom/hidds/base/bus/mmakefile.src
@ -11,7 +11,7 @@ USER_CPPFLAGS := \
               -D__OOP_NOMETHODBASES__ \
               -D__OOP_NOATTRBASES__
 #USER_CPPFLAGS += -DDEBUG
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-hidd-bus \
    modname=bus modtype=hidd \
--- a/rom/hidds/base/storage/mmakefile.src
+++ b/rom/hidds/base/storage/mmakefile.src
@ -21,7 +21,7 @@ USER_CPPFLAGS := \
               -D__OOP_NOATTRBASES__ \
               -D__UTILITY_NOLIBBASE__
 #USER_CPPFLAGS += -DDEBUG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-hidd-storage \
  modname=storage modtype=hidd \
--- a/rom/hidds/base/system/mmakefile.src
+++ b/rom/hidds/base/system/mmakefile.src
@ -17,7 +17,7 @@ USER_CPPFLAGS := \
               -D__OOP_NOATTRBASES__ \
               -D__UTILITY_NOLIBBASE__
 #USER_CPPFLAGS += -DDEBUG
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-hidd-system \
  modname=system modtype=hidd \
--- a/rom/hidds/gfx/mmakefile.src
+++ b/rom/hidds/gfx/mmakefile.src
@ -26,7 +26,7 @@ USER_CPPFLAGS:= -DAROS_USE_OOP \
                    -D__GRAPHICS_NOLIBBASE__ \
                    -D__OOP_NOLIBBASE__ \
                    -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-hidd-gfx \
  modname=gfx modtype=hidd \
--- a/rom/hidds/hidd/mmakefile.src
+++ b/rom/hidds/hidd/mmakefile.src
@ -6,7 +6,7 @@ CLASSES := hiddclass hwclass hwroot
 USER_CPPFLAGS := -DAROS_USE_OOP \
               -D__OOP_NOLIBBASE__ \
               -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 # Allow to override private headers
 USER_INCLUDES := -I$(SRCDIR)/arch/$(CPU)-$(ARCH)/hidds/hidd	\
--- a/rom/hidds/kbd/mmakefile.src
+++ b/rom/hidds/kbd/mmakefile.src
@ -11,7 +11,7 @@ clean ::
 FILES	:= kbd_init kbdclass kbdsubsystem

 USER_CPPFLAGS += -D__OOP_NOLIBBASE__ -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-hidd-kbd \
    modname=keyboard modtype=hidd \
--- a/rom/hidds/mouse/mmakefile.src
+++ b/rom/hidds/mouse/mmakefile.src
@ -7,7 +7,7 @@ INCLUDE_FILES := $(call WILDCARD, include/*.h)
 FILES := mouse_init driverdata mouseclass subsystem

 USER_CPPFLAGS += -D__OOP_NOLIBBASE__ -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-hidd-mouse \
    modname=mouse modtype=hidd \
--- a/rom/hidds/pci/mmakefile.src
+++ b/rom/hidds/pci/mmakefile.src
@ -4,7 +4,7 @@ include $(SRCDIR)/config/aros.cfg
 USER_INCLUDES := -I.

 USER_CPPFLAGS := -D__KERNEL__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES	:= pci_init pcidriverclass pcideviceclass pciclass pciutil

--- a/rom/hidds/scsi/wd33c93/mmakefile.src
+++ b/rom/hidds/scsi/wd33c93/mmakefile.src
@ -9,7 +9,7 @@ FILES := \

 USER_CPPFLAGS := -D__OOP_NOMETHODBASES__ -D__OOP_NOATTRBASES__
 #USER_CPPFLAGS += -DDEBUG
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-hidd-scsiwd33c93 \
    modname=scsi_wd33c93 modtype=hidd \
--- a/rom/hidds/serialmouse/mmakefile.src
+++ b/rom/hidds/serialmouse/mmakefile.src
@ -3,7 +3,7 @@ include $(SRCDIR)/config/aros.cfg

 FILES := startup mouseclass drv_serial

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-hidd-serialmouse \
  modname=serialmouse modtype=hidd \
--- a/rom/hyperlayers/mmakefile.src
+++ b/rom/hyperlayers/mmakefile.src
@ -6,7 +6,7 @@ USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
 	       -D__UTILITY_NOLIBBASE__ \
 	       -D__GRAPHICS_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES	  := basicfuncs createlayertaglist movelayerz

--- a/rom/intuition/mmakefile.src
+++ b/rom/intuition/mmakefile.src
@ -17,7 +17,7 @@ USER_CPPFLAGS := \
               -D__OOP_NOATTRBASES__ \
               -D__GRAPHICS_NOLIBBASE__ \
               -D__KEYMAP_NOLIBBASE__
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES := boolgadgets boopsigadgets buttongclass frameiclass frbuttonclass \
         gadgetclass gadgets imageclass inputhandler propgadgets propgclass \
--- a/rom/isapnp/mmakefile.src
+++ b/rom/isapnp/mmakefile.src
@ -4,7 +4,7 @@ FILES       := controller devices init pnp pnp_iterators pnp_structs end

 NOWARN_FLAGS := $(NOWARN_UNUSED) $(NOWARN_UNUSED_PARAMETER)
 USER_CFLAGS := -W -Wall -Wstrict-prototypes -fstrict-aliasing  $(NOWARN_FLAGS) -I$(GENDIR)/$(CURDIR)
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module_simple mmake=kernel-isapnp \
    modname=isapnp modtype=resource \
--- a/rom/keymap/mmakefile.src
+++ b/rom/keymap/mmakefile.src
@ -13,7 +13,7 @@ USER_CFLAGS := $(CFLAGS_NO_BUILTIN)
 USER_CPPFLAGS := \
               -DNO_INLINE_STDARG \
               -DUSE_EXEC_DEBUG
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 #MM kernel-keymap-includes : \
 #MM     kernel-exec-includes
--- a/rom/lddemon/mmakefile.src
+++ b/rom/lddemon/mmakefile.src
@ -6,7 +6,7 @@ INCLUDE_FILES := lddemon.h
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
               -D__DOS_NOLIBBASE__
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-lddemon \
  modname=lddemon modtype=resource \
--- a/rom/oop/mmakefile.src
+++ b/rom/oop/mmakefile.src
@ -30,7 +30,7 @@ USER_CPPFLAGS := \
               -DAROS_USE_OOP \
               -D__OOP_NOLIBBASE__ \
               -D__UTILITY_NOLIBBASE__
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 #MM kernel-oop-includes : \
 #MM     kernel-exec-includes \
--- a/rom/partition/mmakefile.src
+++ b/rom/partition/mmakefile.src
@ -45,7 +45,7 @@ FUNCS := \
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG \
 	       -DDEBUG=0
-USER_LDFLAGS  := -nolibc -lstdc.static
+USER_LDFLAGS  := -noclibs -lstdc.static

 %build_module mmake=kernel-partition \
    modname=partition modtype=library \
--- a/rom/processor/mmakefile.src
+++ b/rom/processor/mmakefile.src
@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg
 #MM kernel-processor-kobj: includes
 #MM kernel-processor: includes

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 %build_module mmake=kernel-processor modname=processor modtype=resource \
    version=$(AROS_TARGET_PLATFORM) files="init getcpuinfo" \
--- a/rom/task/mmakefile.src
+++ b/rom/task/mmakefile.src
@ -10,7 +10,7 @@ INCLUDE_FILES := task.h
 USER_CPPFLAGS := \
               -DUSE_EXEC_DEBUG
 #USER_CPPFLAGS += -DDEBUG=1
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs
 USER_INCLUDES += $(PRIV_EXEC_INCLUDES)

 # Allow to add architecture-specific options
--- a/rom/timer/mmakefile.src
+++ b/rom/timer/mmakefile.src
@ -24,7 +24,7 @@ FUNCS := abortio addtime beginio cmptime getsystime subtime readeclock getuptime

 USER_CPPFLAGS += \
               -DUSE_EXEC_DEBUG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module mmake=kernel-timer \
  modname=timer modtype=device version=$(AROS_TARGET_PLATFORM) \
--- a/rom/usb/classes/arosx/mmakefile.src
+++ b/rom/usb/classes/arosx/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES :=    arosx.class arosx.class.config.gui arosx.library debug

--- a/rom/usb/classes/asixeth/mmakefile.src
+++ b/rom/usb/classes/asixeth/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    asixeth.class dev debug

--- a/rom/usb/classes/audio/mmakefile.src
+++ b/rom/usb/classes/audio/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    usbaudio.class numtostr debug

--- a/rom/usb/classes/bluetooth/mmakefile.src
+++ b/rom/usb/classes/bluetooth/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    bluetooth.class dev debug

--- a/rom/usb/classes/bootkeyboard/mmakefile.src
+++ b/rom/usb/classes/bootkeyboard/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    bootkeyboard.class debug

--- a/rom/usb/classes/bootmouse/mmakefile.src
+++ b/rom/usb/classes/bootmouse/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    bootmouse.class debug

--- a/rom/usb/classes/camdmidi/camd/mmakefile.src
+++ b/rom/usb/classes/camdmidi/camd/mmakefile.src
@ -6,7 +6,7 @@ CAMDOBJDIR := $(OBJDIR)/../camdusbmidi/arch

 SRCFILE := poseidonusb

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs
 USER_INCLUDES := -I$(OBJDIR)/../include -iquote $(SRCDIR)/$(CURDIR)/..

 #MM kernel-usb-classes-camdusbmidi-object : kernel-usb-classes-camd-usbmidi-includes
--- a/rom/usb/classes/camdmidi/mmakefile.src
+++ b/rom/usb/classes/camdmidi/mmakefile.src
@ -10,7 +10,7 @@ include $(SRCDIR)/config/aros.cfg
 #MM- kernel-usb-classes-camdusbmidi-ppc : kernel-usb-classes-camd-usbmidi

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES := camdusbmidi.class debug

--- a/rom/usb/classes/cdcacm/mmakefile.src
+++ b/rom/usb/classes/cdcacm/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    cdcacm.class dev debug

--- a/rom/usb/classes/davicometh/mmakefile.src
+++ b/rom/usb/classes/davicometh/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    dm9601eth.class dev debug

--- a/rom/usb/classes/dfu/mmakefile.src
+++ b/rom/usb/classes/dfu/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    dfu.class debug

--- a/rom/usb/classes/egalaxtouch/mmakefile.src
+++ b/rom/usb/classes/egalaxtouch/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    egalaxtouch.class debug

--- a/rom/usb/classes/ethwrap/mmakefile.src
+++ b/rom/usb/classes/ethwrap/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    ethwrap.class dev debug

--- a/rom/usb/classes/felsunxi/mmakefile.src
+++ b/rom/usb/classes/felsunxi/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FUNCS := class_Library class_DoMethodA class_GetAttrsA class_SetAttrsA class_DeviceBinding class_FELSunxiTask

--- a/rom/usb/classes/hid/mmakefile.src
+++ b/rom/usb/classes/hid/mmakefile.src
@ -8,7 +8,7 @@ FILES :=    hid.class hid.gui hidctrl.gui numtostr debug
 #MM				classes-zune-classes-nlistview-class

 USER_CPPFLAGS := -DUSE_NLIST -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 %build_module_library mmake=kernel-usb-classes-hid \
    modname=hid modtype=usbclass modsuffix="class" \
--- a/rom/usb/classes/hub/mmakefile.src
+++ b/rom/usb/classes/hub/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    hub.class debug

--- a/rom/usb/classes/hubss/mmakefile.src
+++ b/rom/usb/classes/hubss/mmakefile.src
@ -1,7 +1,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_LDFLAGS := -nolibc
+USER_LDFLAGS := -noclibs

 FILES :=    hubss_class

--- a/rom/usb/classes/massstorage/mmakefile.src
+++ b/rom/usb/classes/massstorage/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    massstorage.class dev debug partitions

--- a/rom/usb/classes/moschipeth/mmakefile.src
+++ b/rom/usb/classes/moschipeth/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    moschipeth.class dev debug

--- a/rom/usb/classes/palmpda/mmakefile.src
+++ b/rom/usb/classes/palmpda/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    palmpda.class dev debug

--- a/rom/usb/classes/pegasuseth/mmakefile.src
+++ b/rom/usb/classes/pegasuseth/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    pegasus.class dev debug

--- a/rom/usb/classes/printer/mmakefile.src
+++ b/rom/usb/classes/printer/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    printer.class dev debug

--- a/rom/usb/classes/ptp/mmakefile.src
+++ b/rom/usb/classes/ptp/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    ptp.class numtostr debug

--- a/rom/usb/classes/rawwrap/mmakefile.src
+++ b/rom/usb/classes/rawwrap/mmakefile.src
@ -2,7 +2,7 @@
 include $(SRCDIR)/config/aros.cfg

 USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG
-USER_LDFLAGS := -nolibc -lstdc.static
+USER_LDFLAGS := -noclibs -lstdc.static

 FILES :=    rawwrap.class dev debug

--- a/Show More
+++ b/Show More