Changeset 446

Timestamp:

Jul 25, 2003, 8:46:22 PM (22 years ago)

Author:

bird

Message:

libcXY.prf - Profiler version of the library.

File:

• trunk/src/emx/src/lib/libc.smak (modified) (5 diffs, 1 prop)

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

@@ -47 +47 @@
 .TKIND          := omf
 LIBC.DLL        := $.omf/libc$(VH)$(VM).dll
+LIBC.IMPLIB     := $.omf/c_dll.lib $.aout/c_dll.a
 LIBC.DEF        := $.omf/libc.def
-LIBC.IMPLIB     := $.omf/c_dll.lib $.aout/c_dll.a
 LIBC.OBJS       := $.omf/src/lib/startup/386/dll0.obj $.omf/src/lib/startup/dllinit.obj
 LIBC.LIBS       := $.omf/c.lib $.omf/c_app.lib
 LIBC.DEPS       := $.omf/os2stub.bin
 LIBC.DLL.OBJS   := 
-LIBC.DIRS       := $(sort $(dir $(.OBJS) $(.DEPS) $(LIBC.DLL.OBJS)))
-TARGDIRS        += $(LIBC.DIRS)
+LIBC.DIRS       := $(sort $(dir $(LIBC.OBJS) $(LIBC.DEPS) $(LIBC.DLL.OBJS)))
+
+LIBC.PRF.DLL    := $(LIBC.DLL:.dll=.prf)
+LIBC.PRF.DEF    := $.omf/libc.prf.def
+LIBC.PRF.OBJS   := $.omf/src/lib/startup/386/dll0.obj $.omf-prof/src/lib/startup/dllinit.obj
+LIBC.PRF.LIBS   := $.omf-prof/c_p.lib $.omf-prof/c_app_p.lib
+LIBC.PRF.DEPS   := $(LIBC.DEPS)
+LIBC.PRF.DIRS   := $(sort $(dir $(LIBC.PRF.OBJS) $(LIBC.PRF.DEPS)))
+
+TARGDIRS        += $(LIBC.DIRS) $(LIBC.PRF.DIRS)
 
                         
 # LIBC linking.
-#$(LIBC.DLL): $.omf/src/lib/startup/386/dll0.obj $.omf/src/lib/startup/386/dll0.obj $(.OBJS) $(.DEPS) $(LIBC.DLL.OBJS) $(LIBC.DEF)
 $(LIBC.DLL): $(LIBC.OBJS) $(LIBC.LIBS) $(LIBC.DEF) $(LIBC.DEPS)
         $(LD) -o $(@:.dll=.dbg) -Zomf $(subst -s,,$(LDFLAGS.DLL)) -nostdlib  \
@@ -66 +73 @@
                 -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend \
                 -Zlinker -STUB:$.omf/os2stub.bin
-                
 ifeq ($(MODE),opt)
         cp $(@:.dll=.dbg) $@
@@ -93 +99 @@
         $(AR) r $@ $(if $(findstring .lib,$@), $.omf/src/lib/startup/dllinit.obj, $.aout/src/lib/startup/dllinit.o)
         
+
+# LIBC.PRF - Profiling version of libcXY.dll
+## @todo: use os2_p, but that appeares to be broken at the moment.
+$(LIBC.PRF.DLL): $(LIBC.PRF.OBJS) $(LIBC.PRF.LIBS) $(LIBC.PRF.DEF) $(LIBC.PRF.DEPS)
+        $(LD) -o $@ -Zomf $(subst -s,,$(LDFLAGS.DLL)) -nostdlib  \
+            $(LIBC.PRF.DEF) \
+                $(LIBC.PRF.OBJS) \
+                $(LIBC.PRF.LIBS) \
+                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend \
+                -Zlinker -STUB:$.omf/os2stub.bin
+        echo $@         
+
+# LIBC .def file (two steps).
+$(LIBC.PRF.DEF): $(LIBC.DEF)
+        $(call RM,$@)
+        cp $< $@
+        @$(call FECHO,$@,"   __mcount @99")
+        @$(call FECHO,$@,"")
+        @$(call FECHO,$@,"IMPORTS");
+        @$(call FECHO,$@," __mcount = KPROFILE.3")
+        @$(call FECHO,$@,"")
+
         
 # Put libc into the big picture. (semihacks)
@@ -99 +127 @@
 .PHONY: libc-dll
 all: libc-dll
-libc-dll: emxbind emxexp app alias libc os2 $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB)
+libc-dll: emxbind emxexp app alias libc os2 \
+                        $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB) \
+                        $(LIBC.PRF.DIRS) $(LIBC.PRF.DLL)
 
 # Installation.
 INS.FILES       += $(INS)lib/$(notdir $(LIBC.DLL)) \
   $(INS)lib/$(notdir $(LIBC.DLL:.dll=.dbg)) \
-  $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB)))
+  $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB))) \
+  $(INS)lib/$(notdir $(LIBC.PRF.DLL)) 
 
 $(INS)lib/$(notdir $(LIBC.DLL)): $(LIBC.DLL)
+        $(call CP,$<,$@)
+        
+$(INS)lib/$(notdir $(LIBC.PRF.DLL)): $(LIBC.PRF.DLL)
         $(call CP,$<,$@)
 
@@ -130 +164 @@
         $(call TOUCH,$@)
 
+# dependencies to help make (baka, baka, baka)
+$.omf-prof/src/lib/startup/dllinit.obj: $.aout-prof/src/lib/startup/dllinit.o
+        $(DO.EMXOMF)
+                        
 # Forget temporary variables
 include comend.smak