Changeset 2716 for trunk/libc/Makefile.kmk

Timestamp:

Jul 16, 2006, 5:35:51 AM (19 years ago)

Author:

bird

Message:

Fixed two installation bugs. Configured the .profiled.dll and .logstrict.dll. (untested)

File:

• trunk/libc/Makefile.kmk (modified) (3 diffs)

trunk/libc/Makefile.kmk

@@ -119 +119 @@
 #
 DLLS += libc07
+libc07_TEMPLATE = libc
 libc07_TOOL = GCC3
 libc07_TOOL.os2 = GCC3OMF
@@ -135 +136 @@
         lazyimp \
         end
-## @todo lazy importing uconv and libuni!
+
+ifdef CFG_LIBC_LOGSTRICT_LIBS
+libc07.logstrict_TEMPLATE = libc.logstrict
+libc07.logstrict_TOOL = GCC3
+libc07.logstrict_TOOL.os2 = GCC3OMF
+libc07.logstrict_SOURCES = \
+        $(PATH_TARGET)/dll0hi.obj \
+        $(PATH_TARGET)/libc.def
+libc07.logstrict_LDFLAGS = -g -Zomf -nostdlib
+libc07.logstrict_LIBS = \
+        $(TARGET_libc_l) \
+        $(TARGET_libc_asm_l) \
+        $(TARGET_libos2_unicode_lazy) \
+        $(TARGET_libos2_l) \
+        $(PATH_TARGET)/libc_alias/libc_alias.a \
+        gcc \
+        gcc_eh \
+        lazyimp \
+        end
+endif
+
+ifdef CFG_LIBC_PROFILED_LIBS
+libc07.profiled_TEMPLATE = libc.profiled
+libc07.profiled_TOOL = GCC3
+libc07.profiled_TOOL.os2 = GCC3OMF
+libc07.profiled_SOURCES = \
+        $(PATH_TARGET)/dll0hi.obj \
+        $(PATH_TARGET)/libc.profiled.def
+libc07.profiled_LDFLAGS = -g -Zomf -nostdlib
+libc07.profiled_LIBS = \
+        $(TARGET_libc_p) \
+        $(TARGET_libc_asm_p) \
+        $(TARGET_libos2_unicode_lazy) \
+        $(TARGET_libos2_p) \
+        $(PATH_TARGET)/libc_alias/libc_alias.a \
+        gcc \
+        gcc_eh \
+        lazyimp \
+        end
+## @todo fix the .def file.
+## @todo Use kProfile2.
+endif
+## @todo electric fence heap
 
 #
@@ -163 +206 @@
         cmd /c " $(PATH_LIBC_SRC)/libc/dlllegacy.cmd -e "_DLL_InitTerm" $@.tmp.def $(PATH_LIBC_SRC)/libc/libc.def "
         $(MV) -f $@.tmp.def $@
+
+ifdef CFG_LIBC_PROFILED_LIBS
+$(PATH_TARGET)/libc.profiled.def: $(PATH_TARGET)/libc.def
+        $(RM) -f $@ $@.tmp
+        $(CP) $< $@.tmp
+        $(APPEND) $@.tmp ""
+        $(APPEND) $@.tmp "IMPORTS"
+        $(APPEND) $@.tmp " __mcount = KPROFILE.3"
+        $(APPEND) $@.tmp ""
+        $(MV) -f $@.tmp $@
+endif