Reorganize Group names in build system for clarity and IDE integration #10923

2025-11-16 04:24:33 +00:00 · 2025-11-16 11:40:53 +08:00
parent ae2a5758bc
commit 30e1e5e9dc
84 changed files with 84 additions and 84 deletions
--- a/components/drivers/ktime/SConscript
+++ b/components/drivers/ktime/SConscript
@@ -19,6 +19,6 @@ if rtconfig.PLATFORM in ['gcc', 'armclang']:
 elif rtconfig.PLATFORM in ['armcc']:
    LOCAL_CCFLAGS += ' --c99 --gnu'

-group = DefineGroup('ktime', src, depend=['RT_USING_KTIME'], CPPPATH=CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
+group = DefineGroup('DeviceDrivers', src, depend=['RT_USING_KTIME'], CPPPATH=CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS)

 Return('group')
--- a/components/drivers/usb/cherryusb/SConscript
+++ b/components/drivers/usb/cherryusb/SConscript
@@ -320,7 +320,7 @@ if GetDepend(['RT_CHERRYUSB_HOST']):
 src += Glob('platform/rtthread/usb_msh.c')
 src += Glob('platform/rtthread/usb_check.c')

-group = DefineGroup('CherryUSB', src, depend = ['RT_USING_CHERRYUSB'], LIBS = LIBS, LIBPATH=LIBPATH, CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('UsbStack', src, depend = ['RT_USING_CHERRYUSB'], LIBS = LIBS, LIBPATH=LIBPATH, CPPPATH = path, CPPDEFINES = CPPDEFINES)

 Return('group')

--- a/components/libc/compilers/armlibc/SConscript
+++ b/components/libc/compilers/armlibc/SConscript
@@ -7,6 +7,6 @@ group = []
 if rtconfig.PLATFORM in ['armcc', 'armclang']:
    CPPDEFINES = ['RT_USING_ARMLIBC', 'RT_USING_LIBC', '__STDC_LIMIT_MACROS']
    AddDepend(['RT_USING_ARMLIBC', 'RT_USING_LIBC'])
-    group = DefineGroup('Compiler', src, depend = [''], CPPDEFINES = CPPDEFINES)
+    group = DefineGroup('Libc', src, depend = [''], CPPDEFINES = CPPDEFINES)

 Return('group')
--- a/components/libc/compilers/common/SConscript
+++ b/components/libc/compilers/common/SConscript
@@ -16,7 +16,7 @@ elif rtconfig.PLATFORM in ['gcc'] and rtconfig.CPU in ['posix']:

 src += Glob('*.c')

-group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)

 list = os.listdir(cwd)
 for item in list:
--- a/components/libc/compilers/common/extension/SConscript
+++ b/components/libc/compilers/common/extension/SConscript
@@ -10,7 +10,7 @@ group = []
 src += Glob('*.c')

 if rtconfig.PLATFORM not in ['gcc', 'llvm-arm']:
-    group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH)
+    group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)

 list = os.listdir(cwd)
 for d in list:
--- a/components/libc/compilers/common/extension/fcntl/msvc/SConscript
+++ b/components/libc/compilers/common/extension/fcntl/msvc/SConscript
@@ -7,5 +7,5 @@ CPPPATH = [cwd]
 group = []

 if rtconfig.CROSS_TOOL == 'msvc':
-    group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH)
+    group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
--- a/components/libc/compilers/common/extension/fcntl/octal/SConscript
+++ b/components/libc/compilers/common/extension/fcntl/octal/SConscript
@@ -7,5 +7,5 @@ CPPPATH = [cwd]
 group = []

 if rtconfig.PLATFORM in ['armcc', 'armclang', 'iccarm']:
-    group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH)
+    group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
--- a/components/libc/compilers/dlib/SConscript
+++ b/components/libc/compilers/dlib/SConscript
@@ -17,6 +17,6 @@ if rtconfig.PLATFORM in ['iccarm']:
        if iar_version != LooseVersion("0.0") and iar_version < LooseVersion("8.20.1"):
            CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT']

-    group = DefineGroup('Compiler', src, depend = [''], CPPDEFINES = CPPDEFINES)
+    group = DefineGroup('Libc', src, depend = [''], CPPDEFINES = CPPDEFINES)

 Return('group')
--- a/components/libc/compilers/musl/SConscript
+++ b/components/libc/compilers/musl/SConscript
@@ -19,7 +19,7 @@ if musllibc_version:
    LINKFLAGS = ' --specs=kernel.specs'
    AddDepend(['RT_USING_MUSLLIBC', 'RT_USING_LIBC'])

-    group = group + DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
+    group = group + DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS, CPPDEFINES = CPPDEFINES, LIBS = LIBS)

    list = os.listdir(cwd)
    for d in list:
--- a/components/libc/compilers/newlib/SConscript
+++ b/components/libc/compilers/newlib/SConscript
@@ -18,7 +18,7 @@ if newlib_version and not GetDepend('RT_USING_EXTERNAL_LIBC'):
    LIBS = ['c', 'm'] # link libc and libm
    AddDepend(['RT_USING_NEWLIBC', 'RT_USING_LIBC'])

-    group = group + DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
+    group = group + DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)

    list = os.listdir(cwd)
    for d in list:
--- a/components/libc/compilers/picolibc/SConscript
+++ b/components/libc/compilers/picolibc/SConscript
@@ -24,7 +24,7 @@ if picolibc_version and not GetDepend('RT_USING_EXTERNAL_LIBC'):
    # LIBS = ['c', 'm'] # link libc and libm
    AddDepend(['RT_USING_PICOLIBC', 'RT_USING_LIBC'])

-    group = group + DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)#, LIBS = LIBS)
+    group = group + DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)#, LIBS = LIBS)

    list = os.listdir(cwd)
    for d in list:
--- a/components/libc/posix/delay/SConscript
+++ b/components/libc/posix/delay/SConscript
@@ -6,6 +6,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c')
 CPPPATH = [cwd]

-group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_DELAY'], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_DELAY'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/io/aio/SConscript
+++ b/components/libc/posix/io/aio/SConscript
@@ -6,6 +6,6 @@ cwd     = GetCurrentDir()
 src     = ['aio.c']
 CPPPATH = [cwd]

-group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_AIO'], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_AIO'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/io/epoll/SConscript
+++ b/components/libc/posix/io/epoll/SConscript
@@ -9,6 +9,6 @@ CPPPATH = [cwd]
 if GetDepend('RT_USING_POSIX_EPOLL'):
    src += ['epoll.c']

-group = DefineGroup('POSIX', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/io/eventfd/SConscript
+++ b/components/libc/posix/io/eventfd/SConscript
@@ -9,6 +9,6 @@ CPPPATH = [cwd]
 if GetDepend('RT_USING_POSIX_EVENTFD'):
    src += ['eventfd.c']

-group = DefineGroup('POSIX', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/io/mman/SConscript
+++ b/components/libc/posix/io/mman/SConscript
@@ -6,6 +6,6 @@ cwd     = GetCurrentDir()
 src     = ['mman.c']
 CPPPATH = [cwd]

-group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_MMAN'], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_MMAN'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/io/poll/SConscript
+++ b/components/libc/posix/io/poll/SConscript
@@ -12,6 +12,6 @@ if GetDepend('RT_USING_POSIX_POLL'):
 if GetDepend('RT_USING_POSIX_SELECT'):
    src += ['select.c']

-group = DefineGroup('POSIX', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/io/signalfd/SConscript
+++ b/components/libc/posix/io/signalfd/SConscript
@@ -9,6 +9,6 @@ CPPPATH = [cwd]
 if GetDepend('RT_USING_POSIX_SIGNALFD'):
    src += ['signalfd.c']

-group = DefineGroup('POSIX', src, depend = ['RT_USING_SMART','RT_USING_POSIX_SIGNALFD'], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = ['RT_USING_SMART','RT_USING_POSIX_SIGNALFD'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/io/stdio/SConscript
+++ b/components/libc/posix/io/stdio/SConscript
@@ -1,6 +1,6 @@
 from building import *

 src     = ['stdio.c']
-group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_STDIO'], CPPPATH = [GetCurrentDir()])
+group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_STDIO'], CPPPATH = [GetCurrentDir()])

 Return('group')
--- a/components/libc/posix/io/termios/SConscript
+++ b/components/libc/posix/io/termios/SConscript
@@ -6,6 +6,6 @@ cwd = GetCurrentDir()
 src = ['termios.c']
 CPPPATH = [cwd]

-group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_TERMIOS'], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_TERMIOS'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/io/timerfd/SConscript
+++ b/components/libc/posix/io/timerfd/SConscript
@@ -9,6 +9,6 @@ CPPPATH = [cwd]
 if GetDepend('RT_USING_DFS'):
    src += ['timerfd.c']

-group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_TIMERFD'], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_TIMERFD'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/ipc/SConscript
+++ b/components/libc/posix/ipc/SConscript
@@ -15,6 +15,6 @@ if GetDepend(['RT_USING_POSIX_MESSAGE_QUEUE', 'RT_USING_DFS_MQUEUE']):
 if GetDepend('RT_USING_POSIX_MESSAGE_SEMAPHORE'):
    src += ['semaphore.c']

-group = DefineGroup('POSIX', src, depend = [''], CPPPATH = inc)
+group = DefineGroup('Libc', src, depend = [''], CPPPATH = inc)

 Return('group')
--- a/components/libc/posix/libdl/SConscript
+++ b/components/libc/posix/libdl/SConscript
@@ -7,6 +7,6 @@ group   = []
 CPPPATH = [cwd]

 if rtconfig.PLATFORM in ['gcc']:
-    group = DefineGroup('POSIX', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH)
+    group = DefineGroup('Libc', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/pthreads/SConscript
+++ b/components/libc/posix/pthreads/SConscript
@@ -4,6 +4,6 @@ cwd        = GetCurrentDir()
 src        = Glob('*.c')
 CPPPATH    = [cwd]

-group = DefineGroup('POSIX', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/libc/posix/signal/SConscript
+++ b/components/libc/posix/signal/SConscript
@@ -6,7 +6,7 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]

-group = DefineGroup('POSIX', src,
+group = DefineGroup('Libc', src,
    depend = ['RT_USING_SIGNALS', 'RT_USING_PTHREADS'],
    CPPPATH = CPPPATH)

--- a/components/libc/posix/tls/SConscript
+++ b/components/libc/posix/tls/SConscript
@@ -4,6 +4,6 @@ cwd        = GetCurrentDir()
 src        = Glob('*.c')
 CPPPATH    = [cwd]

-group = DefineGroup('POSIX', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH)
+group = DefineGroup('Libc', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH)

 Return('group')
--- a/components/mm/SConscript
+++ b/components/mm/SConscript
@@ -11,6 +11,6 @@ if GetDepend('ARCH_ARM_CORTEX_A') or GetDepend('ARCH_ARMV8') or GetDepend('ARCH_

    CPPPATH = [cwd]

-    group = DefineGroup('mm', src, depend = ['ARCH_MM_MMU'], CPPPATH = CPPPATH)
+    group = DefineGroup('Memm', src, depend = ['ARCH_MM_MMU'], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/aarch64/common/SConscript
+++ b/libcpu/aarch64/common/SConscript
@@ -24,7 +24,7 @@ if GetDepend('RT_USING_PIC') == True:
 if GetDepend('RT_HWTIMER_ARM_ARCH') == True:
    SrcRemove(src, ['gtimer.c'])

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 # build for sub-directory
 list = os.listdir(cwd)
--- a/libcpu/aarch64/cortex-a/SConscript
+++ b/libcpu/aarch64/cortex-a/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arc/common/SConscript
+++ b/libcpu/arc/common/SConscript
@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arc/em/SConscript
+++ b/libcpu/arc/em/SConscript
@@ -10,6 +10,6 @@ CPPPATH = [cwd]

 src += Glob('*.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/AT91SAM7S/SConscript
+++ b/libcpu/arm/AT91SAM7S/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/AT91SAM7X/SConscript
+++ b/libcpu/arm/AT91SAM7X/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/am335x/SConscript
+++ b/libcpu/arm/am335x/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/arm926/SConscript
+++ b/libcpu/arm/arm926/SConscript
@@ -20,6 +20,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)

 Return('group')
--- a/libcpu/arm/armv6/SConscript
+++ b/libcpu/arm/armv6/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/common/SConscript
+++ b/libcpu/arm/common/SConscript
@@ -21,6 +21,6 @@ if rtconfig.PLATFORM in ['iccarm']:
 if not GetDepend('RT_USING_HW_ATOMIC'):
    SrcRemove(src, 'atomic_arm.c')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-a/SConscript
+++ b/libcpu/arm/cortex-a/SConscript
@@ -39,6 +39,6 @@ if rtconfig.PLATFORM in ['iccarm']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-m0/SConscript
+++ b/libcpu/arm/cortex-m0/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-m23/SConscript
+++ b/libcpu/arm/cortex-m23/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-m3/SConscript
+++ b/libcpu/arm/cortex-m3/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-m33/SConscript
+++ b/libcpu/arm/cortex-m33/SConscript
@@ -21,6 +21,6 @@ if rtconfig.PLATFORM in ['iccarm']:
 if not GetDepend('RT_USING_MEM_PROTECTION') and not GetDepend('RT_USING_HW_STACK_GUARD'):
    SrcRemove(src, 'mpu.c')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-m4/SConscript
+++ b/libcpu/arm/cortex-m4/SConscript
@@ -21,6 +21,6 @@ if rtconfig.PLATFORM in ['gcc', 'llvm-arm']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-m7/SConscript
+++ b/libcpu/arm/cortex-m7/SConscript
@@ -21,6 +21,6 @@ if rtconfig.PLATFORM in ['iccarm']:
 if not GetDepend('RT_USING_MEM_PROTECTION') and not GetDepend('RT_USING_HW_STACK_GUARD'):
    SrcRemove(src, 'mpu.c')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-m85/SConscript
+++ b/libcpu/arm/cortex-m85/SConscript
@@ -11,6 +11,6 @@ CPPPATH = [cwd]
 if rtconfig.PLATFORM in ['gcc', 'armclang', 'llvm-arm']:
    src += Glob('*context_gcc.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/cortex-r4/SConscript
+++ b/libcpu/arm/cortex-r4/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/dm36x/SConscript
+++ b/libcpu/arm/dm36x/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/lpc214x/SConscript
+++ b/libcpu/arm/lpc214x/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/lpc24xx/SConscript
+++ b/libcpu/arm/lpc24xx/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/s3c24x0/SConscript
+++ b/libcpu/arm/s3c24x0/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/s3c44b0/SConscript
+++ b/libcpu/arm/s3c44b0/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/sep4020/SConscript
+++ b/libcpu/arm/sep4020/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/arm/zynqmp-r5/SConscript
+++ b/libcpu/arm/zynqmp-r5/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']:
 if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/avr32/uc3/SConscript
+++ b/libcpu/avr32/uc3/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/blackfin/bf53x/SConscript
+++ b/libcpu/blackfin/bf53x/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_vdsp.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/c-sky/ck802/SConscript
+++ b/libcpu/c-sky/ck802/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/c-sky/common/SConscript
+++ b/libcpu/c-sky/common/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/ia32/SConscript
+++ b/libcpu/ia32/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/m16c/m16c62p/SConscript
+++ b/libcpu/m16c/m16c62p/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/mips/common/SConscript
+++ b/libcpu/mips/common/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/mips/gs232/SConscript
+++ b/libcpu/mips/gs232/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/mips/gs264/SConscript
+++ b/libcpu/mips/gs264/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/mips/pic32/SConscript
+++ b/libcpu/mips/pic32/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/nios/nios_ii/SConscript
+++ b/libcpu/nios/nios_ii/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/ppc/common/SConscript
+++ b/libcpu/ppc/common/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/ppc/ppc405/SConscript
+++ b/libcpu/ppc/ppc405/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/risc-v/common/SConscript
+++ b/libcpu/risc-v/common/SConscript
@@ -10,6 +10,6 @@ ASFLAGS = ' -I ' + cwd
 if not GetDepend('RT_USING_HW_ATOMIC'):
    SrcRemove(src, 'atomic_riscv.c')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)

 Return('group')
--- a/libcpu/risc-v/common64/SConscript
+++ b/libcpu/risc-v/common64/SConscript
@@ -7,6 +7,6 @@ CPPPATH = [cwd]
 if not GetDepend('ARCH_USING_ASID'):
    SrcRemove(src, ['asid.c'])

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/risc-v/rv64/SConscript
+++ b/libcpu/risc-v/rv64/SConscript
@@ -7,6 +7,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ' -I ' + cwd

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)

 Return('group')
--- a/libcpu/risc-v/t-head/c906/SConscript
+++ b/libcpu/risc-v/t-head/c906/SConscript
@@ -8,6 +8,6 @@ CPPPATH = [cwd]
 if not GetDepend('ARCH_USING_ASID'):
    SrcRemove(src, ['asid.c'])

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/risc-v/t-head/c908/SConscript
+++ b/libcpu/risc-v/t-head/c908/SConscript
@@ -5,6 +5,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/risc-v/vector/SConscript
+++ b/libcpu/risc-v/vector/SConscript
@@ -7,6 +7,6 @@ CPPPATH = []

 CPPPATH += [cwd + '/rvv-1.0']

-group = DefineGroup('libcpu', src, depend = ['ARCH_RISCV_VECTOR'], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = ['ARCH_RISCV_VECTOR'], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/risc-v/virt64/SConscript
+++ b/libcpu/risc-v/virt64/SConscript
@@ -5,6 +5,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/rx/SConscript
+++ b/libcpu/rx/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_iar.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/sim/posix/SConscript
+++ b/libcpu/sim/posix/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/sim/win32/SConscript
+++ b/libcpu/sim/win32/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/sparc-v8/bm3803/SConscript
+++ b/libcpu/sparc-v8/bm3803/SConscript
@@ -12,6 +12,6 @@ if rtconfig.PLATFORM in ['gcc']:
    src += Glob('*_init.S')
    src += Glob('*_gcc.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/sparc-v8/common/SConscript
+++ b/libcpu/sparc-v8/common/SConscript
@@ -12,6 +12,6 @@ if rtconfig.PLATFORM in ['gcc']:
    src += Glob('*_init.S')
    src += Glob('*_gcc.S')

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/ti-dsp/c28x/SConscript
+++ b/libcpu/ti-dsp/c28x/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.s')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/ti-dsp/c6x/SConscript
+++ b/libcpu/ti-dsp/c6x/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.asm')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/unicore32/sep6200/SConscript
+++ b/libcpu/unicore32/sep6200/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/v850/70f34/SConscript
+++ b/libcpu/v850/70f34/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/libcpu/xilinx/microblaze/SConscript
+++ b/libcpu/xilinx/microblaze/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]

-group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/src/klibc/SConscript
+++ b/src/klibc/SConscript
@@ -13,7 +13,7 @@ if not GetDepend(['RT_KLIBC_USING_LIBC_VSNPRINTF']):
 if not GetDepend(['RT_KLIBC_USING_LIBC_VSSCANF']):
    src += ['rt_vsscanf.c']

-group = DefineGroup('klibc', src, depend = [''])
+group = DefineGroup('Libc', src, depend = [''])

 list = os.listdir(cwd)
 for item in list: