Changeset 2717


Ignore:
Timestamp:
Jul 16, 2006, 3:01:51 PM (19 years ago)
Author:
bird
Message:

building on nt. (work in progress)

Location:
trunk/libc
Files:
4 added
33 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/libc/Config.kmk

    r2714 r2717  
    5858PATH_LIBC_INC = $(PATH_LIBC_ROOT)/include
    5959LIBC-STD.H = $(PATH_OBJ)/libc/libc-std.h
     60LIBC_GENALIAS = $(PATH_TARGET)/genalias/genalias$(HOSTSUFF_EXE)
     61LIBC_GENALIAS_FORMAT.win32 = coff
     62LIBC_GENALIAS_FORMAT.win64 = coff
     63ifdef LIBC_GENALIAS_FORMAT.$(BUILD_TARGET)
     64LIBC_GENALIAS_FORMAT := $(LIBC_GENALIAS_FORMAT.$(BUILD_TARGET))
     65else
     66LIBC_GENALIAS_FORMAT := aout
     67endif
    6068
    6169#
    … …  
    101109
    102110TEMPLATE_libcasm =
    103 TEMPLATE_libcasm_TOOL = GCC3OMF
     111TEMPLATE_libcasm_TOOL = GCC3
     112TEMPLATE_libcasm_TOOL.os2 = GCC3OMF
    104113TEMPLATE_libcasm_ASTOOL = ALP
    105114TEMPLATE_libcasm_INCS = $(PATH_LIBC_INC) $(dir $(LIBC-STD.H))
    … …  
    108117
    109118TEMPLATE_libcasm.logstrict =
    110 TEMPLATE_libcasm.logstrict_TOOL = GCC3OMF
     119TEMPLATE_libcasm.logstrict_TOOL = GCC3
     120TEMPLATE_libcasm.logstrict_TOOL.os2 = GCC3OMF
    111121TEMPLATE_libcasm.logstrict_ASTOOL = ALP
    112122TEMPLATE_libcasm.logstrict_DEFS = $(TEMPLATE_libcasm_DEFS) __LIBC_STRICT DEBUG_LOGGING
    … …  
    116126
    117127TEMPLATE_libcasm.profiled =
    118 TEMPLATE_libcasm.profiled_TOOL = GCC3OMF
     128TEMPLATE_libcasm.profiled_TOOL = GCC3
     129TEMPLATE_libcasm.profiled_TOOL.os2 = GCC3OMF
    119130TEMPLATE_libcasm.profiled_ASTOOL = ALP
    120131TEMPLATE_libcasm.profiled_DEFS = $(TEMPLATE_libcasm_DEFS) __LIBC_PROFILED
    … …  
    139150TEMPLATE_bldprog = Build programs
    140151TEMPLATE_bldprog_TOOL = GCC3
     152TEMPLATE_bldprog_DEFS = __LIBC_BUILD_PROGRAM__
    141153TEMPLATE_bldprog_INCS = $(PATH_LIBC_ROOT)
    142154

  • trunk/libc/Makefile.kmk

    r2716 r2717  
    2929
    3030BLDPROGS :=
    31 LIBRARIES := 
     31LIBRARIES :=
    3232DLLS :=
    33 PROGRAMS := 
     33PROGRAMS :=
    3434INSTALLS = \
    3535        headers \
    … …  
    118118# The shared library / so.
    119119#
    120 DLLS += libc07
     120DLLS.os2 += libc07
    121121libc07_TEMPLATE = libc
    122122libc07_TOOL = GCC3
    … …  
    138138
    139139ifdef CFG_LIBC_LOGSTRICT_LIBS
     140DLLS.os2 += libc07.logstrict
    140141libc07.logstrict_TEMPLATE = libc.logstrict
    141142libc07.logstrict_TOOL = GCC3
    … …  
    158159
    159160ifdef CFG_LIBC_PROFILED_LIBS
     161DLLS.os2 += libc07.profiled
    160162libc07.profiled_TEMPLATE = libc.profiled
    161163libc07.profiled_TOOL = GCC3
    … …  
    183185# The shared library / so.
    184186#
    185 IMPORT_LIBS += libc_dll
     187IMPORT_LIBS.os2 += libc_dll
    186188libc_dll_TEMPLATE = libc
    187189libc_dll_SOURCES = \
    … …  
    268270                -o $@ \
    269271                $<
     272$(eval startupobjs_SOURCES += $(PATH_TARGET)/crt0$(i).o)
     273ifeq ($(BUILD_TARGET),os2)
    270274$(PATH_TARGET)/crt0$(i).obj: $(PATH_TARGET)/crt0$(i).o
    271275        emxomf -m__text -o $@ $<
    272 $(eval startupobjs_SOURCES += $(PATH_TARGET)/crt0$(i).o $(PATH_TARGET)/crt0$(i).obj)
     276$(eval startupobjs_SOURCES += $(PATH_TARGET)/crt0$(i).obj)
     277endif
    273278
    274279ifeq ($(subst resp,,$(subst wild,,$(i))),$(i))
    … …  
    283288                -o $@ \
    284289                $<
     290$(eval startupobjs_SOURCES += $(PATH_TARGET)/dll0$(i).o)
     291ifeq ($(BUILD_TARGET),os2)
    285292$(PATH_TARGET)/dll0$(i).obj: $(PATH_TARGET)/dll0$(i).o
    286293        emxomf -l__text -o $@ $<
    287 $(eval startupobjs_SOURCES += $(PATH_TARGET)/dll0$(i).o $(PATH_TARGET)/dll0$(i).obj)
     294$(eval startupobjs_SOURCES += $(PATH_TARGET)/dll0$(i).obj)
     295endif
    288296endif
    289297endef
    … …  
    333341$(PATH_TARGET)/binmode.o: src/libc/io/386/binmode.s
    334342        gcc -c -o $@ $<
     343startupobjs_SOURCES += $(PATH_TARGET)/binmode.o
     344ifdef ($(BUILD_TARGET),os2)
    335345$(PATH_TARGET)/binmode.obj: $(PATH_TARGET)/binmode.o
    336346        emxomf -o $@ $<
    337 startupobjs_SOURCES += $(PATH_TARGET)/binmode.o $(PATH_TARGET)/binmode.obj
     347startupobjs_SOURCES += $(PATH_TARGET)/binmode.obj
     348endif
    338349
    339350
    … …  
    376387        $(foreach src, $^\
    377388                ,$(NL)$(TAB)@$(APPEND) $(PATH_TARGET)/libc-std.files "$(src)")
     389ifeq ($(BUILD_PLATFORM),os2)
    378390        gawk -f ./mkstd.awk @$(PATH_TARGET)/libc-std.files > $(PATH_TARGET)/libc-std.tmp.h
     391else
     392        cd src && gawk -f ../mkstd.awk $(subst $(PATH_LIBC_SRC)/,,$^) > $(PATH_TARGET)/libc-std.tmp.h
     393endif
    379394        if diff $(PATH_TARGET)/libc-std.tmp.h $(PATH_TARGET)/libc-std.h > /dev/null 2> /dev/null; then \
    380395                echo "* libc-std.h unchanged"; \

  • trunk/libc/alias.kmk

    r2710 r2717  
    6161        __xpg_basename=_std_basename
    6262
    63 # generate .o and .s rules for one alias.
    64 define def_alias
    65 $(eval realname := $(subst =, ,$(pair)))
    66 $(eval alias    := $(word 1, $(realname)))
    67 $(eval realname := $(word 2, $(realname)))
     63$(foreach pair,$(ALIASPAIRS),$(eval libc_alias_SOURCES += $$(PATH_TARGET)/libc_alias/$(word 1, $(subst =, ,$(pair))).o))
    6864
    69 $$(PATH_TARGET)/aliases/$(alias).s: | $(call DIRDEP,$(PATH_TARGET)/aliases)
    70         @$$(RM) -f $$@
    71         @$$(APPEND) $$@ '.stabs "_$(alias)",11,0,0,0;.stabs "_$(realname)",1,0,0,0;'
    72 $$(PATH_TARGET)/aliases/$(alias).o: $$(PATH_TARGET)/aliases/$(alias).s
    73         as -o $$@ $$<
    74        
    75 libc_alias_SOURCES += $$(PATH_TARGET)/aliases/$(alias).o
    76 endef
    77 
    78 # generate .o and .s rules for on alias.
    79 $(foreach pair,$(ALIASPAIRS),$(eval $(def_alias)))
    80 alias:=
    81 realname:=
     65$(libc_alias_SOURCES): $(LIBC_GENALIAS) alias.kmk
     66        $(RM) -f $(PATH_TARGET)/aliases.rsp $(libc_alias_SOURCES)
     67        $(foreach pair,$(ALIASPAIRS) \
     68                ,$(NL)$(TAB)$(APPEND) $(PATH_TARGET)/libc_alias/aliases.rsp "$(pair)")
     69        $(LIBC_GENALIAS) -f $(LIBC_GENALIAS_FORMAT) -D $(PATH_TARGET)/libc_alias -r $(PATH_TARGET)/libc_alias/aliases.rsp
    8270
    8371
    … …  
    8775OTHER_CLEAN = $(libc_alias_SOURCES) $(libc_alias_SOURCES:.o=.s)
    8876
    89                                                
     77
    9078# Generate kBuild rules.
    9179include $(PATH_KBUILD)/footer.kmk

  • trunk/libc/include/386/asm.h

    r2150 r2717  
    7676#define _START_ENTRY    .text; .p2align 4,0xcc /* bird */
    7777
    78 #define _ENTRY(x)       _START_ENTRY; \
     78#ifdef __MINGW32__ /** @todo need better assembly dialect indicators. */
     79# define _ENTRY(x)      _START_ENTRY; \
     80                        .globl CNAME(x);
     81/** @todo Does COFF require type or anything else? */
     82#else
     83# define _ENTRY(x)      _START_ENTRY; \
    7984                        .globl CNAME(x); .type CNAME(x),@function; CNAME(x):
     85#endif
    8086
    8187#ifdef PROF

  • trunk/libc/include/emx/time.h

    r1790 r2717  
    44#define _EMX_TIME_H
    55
     6#define _YEARS          (2059 - 1900 + 1)
     7#define TIME_T_MAX      0x7fffffffL
     8#define TIME_T_MIN      (-0x7fffffffL - 1)
     9
     10#ifndef __LIBC_BUILD_PROGRAM__
    611#include <sys/cdefs.h>
    712#include <sys/_types.h>
    813
    9 #if defined (__cplusplus)
    10 extern "C" {
    11 #endif
    12 
    13 #define _YEARS          (2059 - 1900 + 1)
    14 #define TIME_T_MAX      0x7fffffffL
    15 #define TIME_T_MIN      (-0x7fffffffL - 1)
     14__BEGIN_DECLS
    1615
    1716#if !defined(_TIME_T_DECLARED) && !defined(_TIME_T) /* bird: EMX */
    … …  
    6665
    6766
    68 #if defined (__cplusplus)
    69 }
    70 #endif
     67__END_DECLS
    7168
     69#endif /* not __LIBC_BUILD_PROGRAM__ */
    7270#endif /* not _EMX_TIME_H */

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

    r2711 r2717  
    3232# include sub-makefile and determin which libraries they define.
    3333LIBC_SUB_LIBRARIES :=
     34ifeq ($(BUILD_TARGET),os2) ## @todo make portable
    3435include $(wildcard $(PATH_LIBC_SRC)/fbsdlibc/*/Makefile.kmk)
     36endif
    3537
    3638

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

    r2716 r2717  
    2929SUB_DEPTH = ../..
    3030include $(PATH_KBUILD)/subheader.kmk
    31 
     31ifeq ($(BUILD_TARGET),os2) ## @todo This requires libc to build... stupid.
    3232
    3333#
    … …  
    4242
    4343
     44endif # BUILD_TARGET == os2
    4445# generate rules
    4546include $(PATH_KBUILD)/subfooter.kmk

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

    r2711 r2717  
    3232# include sub-makefile and determin which libraries they define.
    3333LIBC_SUB_LIBRARIES :=
     34ifeq ($(BUILD_TARGET),os2) ## @todo make portable
    3435include $(wildcard $(PATH_LIBC_SRC)/glibc/*/Makefile.kmk)
     36endif
    3537
    3638

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

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

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

    r2702 r2717  
    8484BLDPROGS += makepow5
    8585makepow5_TEMPLATE = bldprog
    86 makepow5_SOURCES = $(PATH_LIBC_SRC)/libc/conv/makepow5.c
     86makepow5_SOURCES = \
     87        $(PATH_LIBC_SRC)/libc/conv/makepow5.c \
     88        $(PATH_LIBC_SRC)/libc/conv/bisetw.c \
     89        $(PATH_LIBC_SRC)/libc/conv/c/bimulbw.c \
    8790
    8891# Generate the big integer tables.

  • trunk/libc/src/libc/conv/bisetw.c

    r236 r2717  
    11/* bisetw.c (emx+gcc) -- Copyright (c) 1996 by Eberhard Mattes */
    22
    3 #include "libc-alias.h"
    4 #include <emx/bigint.h>
     3#ifdef __LIBC_BUILD_PROGRAM__
     4# include "include/emx/bigint.h"
     5#else
     6# include "libc-alias.h"
     7# include <emx/bigint.h>
     8#endif
    59
    610int _bi_set_w (_bi_bigint *dst, int dst_words, _bi_word src)

  • trunk/libc/src/libc/conv/c/bimulbw.c

    r18 r2717  
    11/* bimulbw.c (emx+gcc) -- Copyright (c) 1996 by Eberhard Mattes */
    22
    3 #include <emx/bigint.h>
     3#ifdef __LIBC_BUILD_PROGRAM__
     4# include "include/emx/bigint.h"
     5#else
     6# include "libc-alias.h"
     7# include <emx/bigint.h>
     8#endif
    49
    510/* DST==SRC is allowed. */

  • trunk/libc/src/libc/emxload/emxloadr.c

    r251 r2717  
    66#include <sys/emxload.h>
    77#include <emx/emxload.h>
    8 #define INCL_DOSNMPIPES
    9 #define INCL_DOSPROCESS
    10 #define INCL_DOSERRORS
    11 #include <os2emx.h>
    12 
    13 
     8#ifdef __OS2__
     9# define INCL_DOSNMPIPES
     10# define INCL_DOSPROCESS
     11# define INCL_DOSERRORS
     12# include <os2emx.h>
     13#else
     14/** @todo port to other platforms... */
     15# define TRUE 1
     16# define FALSE 0
     17#endif
     18
     19
     20#ifdef __OS2__
    1421static char const pipe_name[] = _EMXLOAD_PIPENAME;
    1522static HPIPE hpServer = 0;
     23#else
     24/** @todo port to other platforms... */
     25#endif
    1626static int connect_level = 0;
    1727
    1828int _emxload_do_connect (int start)
    1929{
     30#ifdef __OS2__
    2031  int i, ok;
    2132  ULONG rc, action;
    … …  
    7283  ++connect_level;
    7384  return 0;
     85#else
     86/** @todo port to other platforms... */
     87  return -1;
     88#endif
    7489}
    7590
    … …  
    8398    {
    8499      connect_level = 0;
     100#ifdef __OS2__
    85101      if (DosClose (hpServer) != 0)
     102#else
     103/** @todo port to other platforms... */
     104#endif
    86105        return -1;
    87106    }
    … …  
    92111int _emxload_do_request (int req_code, const char *name, int seconds)
    93112{
     113#ifdef __OS2__
    94114  ULONG rc, cb;
    95115  int len;
    … …  
    115135    }
    116136  return 0;
     137#else
     138/** @todo port to other platforms... */
     139  return -1;
     140#endif
    117141}
    118142
    … …  
    120144int _emxload_do_receive (answer *ans)
    121145{
     146#ifdef __OS2__
    122147  ULONG rc, cb;
    123148
    … …  
    130155    }
    131156  return 0;
     157#else
     158/** @todo port to other platforms... */
     159  return -1;
     160#endif
    132161}
    133162

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

    r2702 r2717  
    4343    $(PATH_LIBC_SRC)/libc/io/dup.c \
    4444    $(PATH_LIBC_SRC)/libc/io/dup2.c \
    45     $(PATH_LIBC_SRC)/libc/io/eaccess.c \
    46     $(PATH_LIBC_SRC)/libc/io/ead.c \
    47     $(PATH_LIBC_SRC)/libc/io/eadadd.c \
    48     $(PATH_LIBC_SRC)/libc/io/eadcopy.c \
    49     $(PATH_LIBC_SRC)/libc/io/eadfea.c \
    50     $(PATH_LIBC_SRC)/libc/io/eadread.c \
    51     $(PATH_LIBC_SRC)/libc/io/eadsort.c \
    52     $(PATH_LIBC_SRC)/libc/io/eadwrite.c \
    53     $(PATH_LIBC_SRC)/libc/io/eaerrno.c \
    54     $(PATH_LIBC_SRC)/libc/io/eafree.c \
    55     $(PATH_LIBC_SRC)/libc/io/eaget.c \
    56     $(PATH_LIBC_SRC)/libc/io/eaput.c \
    57     $(PATH_LIBC_SRC)/libc/io/earemove.c \
    58     $(PATH_LIBC_SRC)/libc/io/eawrite.c \
    5945    $(PATH_LIBC_SRC)/libc/io/eof.c \
    6046    $(PATH_LIBC_SRC)/libc/io/fchmod.c \
    … …  
    181167    $(PATH_LIBC_SRC)/libc/io/__fpending.c \
    182168
     169libc_libc_io_SOURCES.os2 = \
     170    $(PATH_LIBC_SRC)/libc/io/eaccess.c \
     171    $(PATH_LIBC_SRC)/libc/io/ead.c \
     172    $(PATH_LIBC_SRC)/libc/io/eadadd.c \
     173    $(PATH_LIBC_SRC)/libc/io/eadcopy.c \
     174    $(PATH_LIBC_SRC)/libc/io/eadfea.c \
     175    $(PATH_LIBC_SRC)/libc/io/eadread.c \
     176    $(PATH_LIBC_SRC)/libc/io/eadsort.c \
     177    $(PATH_LIBC_SRC)/libc/io/eadwrite.c \
     178    $(PATH_LIBC_SRC)/libc/io/eaerrno.c \
     179    $(PATH_LIBC_SRC)/libc/io/eafree.c \
     180    $(PATH_LIBC_SRC)/libc/io/eaget.c \
     181    $(PATH_LIBC_SRC)/libc/io/eaput.c \
     182    $(PATH_LIBC_SRC)/libc/io/earemove.c \
     183    $(PATH_LIBC_SRC)/libc/io/eawrite.c \
     184
    183185# configure the variants. */
    184186$(call LIBC_CONFIG_VARIANT_LIBS,libc_libc_io)

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

    r2702 r2717  
    3434libc_libc_locale_TEMPLATE = libcsub
    3535libc_libc_locale_SOURCES = \
    36     $(PATH_LIBC_SRC)/libc/locale/iconv.c \
    3736    $(PATH_LIBC_SRC)/libc/locale/isxxx.c \
    3837    $(PATH_LIBC_SRC)/libc/locale/localeconv.c \
    … …  
    4443    $(PATH_LIBC_SRC)/libc/locale/locale_time.c \
    4544    $(PATH_LIBC_SRC)/libc/locale/mbcurmax.c \
    46     $(PATH_LIBC_SRC)/libc/locale/mb_libuni.c \
    4745    $(PATH_LIBC_SRC)/libc/locale/mb_none.c \
    4846    $(PATH_LIBC_SRC)/libc/locale/nl_langinfo.c \
    49     $(PATH_LIBC_SRC)/libc/locale/setlocale.c \
    5047    $(PATH_LIBC_SRC)/libc/locale/wctype.c \
    5148    $(PATH_LIBC_SRC)/libc/locale/__convcp.c \
    52     $(PATH_LIBC_SRC)/libc/locale/__do_uni.c \
     49
     50libc_libc_locale_SOURCES.os2 = \
     51    $(PATH_LIBC_SRC)/libc/locale/iconv.c \
     52    $(PATH_LIBC_SRC)/libc/locale/mb_libuni.c \
     53    $(PATH_LIBC_SRC)/libc/locale/setlocale.c \
    5354    $(PATH_LIBC_SRC)/libc/locale/__from_ucs.c \
    5455    $(PATH_LIBC_SRC)/libc/locale/__to_ucs.c \
     56    $(PATH_LIBC_SRC)/libc/locale/__do_uni.c \
    5557
    5658# configure the variants. */

  • trunk/libc/src/libc/locale/locale_collate.c

    r1519 r2717  
    7070        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
    7171    },
     72#ifdef __OS2__
    7273    .uobj = 0,
    7374    .lobj = 0,
     75#else
     76/** @todo portable local */
     77#endif
    7478    .mbcs = 0
    7579};

  • trunk/libc/src/libc/locale/locale_ctype.c

    r2672 r2717  
    211211        .pfnwcsnrtombs =  __libc_locale_none_wcsnrtombs
    212212    },
     213#ifdef __OS2__
    213214    .uobj = 0,
    214215    .lobj = 0,
     216#else
     217/** @todo portable local */
     218#endif
    215219    .mbcs = 0,
    216220    .szCodeSet = "US-ASCII"
    … …  
    571575
    572576    /* the rest */
    573     printf("    .uobj = 0,\n"
     577    printf(
     578#ifdef __OS2__
     579           "    .uobj = 0,\n"
    574580           "    .lobj = 0,\n"
     581#else
     582/** @todo portable local */
     583#endif
    575584           "    .mbcs = %d,\n"
    576585           "    .szCodeSet = \"US-ASCII\"\n"

  • trunk/libc/src/libc/locale/locale_ctype_default.c

    r1763 r2717  
    208208        .pfnwcsnrtombs =  __libc_locale_none_wcsnrtombs
    209209    },
     210#ifdef __OS2__
    210211    .uobj = 0,
    211212    .lobj = 0,
     213#else
     214/** @todo portable local */
     215#endif
    212216    .mbcs = 0,
    213217    .szCodeSet = "US-ASCII"

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

    r2702 r2717  
    136136    $(PATH_LIBC_SRC)/libc/misc/sysctl.c \
    137137    $(PATH_LIBC_SRC)/libc/misc/sysctl_mib.c \
    138     $(PATH_LIBC_SRC)/libc/misc/sysctl_os2.c \
    139138    $(PATH_LIBC_SRC)/libc/misc/syserr.c \
    140139    $(PATH_LIBC_SRC)/libc/misc/ulimit.c \
    … …  
    156155    $(PATH_LIBC_SRC)/libc/misc/386/uldiv.s \
    157156
     157libc_libc_misc_SOURCES.os2 = \
     158    $(PATH_LIBC_SRC)/libc/misc/sysctl_os2.c \
     159
    158160# configure the variants. */
    159161$(call LIBC_CONFIG_VARIANT_LIBS,libc_libc_misc)

  • trunk/libc/src/libc/misc/sysctl_mib.c

    r1931 r2717  
    5858/* start the set. */
    5959asm (".stabs  \"___libc_sysctl_set__\", 21, 0, 0, 0xffffffff\n");
     60#ifdef __OS2__
    6061/* hack to drag in sysctl_os2.c */
    6162asm (".stabs \"___libc_sysctl__os2_children\",1,0,0,0\n"); /* (extrn) */
     63#endif
    6264
    6365SYSCTL_NODE(, 0,          sysctl, CTLFLAG_RW, 0,

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

    r2702 r2717  
    3434libc_libc_process_TEMPLATE = libcsub
    3535libc_libc_process_SOURCES = \
    36     $(PATH_LIBC_SRC)/libc/process/beginthr.c \
    3736    $(PATH_LIBC_SRC)/libc/process/bsd_signal.c \
    3837    $(PATH_LIBC_SRC)/libc/process/execl.c \
    … …  
    4443    $(PATH_LIBC_SRC)/libc/process/execvp.c \
    4544    $(PATH_LIBC_SRC)/libc/process/execvpe.c \
    46     $(PATH_LIBC_SRC)/libc/process/fmutex.c \
    47     $(PATH_LIBC_SRC)/libc/process/fmutex2.c \
    4845    $(PATH_LIBC_SRC)/libc/process/fork.c \
    4946    $(PATH_LIBC_SRC)/libc/process/getitimer.c \
    … …  
    9188    $(PATH_LIBC_SRC)/libc/process/sigwait.c \
    9289    $(PATH_LIBC_SRC)/libc/process/sigwaitinfo.c \
    93     $(PATH_LIBC_SRC)/libc/process/smutex.c \
    9490    $(PATH_LIBC_SRC)/libc/process/spawnl.c \
    9591    $(PATH_LIBC_SRC)/libc/process/spawnle.c \
    … …  
    119115    $(PATH_LIBC_SRC)/libc/process/386/_errno.s
    120116
     117libc_libc_process_SOURCES.os2 = \
     118    $(PATH_LIBC_SRC)/libc/process/beginthr.c \
     119    $(PATH_LIBC_SRC)/libc/process/smutex.c \
     120    $(PATH_LIBC_SRC)/libc/process/fmutex.c \
     121    $(PATH_LIBC_SRC)/libc/process/fmutex2.c \
     122
     123
    121124# configure the variants. */
    122125$(call LIBC_CONFIG_VARIANT_LIBS,libc_libc_process)

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

    r2702 r2717  
    3636    $(PATH_LIBC_SRC)/libc/startup/cleanup.c \
    3737    $(PATH_LIBC_SRC)/libc/startup/ctor1.c \
    38     $(PATH_LIBC_SRC)/libc/startup/dllinit.c \
    3938    $(PATH_LIBC_SRC)/libc/startup/dtor1.c \
    4039    $(PATH_LIBC_SRC)/libc/startup/exit.c \
    4140    $(PATH_LIBC_SRC)/libc/startup/startup.c \
    4241    $(PATH_LIBC_SRC)/libc/startup/_exit.c \
     42
     43libc_libc_startup_SOURCES.os2 = \
     44    $(PATH_LIBC_SRC)/libc/startup/os2/dllinit-os2.c \
    4345
    4446libc_libc_startup_SOURCES.x86 = \

  • trunk/libc/src/libc/str/memicmp.c

    r1454 r2717  
    88*/
    99
    10 #define INCL_FSMACROS
    11 #include <os2emx.h>
     10#ifdef __OS2__
     11# define INCL_FSMACROS
     12# include <os2emx.h>
     13#else
     14# define FS_VAR()       do {} while (0)
     15# define FS_SAVE_LOAD() do {} while (0)
     16# define FS_RESTORE()   do {} while (0)
     17#endif
    1218#include "libc-alias.h"
    1319#include <InnoTekLIBC/locale.h>
    … …  
    3642      int d;
    3743
     44#ifdef __OS2__ /** @todo locale */
    3845      if (IS_MBCS_PREFIX (&__libc_GLocaleCtype, c1)
    3946       || IS_MBCS_PREFIX (&__libc_GLocaleCtype, c2))
    … …  
    5865      }
    5966      else
     67#endif
    6068        d = __libc_GLocaleCtype.auchLower [c1] - __libc_GLocaleCtype.auchLower [c2];
    6169      if (d)
    … …  
    8997  /* This point never reached */
    9098}
     99

  • trunk/libc/src/libc/str/strcoll.c

    r1454 r2717  
    1010*/
    1111
    12 #define INCL_FSMACROS
    13 #include <os2emx.h>
     12#ifdef __OS2__
     13# define INCL_FSMACROS
     14# include <os2emx.h>
     15#else
     16# define FS_VAR()       do {} while (0)
     17# define FS_SAVE_LOAD() do {} while (0)
     18# define FS_RESTORE()   do {} while (0)
     19#endif
    1420#include "libc-alias.h"
    1521#include <InnoTekLIBC/locale.h>
    … …  
    3238    for (;;)
    3339    {
     40#ifdef __OS2__ /** @todo locale */
    3441      if (IS_MBCS_PREFIX (&__libc_gLocaleCollate, c1)
    3542       || IS_MBCS_PREFIX (&__libc_gLocaleCollate, c2))
    … …  
    6370        return d;
    6471      }
     72#endif
    6573
    6674      d = __libc_gLocaleCollate.auchWeight [c1] - __libc_gLocaleCollate.auchWeight [c2];

  • trunk/libc/src/libc/str/stricmp.c

    r1454 r2717  
    88*/
    99
    10 #define INCL_FSMACROS
    11 #include <os2emx.h>
     10#ifdef __OS2__ /** @todo locale */
     11# define INCL_FSMACROS
     12# include <os2emx.h>
     13#else
     14# define FS_VAR()       do {} while (0)
     15# define FS_SAVE_LOAD() do {} while (0)
     16# define FS_RESTORE()   do {} while (0)
     17#endif
    1218#include "libc-alias.h"
    1319#include <InnoTekLIBC/locale.h>
    … …  
    3238      int d;
    3339
     40#ifdef __OS2__ /** @todo locale */
    3441      if (IS_MBCS_PREFIX (&__libc_GLocaleCtype, c1)
    3542       || IS_MBCS_PREFIX (&__libc_GLocaleCtype, c2))
    … …  
    5360      }
    5461      else
     62#endif
    5563        d = __libc_GLocaleCtype.auchLower [c1] - __libc_GLocaleCtype.auchLower [c2];
    5664

  • trunk/libc/src/libc/str/strlwr.c

    r1454 r2717  
    88*/
    99
    10 #define INCL_FSMACROS
    11 #include <os2emx.h>
     10#ifdef __OS2__ /** @todo locale */
     11# define INCL_FSMACROS
     12# include <os2emx.h>
     13#endif
    1214#include "libc-alias.h"
    1315#include <InnoTekLIBC/locale.h>
    1416#include <string.h>
    1517
     18#ifdef __OS2__ /** @todo locale */
    1619static int __uni_strlwr (UniChar *ucs, void *arg)
    1720{
    … …  
    2225  return 1;
    2326}
     27#endif
    2428
    2529char *_STD(strlwr) (char *string)
    … …  
    3236    while ((c = *s))
    3337    {
     38#ifdef __OS2__ /** @todo locale */
    3439      if (IS_MBCS_PREFIX (&__libc_GLocaleCtype, c))
    3540      {
    … …  
    4348        break;
    4449      }
     50#endif
    4551      *s++ = __libc_GLocaleCtype.auchLower [c];
    4652    }

  • trunk/libc/src/libc/str/strnicmp.c

    r1454 r2717  
    99*/
    1010
    11 #define INCL_FSMACROS
    12 #include <os2emx.h>
     11#ifdef __OS2__ /** @todo locale */
     12# define INCL_FSMACROS
     13# include <os2emx.h>
     14#else
     15# define FS_VAR()       do {} while (0)
     16# define FS_SAVE_LOAD() do {} while (0)
     17# define FS_RESTORE()   do {} while (0)
     18#endif
    1319#include "libc-alias.h"
    1420#include <stddef.h>
    … …  
    3642      int d;
    3743
     44#ifdef __OS2__ /** @todo locale */
    3845      if (IS_MBCS_PREFIX (&__libc_GLocaleCtype, c1)
    3946       || IS_MBCS_PREFIX (&__libc_GLocaleCtype, c2))
    … …  
    5865      }
    5966      else
     67#endif
    6068        d = __libc_GLocaleCtype.auchLower [c1] - __libc_GLocaleCtype.auchLower [c2];
    6169      if (d || !c1 || !c2)
    … …  
    8997  /* This point never reached */
    9098}
     99

  • trunk/libc/src/libc/str/strupr.c

    r1454 r2717  
    88*/
    99
    10 #define INCL_FSMACROS
    11 #include <os2emx.h>
     10#ifdef __OS2__ /** @todo locale */
     11# define INCL_FSMACROS
     12# include <os2emx.h>
     13#endif
    1214#include "libc-alias.h"
    1315#include <InnoTekLIBC/locale.h>
    1416#include <string.h>
    1517
     18#ifdef __OS2__ /** @todo locale */
    1619static int __uni_strupr (UniChar *ucs, void *arg)
    1720{
    … …  
    2225  return 1;
    2326}
     27#endif
    2428
    2529char *_STD(strupr) (char *string)
    … …  
    3236    while ((c = *s))
    3337    {
     38#ifdef __OS2__ /** @todo locale */
    3439      if (IS_MBCS_PREFIX (&__libc_GLocaleCtype, c))
    3540      {
    … …  
    4348        break;
    4449      }
     50#endif
    4551      *s++ = __libc_GLocaleCtype.auchUpper [c];
    4652    }
    … …  
    5258  return string;
    5359}
     60

  • trunk/libc/src/libc/str/strxfrm.c

    r2066 r2717  
    1010*/
    1111
    12 #define INCL_FSMACROS
    13 #include <os2emx.h>
     12#ifdef __OS2__ /** @todo locale */
     13# define INCL_FSMACROS
     14# include <os2emx.h>
     15#endif
    1416#include "libc-alias.h"
    1517#include <InnoTekLIBC/locale.h>
    … …  
    1719#include <string.h>
    1820
     21#ifdef __OS2__ /** @todo locale */
    1922struct __strxfrm_arg
    2023{
    … …  
    6770    return 0;
    6871}
     72#endif
    6973
    7074/* Copy s2 to s1, applying the collate transform. */
    7175size_t _STD(strxfrm) (char *s1, const char *s2, size_t size)
    7276{
     77#ifdef __OS2__ /** @todo locale */
    7378    if (__libc_gLocaleCollate.mbcs)
    7479    {
    … …  
    8792        return x.size;
    8893    }
     94#endif
    8995
    9096    /* buffer size query */
    … …  
    111117    return psz - s2;
    112118}
     119

  • trunk/libc/src/libc/time/timetabs_gen.c

    r2682 r2717  
    7171    return 0;
    7272}
     73

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

    r2712 r2717  
    2929SUB_DEPTH = ../..
    3030include $(PATH_KBUILD)/subheader.kmk
    31 
     31ifeq ($(BUILD_TARGET),os2)
    3232
    3333#
    … …  
    139139        $(filter-out %-data.imp,$(wildcard $(PATH_LIBC_SRC)/libos2/*.imp))
    140140
    141 
     141endif # BUILD_TARGET == os2
    142142# generate rules
    143143include $(PATH_KBUILD)/subfooter.kmk

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

    r2715 r2717  
    2929SUB_DEPTH = ../..
    3030include $(PATH_KBUILD)/subheader.kmk
     31ifeq ($(BUILD_TARGET),os2)
    3132
    3233#
    … …  
    128129
    129130
    130 # posixerate rules
     131endif # BUILD_TARGET == os2
     132# generate rules
    131133include $(PATH_KBUILD)/subfooter.kmk
    132134

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

    r2715 r2717  
    2929SUB_DEPTH = ../..
    3030include $(PATH_KBUILD)/subheader.kmk
     31ifeq ($(BUILD_TARGET),os2)
    3132
    3233#
    … …  
    5758
    5859
    59 # posixerate rules
     60endif # BUILD_TARGET == os2
     61# generate rules
    6062include $(PATH_KBUILD)/subfooter.kmk
    6163
Note: See TracChangeset for help on using the changeset viewer.