Changeset 2733


Ignore:
Timestamp:
Jul 18, 2006, 3:19:37 AM (19 years ago)
Author:
bird
Message:

kNIX reorg in progress.

Location:
trunk/libc
Files:
1 added
1 edited
5 moved

Legend:

Unmodified
Added
Removed

  • trunk/libc/Makefile.kmk

    r2727 r2733  
    5151        $(TARGET_libc_fbsdlibc) \
    5252        $(TARGET_libc_glibc) \
    53         $(TARGET_libc_msun)
     53        $(TARGET_libc_msun) \
     54        $(TARGET_libc_kNIX)
    5455libc_SOURCES.os2 = \
    5556        $(TARGET_libc_libsocket) \
    56         $(TARGET_libc_libsyslog) \
    57         $(TARGET_libc_libc_sys)
     57        $(TARGET_libc_libsyslog)
    5858libc_SOURCES.win32 = $(TARGET_kNIX.nt)
    5959
    … …  
    6565        $(TARGET_libc_fbsdlibc_l) \
    6666        $(TARGET_libc_glibc_l) \
    67         $(TARGET_libc_msun_l)
     67        $(TARGET_libc_msun_l) \
     68        $(TARGET_libc_kNIX_l)
    6869libc_l_SOURCES.os2 = \
    6970        $(TARGET_libc_libsocket_l) \
    70         $(TARGET_libc_libsyslog_l) \
    71         $(TARGET_libc_libc_sys_l)
    72 libc_SOURCES.win32 = $(TARGET_kNIX.nt_l)
     71        $(TARGET_libc_libsyslog_l)
    7372endif
    7473
    … …  
    8079        $(TARGET_libc_fbsdlibc_p) \
    8180        $(TARGET_libc_glibc_p) \
    82         $(TARGET_libc_msun_p)
     81        $(TARGET_libc_msun_p) \
     82        $(TARGET_libc_kNIX_p)
    8383libc_p_SOURCES.os2 = \
    8484        $(TARGET_libc_libsocket_p) \
    8585        $(TARGET_libc_libsyslog_p)
    86         $(TARGET_libc_libc_p)
    87 libc_SOURCES.win32 = $(TARGET_kNIX.nt_p)
    8886endif
    8987
    … …  
    9896        $(TARGET_libc_fbsdlibc_asm) \
    9997        $(TARGET_libc_glibc_asm) \
    100         $(TARGET_libc_msun_asm)
    101 libc_asm_SOURCES.os2 = \
    102         $(TARGET_libc_libc_sys_asm)
     98        $(TARGET_libc_msun_asm) \
     99        $(TARGET_libc_kNIX_asm)
    103100
    104101ifdef CFG_LIBC_LOGSTRICT_LIBS
    … …  
    109106        $(TARGET_libc_fbsdlibc_asm_l) \
    110107        $(TARGET_libc_glibc_asm_l) \
    111         $(TARGET_libc_msun_asm_l)
    112 libc_asm_l_SOURCES.os2 = \
    113         $(TARGET_libc_libc_sys_asm_l)
     108        $(TARGET_libc_msun_asm_l) \
     109        $(TARGET_libc_kNIX_asm_l)
    114110endif
    115111
    … …  
    121117        $(TARGET_libc_fbsdlibc_asm_p) \
    122118        $(TARGET_libc_glibc_asm_p) \
    123         $(TARGET_libc_msun_asm_p)
    124 libc_asm_p_SOURCES.os2 = \
    125         $(TARGET_libc_libc_sys_asm_p)
     119        $(TARGET_libc_msun_asm_p) \
     120        $(TARGET_libc_kNIX_asm_p)
    126121endif
    127122

  • trunk/libc/src/kNIX/Makefile.kmk

    r2732 r2733  
    2929SUB_DEPTH = ../..
    3030include $(PATH_KBUILD)/subheader.kmk
    31 ifeq ($(BUILD_TARGET),os2)
    32 
    33 LIBRARIES += libc_libc_sys
    34 
    35 libc_libc_sys_TEMPLATE = libcsub
    36 libc_libc_sys_SOURCES = \
    37     $(PATH_LIBC_SRC)/kNIX.os2/brk.c \
    38     $(PATH_LIBC_SRC)/kNIX.os2/b_dir.c \
    39     $(PATH_LIBC_SRC)/kNIX.os2/b_fsDirChangeRoot.c \
    40     $(PATH_LIBC_SRC)/kNIX.os2/b_fsDirCreate.c \
    41     $(PATH_LIBC_SRC)/kNIX.os2/b_fsDirCurrentGet.c \
    42     $(PATH_LIBC_SRC)/kNIX.os2/b_fsDirCurrentSet.c \
    43     $(PATH_LIBC_SRC)/kNIX.os2/b_fsDirCurrentSetFH.c \
    44     $(PATH_LIBC_SRC)/kNIX.os2/b_fsDirRemove.c \
    45     $(PATH_LIBC_SRC)/kNIX.os2/b_fsDriveDefaultGet.c \
    46     $(PATH_LIBC_SRC)/kNIX.os2/b_fsDriveDefaultSet.c \
    47     $(PATH_LIBC_SRC)/kNIX.os2/b_fsFileModeSet.c \
    48     $(PATH_LIBC_SRC)/kNIX.os2/b_fsFileModeSetFH.c \
    49     $(PATH_LIBC_SRC)/kNIX.os2/b_fsFileStat.c \
    50     $(PATH_LIBC_SRC)/kNIX.os2/b_fsFileStatFH.c \
    51     $(PATH_LIBC_SRC)/kNIX.os2/b_fsFileTimesSet.c \
    52     $(PATH_LIBC_SRC)/kNIX.os2/b_fsFileTimesSetFH.c \
    53     $(PATH_LIBC_SRC)/kNIX.os2/b_fsNativeFileModeSet.c \
    54     $(PATH_LIBC_SRC)/kNIX.os2/b_fsNativeFileStat.c \
    55     $(PATH_LIBC_SRC)/kNIX.os2/b_fsNativeFileTimesSet.c \
    56     $(PATH_LIBC_SRC)/kNIX.os2/b_fsPathResolve.c \
    57     $(PATH_LIBC_SRC)/kNIX.os2/b_fsRename.c \
    58     $(PATH_LIBC_SRC)/kNIX.os2/b_fsStat.c \
    59     $(PATH_LIBC_SRC)/kNIX.os2/b_fsSymlinkCreate.c \
    60     $(PATH_LIBC_SRC)/kNIX.os2/b_fsSymlinkModeSet.c \
    61     $(PATH_LIBC_SRC)/kNIX.os2/b_fsSymlinkRead.c \
    62     $(PATH_LIBC_SRC)/kNIX.os2/b_fsSymlinkStat.c \
    63     $(PATH_LIBC_SRC)/kNIX.os2/b_fsSymlinkTimesSet.c \
    64     $(PATH_LIBC_SRC)/kNIX.os2/b_fsSync.c \
    65     $(PATH_LIBC_SRC)/kNIX.os2/b_fsUnlink.c \
    66     $(PATH_LIBC_SRC)/kNIX.os2/b_ioDirGetEntries.c \
    67     $(PATH_LIBC_SRC)/kNIX.os2/b_ioFHToPath.c \
    68     $(PATH_LIBC_SRC)/kNIX.os2/b_ioFileControl.c \
    69     $(PATH_LIBC_SRC)/kNIX.os2/b_ioFileOpen.c \
    70     $(PATH_LIBC_SRC)/kNIX.os2/b_ioFileSizeSet.c \
    71     $(PATH_LIBC_SRC)/kNIX.os2/b_ioSeek.c \
    72     $(PATH_LIBC_SRC)/kNIX.os2/b_ldrClose.c \
    73     $(PATH_LIBC_SRC)/kNIX.os2/b_ldrOpen.c \
    74     $(PATH_LIBC_SRC)/kNIX.os2/b_ldrSymbol.c \
    75     $(PATH_LIBC_SRC)/kNIX.os2/b_miscLoadAvg.c \
    76     $(PATH_LIBC_SRC)/kNIX.os2/b_mmanProtect.c \
    77     $(PATH_LIBC_SRC)/kNIX.os2/b_nativeSymlinkCreate.c \
    78     $(PATH_LIBC_SRC)/kNIX.os2/b_panic.c \
    79     $(PATH_LIBC_SRC)/kNIX.os2/b_processCredentials.c \
    80     $(PATH_LIBC_SRC)/kNIX.os2/b_processGetPriority.c \
    81     $(PATH_LIBC_SRC)/kNIX.os2/b_processSetPriority.c \
    82     $(PATH_LIBC_SRC)/kNIX.os2/b_processWait.c \
    83     $(PATH_LIBC_SRC)/kNIX.os2/b_signalInterrupt.c \
    84     $(PATH_LIBC_SRC)/kNIX.os2/b_signalMask.c \
    85     $(PATH_LIBC_SRC)/kNIX.os2/b_signalPending.c \
    86     $(PATH_LIBC_SRC)/kNIX.os2/b_signalQueue.c \
    87     $(PATH_LIBC_SRC)/kNIX.os2/b_signalSendPid.c \
    88     $(PATH_LIBC_SRC)/kNIX.os2/b_signalStack.c \
    89     $(PATH_LIBC_SRC)/kNIX.os2/b_signalSuspend.c \
    90     $(PATH_LIBC_SRC)/kNIX.os2/b_signalTimer.c \
    91     $(PATH_LIBC_SRC)/kNIX.os2/b_signalWait.c \
    92     $(PATH_LIBC_SRC)/kNIX.os2/b_threadCleanup.c \
    93     $(PATH_LIBC_SRC)/kNIX.os2/b_threadEnd.c \
    94     $(PATH_LIBC_SRC)/kNIX.os2/b_threadInit.c \
    95     $(PATH_LIBC_SRC)/kNIX.os2/b_threadSleep.c \
    96     $(PATH_LIBC_SRC)/kNIX.os2/b_threadStartup.c \
    97     $(PATH_LIBC_SRC)/kNIX.os2/b_time.c \
    98     $(PATH_LIBC_SRC)/kNIX.os2/b_timeHighResNano.c \
    99     $(PATH_LIBC_SRC)/kNIX.os2/clock.c \
    100     $(PATH_LIBC_SRC)/kNIX.os2/core.c \
    101     $(PATH_LIBC_SRC)/kNIX.os2/DosAllocMemEx.c \
    102     $(PATH_LIBC_SRC)/kNIX.os2/DosAllocSharedMemEx.c \
    103     $(PATH_LIBC_SRC)/kNIX.os2/DosCloseEventSemEx.c \
    104     $(PATH_LIBC_SRC)/kNIX.os2/DosCloseMutexSemEx.c \
    105     $(PATH_LIBC_SRC)/kNIX.os2/DosCreateEventSemEx.c \
    106     $(PATH_LIBC_SRC)/kNIX.os2/DosCreateMutexSemEx.c \
    107     $(PATH_LIBC_SRC)/kNIX.os2/DosEx.c \
    108     $(PATH_LIBC_SRC)/kNIX.os2/DosFreeMemEx.c \
    109     $(PATH_LIBC_SRC)/kNIX.os2/DosFreeModuleEx.c \
    110     $(PATH_LIBC_SRC)/kNIX.os2/DosGetNamedSharedMemEx.c \
    111     $(PATH_LIBC_SRC)/kNIX.os2/DosGetSharedMemEx.c \
    112     $(PATH_LIBC_SRC)/kNIX.os2/DosLoadModuleEx.c \
    113     $(PATH_LIBC_SRC)/kNIX.os2/DosOpenEventSemEx.c \
    114     $(PATH_LIBC_SRC)/kNIX.os2/DosOpenMutexSemEx.c \
    115     $(PATH_LIBC_SRC)/kNIX.os2/exceptions.c \
    116     $(PATH_LIBC_SRC)/kNIX.os2/execname.c \
    117     $(PATH_LIBC_SRC)/kNIX.os2/FastInfoBlocks.c \
    118     $(PATH_LIBC_SRC)/kNIX.os2/filefind.c \
    119     $(PATH_LIBC_SRC)/kNIX.os2/filehandles.c \
    120     $(PATH_LIBC_SRC)/kNIX.os2/filesys.c \
    121     $(PATH_LIBC_SRC)/kNIX.os2/fs.c \
    122     $(PATH_LIBC_SRC)/kNIX.os2/fsync.c \
    123     $(PATH_LIBC_SRC)/kNIX.os2/getppid.c \
    124     $(PATH_LIBC_SRC)/kNIX.os2/heap.c \
    125     $(PATH_LIBC_SRC)/kNIX.os2/heapdump.c \
    126     $(PATH_LIBC_SRC)/kNIX.os2/heaphigh.c \
    127     $(PATH_LIBC_SRC)/kNIX.os2/heapsize.c \
    128     $(PATH_LIBC_SRC)/kNIX.os2/hooks.c \
    129     $(PATH_LIBC_SRC)/kNIX.os2/libcfork.c \
    130     $(PATH_LIBC_SRC)/kNIX.os2/logstrict.c \
    131     $(PATH_LIBC_SRC)/kNIX.os2/os2error.c \
    132     $(PATH_LIBC_SRC)/kNIX.os2/p2t.c \
    133     $(PATH_LIBC_SRC)/kNIX.os2/pathrewrite.c \
    134     $(PATH_LIBC_SRC)/kNIX.os2/priority.c \
    135     $(PATH_LIBC_SRC)/kNIX.os2/resource.c \
    136     $(PATH_LIBC_SRC)/kNIX.os2/safesems.c \
    137     $(PATH_LIBC_SRC)/kNIX.os2/sbrk.c \
    138     $(PATH_LIBC_SRC)/kNIX.os2/scrsize.c \
    139     $(PATH_LIBC_SRC)/kNIX.os2/seterrno.c \
    140     $(PATH_LIBC_SRC)/kNIX.os2/sharedpm.c \
    141     $(PATH_LIBC_SRC)/kNIX.os2/signals.c \
    142     $(PATH_LIBC_SRC)/kNIX.os2/sleep2.c \
    143     $(PATH_LIBC_SRC)/kNIX.os2/sysv_sem.c \
    144     $(PATH_LIBC_SRC)/kNIX.os2/sysv_shm.c \
    145     $(PATH_LIBC_SRC)/kNIX.os2/tcpip.c \
    146     $(PATH_LIBC_SRC)/kNIX.os2/tcpipver.c \
    147     $(PATH_LIBC_SRC)/kNIX.os2/tcpipver43.c \
    148     $(PATH_LIBC_SRC)/kNIX.os2/timebomb.c \
    149     $(PATH_LIBC_SRC)/kNIX.os2/uflags.c \
    150     $(PATH_LIBC_SRC)/kNIX.os2/umask.c \
    151     $(PATH_LIBC_SRC)/kNIX.os2/__chmod.c \
    152     $(PATH_LIBC_SRC)/kNIX.os2/__close.c \
    153     $(PATH_LIBC_SRC)/kNIX.os2/__dup.c \
    154     $(PATH_LIBC_SRC)/kNIX.os2/__dup2.c \
    155     $(PATH_LIBC_SRC)/kNIX.os2/__exit.c \
    156     $(PATH_LIBC_SRC)/kNIX.os2/__fcntl.c \
    157     $(PATH_LIBC_SRC)/kNIX.os2/__ftime.c \
    158     $(PATH_LIBC_SRC)/kNIX.os2/__imphandle.c \
    159     $(PATH_LIBC_SRC)/kNIX.os2/__init.c \
    160     $(PATH_LIBC_SRC)/kNIX.os2/__initdll.c \
    161     $(PATH_LIBC_SRC)/kNIX.os2/__ioctl1.c \
    162     $(PATH_LIBC_SRC)/kNIX.os2/__ioctl2.c \
    163     $(PATH_LIBC_SRC)/kNIX.os2/__os_version.c \
    164     $(PATH_LIBC_SRC)/kNIX.os2/__pipe.c \
    165     $(PATH_LIBC_SRC)/kNIX.os2/__read.c \
    166     $(PATH_LIBC_SRC)/kNIX.os2/__read_kbd.c \
    167     $(PATH_LIBC_SRC)/kNIX.os2/__select.c \
    168     $(PATH_LIBC_SRC)/kNIX.os2/__settime.c \
    169     $(PATH_LIBC_SRC)/kNIX.os2/__spawnve.c \
    170     $(PATH_LIBC_SRC)/kNIX.os2/__swchar.c \
    171     $(PATH_LIBC_SRC)/kNIX.os2/__ttyname.c \
    172     $(PATH_LIBC_SRC)/kNIX.os2/__ulimit.c \
    173     $(PATH_LIBC_SRC)/kNIX.os2/__wait.c \
    174     $(PATH_LIBC_SRC)/kNIX.os2/__waitpid.c \
    175     $(PATH_LIBC_SRC)/kNIX.os2/__write.c \
    176 
    177 libc_libc_sys_SOURCES.x86 = \
    178     $(PATH_LIBC_SRC)/kNIX.os2/386/appinit.s \
    179     $(PATH_LIBC_SRC)/kNIX.os2/386/thunk0.s \
    180     $(PATH_LIBC_SRC)/kNIX.os2/386/thunk1.s \
    181     $(PATH_LIBC_SRC)/kNIX.os2/386/unwind.s \
    182     $(PATH_LIBC_SRC)/kNIX.os2/386/__init_environ.s \
    183 
    184 $(PATH_LIBC_SRC)/kNIX.os2/heapsize.c_DEFS = HEAPSIZE=0x2000000
     31
     32LIBRARIES += libc_kNIX
     33
     34libc_kNIX_TEMPLATE = libcsub
     35libc_kNIX_SOURCES = \
     36    $(PATH_LIBC_SRC)/kNIX/filehandles.c \
     37
     38
     39libc_kNIX_SOURCES.os2 = \
     40    $(PATH_LIBC_SRC)/kNIX/os2/brk.c \
     41    $(PATH_LIBC_SRC)/kNIX/os2/b_dir.c \
     42    $(PATH_LIBC_SRC)/kNIX/os2/b_fsDirChangeRoot.c \
     43    $(PATH_LIBC_SRC)/kNIX/os2/b_fsDirCreate.c \
     44    $(PATH_LIBC_SRC)/kNIX/os2/b_fsDirCurrentGet.c \
     45    $(PATH_LIBC_SRC)/kNIX/os2/b_fsDirCurrentSet.c \
     46    $(PATH_LIBC_SRC)/kNIX/os2/b_fsDirCurrentSetFH.c \
     47    $(PATH_LIBC_SRC)/kNIX/os2/b_fsDirRemove.c \
     48    $(PATH_LIBC_SRC)/kNIX/os2/b_fsDriveDefaultGet.c \
     49    $(PATH_LIBC_SRC)/kNIX/os2/b_fsDriveDefaultSet.c \
     50    $(PATH_LIBC_SRC)/kNIX/os2/b_fsFileModeSet.c \
     51    $(PATH_LIBC_SRC)/kNIX/os2/b_fsFileModeSetFH.c \
     52    $(PATH_LIBC_SRC)/kNIX/os2/b_fsFileStat.c \
     53    $(PATH_LIBC_SRC)/kNIX/os2/b_fsFileStatFH.c \
     54    $(PATH_LIBC_SRC)/kNIX/os2/b_fsFileTimesSet.c \
     55    $(PATH_LIBC_SRC)/kNIX/os2/b_fsFileTimesSetFH.c \
     56    $(PATH_LIBC_SRC)/kNIX/os2/b_fsNativeFileModeSet.c \
     57    $(PATH_LIBC_SRC)/kNIX/os2/b_fsNativeFileStat.c \
     58    $(PATH_LIBC_SRC)/kNIX/os2/b_fsNativeFileTimesSet.c \
     59    $(PATH_LIBC_SRC)/kNIX/os2/b_fsPathResolve.c \
     60    $(PATH_LIBC_SRC)/kNIX/os2/b_fsRename.c \
     61    $(PATH_LIBC_SRC)/kNIX/os2/b_fsStat.c \
     62    $(PATH_LIBC_SRC)/kNIX/os2/b_fsSymlinkCreate.c \
     63    $(PATH_LIBC_SRC)/kNIX/os2/b_fsSymlinkModeSet.c \
     64    $(PATH_LIBC_SRC)/kNIX/os2/b_fsSymlinkRead.c \
     65    $(PATH_LIBC_SRC)/kNIX/os2/b_fsSymlinkStat.c \
     66    $(PATH_LIBC_SRC)/kNIX/os2/b_fsSymlinkTimesSet.c \
     67    $(PATH_LIBC_SRC)/kNIX/os2/b_fsSync.c \
     68    $(PATH_LIBC_SRC)/kNIX/os2/b_fsUnlink.c \
     69    $(PATH_LIBC_SRC)/kNIX/os2/b_ioDirGetEntries.c \
     70    $(PATH_LIBC_SRC)/kNIX/os2/b_ioFHToPath.c \
     71    $(PATH_LIBC_SRC)/kNIX/os2/b_ioFileControl.c \
     72    $(PATH_LIBC_SRC)/kNIX/os2/b_ioFileOpen.c \
     73    $(PATH_LIBC_SRC)/kNIX/os2/b_ioFileSizeSet.c \
     74    $(PATH_LIBC_SRC)/kNIX/os2/b_ioSeek.c \
     75    $(PATH_LIBC_SRC)/kNIX/os2/b_ldrClose.c \
     76    $(PATH_LIBC_SRC)/kNIX/os2/b_ldrOpen.c \
     77    $(PATH_LIBC_SRC)/kNIX/os2/b_ldrSymbol.c \
     78    $(PATH_LIBC_SRC)/kNIX/os2/b_miscLoadAvg.c \
     79    $(PATH_LIBC_SRC)/kNIX/os2/b_mmanProtect.c \
     80    $(PATH_LIBC_SRC)/kNIX/os2/b_nativeSymlinkCreate.c \
     81    $(PATH_LIBC_SRC)/kNIX/os2/b_panic.c \
     82    $(PATH_LIBC_SRC)/kNIX/os2/b_processCredentials.c \
     83    $(PATH_LIBC_SRC)/kNIX/os2/b_processGetPriority.c \
     84    $(PATH_LIBC_SRC)/kNIX/os2/b_processSetPriority.c \
     85    $(PATH_LIBC_SRC)/kNIX/os2/b_processWait.c \
     86    $(PATH_LIBC_SRC)/kNIX/os2/b_signalInterrupt.c \
     87    $(PATH_LIBC_SRC)/kNIX/os2/b_signalMask.c \
     88    $(PATH_LIBC_SRC)/kNIX/os2/b_signalPending.c \
     89    $(PATH_LIBC_SRC)/kNIX/os2/b_signalQueue.c \
     90    $(PATH_LIBC_SRC)/kNIX/os2/b_signalSendPid.c \
     91    $(PATH_LIBC_SRC)/kNIX/os2/b_signalStack.c \
     92    $(PATH_LIBC_SRC)/kNIX/os2/b_signalSuspend.c \
     93    $(PATH_LIBC_SRC)/kNIX/os2/b_signalTimer.c \
     94    $(PATH_LIBC_SRC)/kNIX/os2/b_signalWait.c \
     95    $(PATH_LIBC_SRC)/kNIX/os2/b_threadCleanup.c \
     96    $(PATH_LIBC_SRC)/kNIX/os2/b_threadEnd.c \
     97    $(PATH_LIBC_SRC)/kNIX/os2/b_threadInit.c \
     98    $(PATH_LIBC_SRC)/kNIX/os2/b_threadSleep.c \
     99    $(PATH_LIBC_SRC)/kNIX/os2/b_threadStartup.c \
     100    $(PATH_LIBC_SRC)/kNIX/os2/b_time.c \
     101    $(PATH_LIBC_SRC)/kNIX/os2/b_timeHighResNano.c \
     102    $(PATH_LIBC_SRC)/kNIX/os2/clock.c \
     103    $(PATH_LIBC_SRC)/kNIX/os2/core.c \
     104    $(PATH_LIBC_SRC)/kNIX/os2/DosAllocMemEx.c \
     105    $(PATH_LIBC_SRC)/kNIX/os2/DosAllocSharedMemEx.c \
     106    $(PATH_LIBC_SRC)/kNIX/os2/DosCloseEventSemEx.c \
     107    $(PATH_LIBC_SRC)/kNIX/os2/DosCloseMutexSemEx.c \
     108    $(PATH_LIBC_SRC)/kNIX/os2/DosCreateEventSemEx.c \
     109    $(PATH_LIBC_SRC)/kNIX/os2/DosCreateMutexSemEx.c \
     110    $(PATH_LIBC_SRC)/kNIX/os2/DosEx.c \
     111    $(PATH_LIBC_SRC)/kNIX/os2/DosFreeMemEx.c \
     112    $(PATH_LIBC_SRC)/kNIX/os2/DosFreeModuleEx.c \
     113    $(PATH_LIBC_SRC)/kNIX/os2/DosGetNamedSharedMemEx.c \
     114    $(PATH_LIBC_SRC)/kNIX/os2/DosGetSharedMemEx.c \
     115    $(PATH_LIBC_SRC)/kNIX/os2/DosLoadModuleEx.c \
     116    $(PATH_LIBC_SRC)/kNIX/os2/DosOpenEventSemEx.c \
     117    $(PATH_LIBC_SRC)/kNIX/os2/DosOpenMutexSemEx.c \
     118    $(PATH_LIBC_SRC)/kNIX/os2/exceptions.c \
     119    $(PATH_LIBC_SRC)/kNIX/os2/execname.c \
     120    $(PATH_LIBC_SRC)/kNIX/os2/FastInfoBlocks.c \
     121    $(PATH_LIBC_SRC)/kNIX/os2/filefind.c \
     122    $(PATH_LIBC_SRC)/kNIX/os2/filesys.c \
     123    $(PATH_LIBC_SRC)/kNIX/os2/fs.c \
     124    $(PATH_LIBC_SRC)/kNIX/os2/fsync.c \
     125    $(PATH_LIBC_SRC)/kNIX/os2/getppid.c \
     126    $(PATH_LIBC_SRC)/kNIX/os2/heap.c \
     127    $(PATH_LIBC_SRC)/kNIX/os2/heapdump.c \
     128    $(PATH_LIBC_SRC)/kNIX/os2/heaphigh.c \
     129    $(PATH_LIBC_SRC)/kNIX/os2/heapsize.c \
     130    $(PATH_LIBC_SRC)/kNIX/os2/hooks.c \
     131    $(PATH_LIBC_SRC)/kNIX/os2/libcfork.c \
     132    $(PATH_LIBC_SRC)/kNIX/os2/logstrict.c \
     133    $(PATH_LIBC_SRC)/kNIX/os2/os2error.c \
     134    $(PATH_LIBC_SRC)/kNIX/os2/p2t.c \
     135    $(PATH_LIBC_SRC)/kNIX/os2/pathrewrite.c \
     136    $(PATH_LIBC_SRC)/kNIX/os2/priority.c \
     137    $(PATH_LIBC_SRC)/kNIX/os2/resource.c \
     138    $(PATH_LIBC_SRC)/kNIX/os2/safesems.c \
     139    $(PATH_LIBC_SRC)/kNIX/os2/sbrk.c \
     140    $(PATH_LIBC_SRC)/kNIX/os2/scrsize.c \
     141    $(PATH_LIBC_SRC)/kNIX/os2/seterrno.c \
     142    $(PATH_LIBC_SRC)/kNIX/os2/sharedpm.c \
     143    $(PATH_LIBC_SRC)/kNIX/os2/signals.c \
     144    $(PATH_LIBC_SRC)/kNIX/os2/sleep2.c \
     145    $(PATH_LIBC_SRC)/kNIX/os2/sysv_sem.c \
     146    $(PATH_LIBC_SRC)/kNIX/os2/sysv_shm.c \
     147    $(PATH_LIBC_SRC)/kNIX/os2/tcpip.c \
     148    $(PATH_LIBC_SRC)/kNIX/os2/tcpipver.c \
     149    $(PATH_LIBC_SRC)/kNIX/os2/tcpipver43.c \
     150    $(PATH_LIBC_SRC)/kNIX/os2/timebomb.c \
     151    $(PATH_LIBC_SRC)/kNIX/os2/uflags.c \
     152    $(PATH_LIBC_SRC)/kNIX/os2/umask.c \
     153    $(PATH_LIBC_SRC)/kNIX/os2/__chmod.c \
     154    $(PATH_LIBC_SRC)/kNIX/os2/__close.c \
     155    $(PATH_LIBC_SRC)/kNIX/os2/__dup.c \
     156    $(PATH_LIBC_SRC)/kNIX/os2/__dup2.c \
     157    $(PATH_LIBC_SRC)/kNIX/os2/__exit.c \
     158    $(PATH_LIBC_SRC)/kNIX/os2/__fcntl.c \
     159    $(PATH_LIBC_SRC)/kNIX/os2/__ftime.c \
     160    $(PATH_LIBC_SRC)/kNIX/os2/__imphandle.c \
     161    $(PATH_LIBC_SRC)/kNIX/os2/__init.c \
     162    $(PATH_LIBC_SRC)/kNIX/os2/__initdll.c \
     163    $(PATH_LIBC_SRC)/kNIX/os2/__ioctl1.c \
     164    $(PATH_LIBC_SRC)/kNIX/os2/__ioctl2.c \
     165    $(PATH_LIBC_SRC)/kNIX/os2/__os_version.c \
     166    $(PATH_LIBC_SRC)/kNIX/os2/__pipe.c \
     167    $(PATH_LIBC_SRC)/kNIX/os2/__read.c \
     168    $(PATH_LIBC_SRC)/kNIX/os2/__read_kbd.c \
     169    $(PATH_LIBC_SRC)/kNIX/os2/__select.c \
     170    $(PATH_LIBC_SRC)/kNIX/os2/__settime.c \
     171    $(PATH_LIBC_SRC)/kNIX/os2/__spawnve.c \
     172    $(PATH_LIBC_SRC)/kNIX/os2/__swchar.c \
     173    $(PATH_LIBC_SRC)/kNIX/os2/__ttyname.c \
     174    $(PATH_LIBC_SRC)/kNIX/os2/__ulimit.c \
     175    $(PATH_LIBC_SRC)/kNIX/os2/__wait.c \
     176    $(PATH_LIBC_SRC)/kNIX/os2/__waitpid.c \
     177    $(PATH_LIBC_SRC)/kNIX/os2/__write.c \
     178    $(PATH_LIBC_SRC)/kNIX/os2/386/appinit.s \
     179    $(PATH_LIBC_SRC)/kNIX/os2/386/thunk0.s \
     180    $(PATH_LIBC_SRC)/kNIX/os2/386/thunk1.s \
     181    $(PATH_LIBC_SRC)/kNIX/os2/386/unwind.s \
     182    $(PATH_LIBC_SRC)/kNIX/os2/386/__init_environ.s \
     183
     184$(PATH_LIBC_SRC)/kNIX/os2/heapsize.c_DEFS = HEAPSIZE=0x2000000
     185
     186
     187libc_kNIX_SOURCES.win32 = \
     188        $(PATH_LIBC_SRC)/kNIX/nt/b_panic.c \
     189
    185190
    186191# configure the variants. */
    187 $(call LIBC_CONFIG_VARIANT_LIBS,libc_libc_sys)
     192$(call LIBC_CONFIG_VARIANT_LIBS,libc_kNIX)
     193
    188194
    189195# Assembly in Intel format.
    190 LIBRARIES += libc_libc_sys_asm
    191 libc_libc_sys_asm_TEMPLATE = libcsubasm
    192 libc_libc_sys_asm_SOURCES.x86 = \
    193         $(PATH_LIBC_SRC)/kNIX.os2/386/signal16bit.asm
    194 
    195 $(call LIBC_CONFIG_VARIANT_LIBS,libc_libc_sys_asm)
    196 
    197 endif # BUILD_TARGET == os2
     196LIBRARIES += libc_kNIX_asm
     197libc_kNIX_asm_TEMPLATE = libcsubasm
     198libc_kNIX_asm_SOURCES.os2 = \
     199        $(PATH_LIBC_SRC)/kNIX/os2/386/signal16bit.asm
     200
     201$(call LIBC_CONFIG_VARIANT_LIBS,libc_kNIX_asm)
     202
    198203# generate rules
    199204include $(PATH_KBUILD)/subfooter.kmk

  • trunk/libc/src/kNIX/b_dir.h

    r2732 r2733  
    3737    /** The common fh core. */
    3838    __LIBC_FH       Core;
     39#ifdef __OS2__
    3940    /** The directory handle. */
    4041    HDIR            hDir;
    … …  
    6768    /** Current entry number (total, for seeking). */
    6869    unsigned        uCurEntry;
     70#endif /* __OS2__ */
    6971} __LIBC_FHDIR;
    7072/** Pointer to the a directory handle. */

  • trunk/libc/src/kNIX/filehandles.c

    r2732 r2733  
    3737*   Header Files                                                               *
    3838*******************************************************************************/
    39 #define INCL_BASE
    40 #define INCL_ERRORS
    41 #define INCL_FSMACROS
    42 #include <os2.h>
     39#define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_INITTERM
     40#ifdef __OS2__
     41# define INCL_BASE
     42# define INCL_ERRORS
     43# define INCL_FSMACROS
     44# include <os2.h>
     45#endif
     46#ifdef __NT__
     47# include <klibc/nt/nt.h>
     48#endif
    4349#include "libc-alias.h"
    4450#include <malloc.h>
    … …  
    5157#include <emx/io.h>
    5258#include <emx/umalloc.h>
    53 #include "syscalls.h"
     59//#include "syscalls.h"
    5460#include "b_fs.h"
    5561#include "b_dir.h"
    5662
    5763#include <InnoTekLIBC/backend.h>
    58 #define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_INITTERM
    5964#include <InnoTekLIBC/logstrict.h>
    6065
Note: See TracChangeset for help on using the changeset viewer.