Changeset 1156

Timestamp:

Feb 4, 2004, 9:54:19 PM (22 years ago)

Author:

bird

Message:

Added logging facilities. LIBCXY.logchk

Location:

trunk/src/emx/src/lib

Files:

• libc.def (modified) (1 diff, 1 prop)
• libc.smak (modified) (8 diffs, 1 prop)

trunk/src/emx/src/lib/libc.def

@@ -1011 +1011 @@
     "___strndup" @1038
     "___strnlen" @1039
+    "___libc_LogEnter" @1040
+    "___libc_LogLeave" @1041
+    "___libc_LogMsg" @1042

trunk/src/emx/src/lib/libc.smak

@@ -31 +31 @@
 .TCF    := -I$. -D__DBINTERFACE_PRIVATE -D__NETBSD_SYSCALLS -DPOSIX_MISTAKE -DHAVE_CONFIG_H -Isrc/lib/bsd/locale -Isrc/lib/lgpl/include
 .INSDIR = lib/
+.TKEEP  := 1
+include mklib.smak
+
+.TARGET := libc_l.a
+.TKIND  := aout log
 .TKEEP  := 1
 include mklib.smak
@@ -70 +75 @@
 LIBC.ELH.DEPS   := $(LIBC.DEPS)
 LIBC.ELH.DIRS   :=
+
+LIBC.LOG.DLL    := $(LIBC.DLL:.dll=.logchk)
+LIBC.LOG.DEF    := $(LIBC.DEF)
+LIBC.LOG.OBJS   := $.omf/src/lib/startup/dll0hi.obj $.omf/src/lib/startup/dllinit.obj
+LIBC.LOG.LIBS   := $.omf-log/libc_l.lib $.omf-log/libc_app_l.lib
+LIBC.LOG.DEPS   := $(LIBC.DEPS)
+LIBC.LOG.DIRS   := $(sort $(dir $(LIBC.LOG.OBJS) $(LIBC.LOG.DEPS))) $.omf-log/
+
                                                 
-TARGDIRS        += $(LIBC.DIRS) $(LIBC.PRF.DIRS) $(LIBC.ELH.DIRS)
+TARGDIRS        += $(LIBC.DIRS) $(LIBC.PRF.DIRS) $(LIBC.ELH.DIRS) $(LIBC.LOG.DIRS)
 
                         
@@ -105 +118 @@
         $(if $(findstring .lib,$@), $(EMXOMF) -o $.omf/src/lib/startup/dllinit.obj $.aout/src/lib/startup/dllinit.o)
         $(AR) r $@ $(if $(findstring .lib,$@), $.omf/src/lib/startup/dllinit.obj, $.aout/src/lib/startup/dllinit.o)
+
+# LIBC.LOG - Logging and checking version of libcXY.dll
+$(LIBC.LOG.DLL): $(LIBC.LOG.OBJS) $(LIBC.LOG.LIBS) $(LIBC.LOG.DEF) $(LIBC.LOG.DEPS)
+        $(LD) -o $@ -Zomf $(subst -s,,$(LDFLAGS.DLL)) -Zmap=$@.map -nostdlib  \
+            $(LIBC.LOG.DEF) \
+                $(LIBC.LOG.OBJS) \
+                $(LIBC.LOG.LIBS) \
+                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend $(LIBC.STUBARG)
+        echo $@         
 
 # LIBC.PRF - Profiling version of libcXY.dll
@@ -208 +230 @@
         @$(call FECHO,$@,"  __um_regular_heap                      = KLIBDBG._gcc__um_regular_heap")
         @$(call FECHO,$@,"  __um_tiled_heap                = KLIBDBG._gcc__um_tiled_heap")
-        
+
                                         
 # Put libc into the big picture. (semihacks)
@@ -217 +239 @@
 libc-dll: emxbind emxexp app alias libc os2 os2@omf \
                         $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB) \
+                        $(LIBC.LOG.DIRS) $(LIBC.LOG.DLL) \
                         $(LIBC.PRF.DIRS) $(LIBC.PRF.DLL) \
                         $(LIBC.ELH.DIRS) $(LIBC.ELH.DLL)
@@ -223 +246 @@
 INS.FILES       += $(INS)lib/$(notdir $(LIBC.DLL)) \
   $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB))) \
+  $(INS)lib/$(notdir $(LIBC.LOG.DLL)) \
   $(INS)lib/$(notdir $(LIBC.PRF.DLL)) \
   $(INS)lib/$(notdir $(LIBC.ELH.DLL))
@@ -229 +253 @@
         $(call CP,$<,$@)
         
+$(INS)lib/$(notdir $(LIBC.LOG.DLL)): $(LIBC.LOG.DLL)
+        $(call CP,$<,$@)
+                                                
 $(INS)lib/$(notdir $(LIBC.PRF.DLL)): $(LIBC.PRF.DLL)
         $(call CP,$<,$@)
@@ -234 +261 @@
 $(INS)lib/$(notdir $(LIBC.ELH.DLL)): $(LIBC.ELH.DLL)
         $(call CP,$<,$@)
-                                                
+
 ifeq ($(MODE),opt)
 INS.FILES       += $(INS)lib/$(notdir $(LIBC.DLL:.dll=.dbg))