Changeset 2683

Timestamp:

Mar 21, 2006, 4:28:58 AM (19 years ago)

Author:

bird

Message:

Aliases and _STD.

Location:

trunk/libc

Files:

• Makefile.kmk (modified) (5 diffs)
• alias.kmk (added)
• aliasbsdfuncs.awk (moved) (moved from trunk/libc/src/libc/alias/aliasbsdfuncs.awk ) (2 diffs)
• aliasfuncs.awk (moved) (moved from trunk/libc/src/libc/alias/aliasfuncs.awk ) (2 diffs)
• aliasgnufuncs.awk (moved) (moved from trunk/libc/src/libc/alias/aliasgnufuncs.awk ) (2 diffs)
• mkstd.awk (moved) (moved from trunk/libc/src/libc/mkstd.awk )

trunk/libc/Makefile.kmk

@@ -36 +36 @@
         arithchk
 
-LIBRARIES = \
+xLIBRARIES = \
         msun \
         glibc \
@@ -49 +49 @@
 INSTALLS = \
         headers \
-        startupobjs
+        startupobjs \
+        libc_alias
 
 #
@@ -68 +69 @@
         IN_INNOTEK_LIBC \
         __IN_INNOTEK_LIBC__
-
-
+        
 #
 # The source files making up the libc part.
@@ -1716 +1716 @@
         $(foreach hdr, $(wildcard include/sys/*.h), $(hdr)=>$(subst include/,,$(hdr))) \
 
-
+                                                        
+#
+# libc_alias - The alias lib is special, see alias.kmk.
+#
+libc_alias_TEMPLATE = usr.lib
+libc_alias_SOURCES = \
+        $(PATH_TARGET)/libc_alias/libc_alias.a
+
+                                                        
+# Let kBuild generate rules.
 include $(PATH_KBUILD)/footer.kmk
 
-
-#
-# Generate the STD wrappers.
-#
-$(PATH_TARGET)/libc-std.h:
-        > $@
 
 #
@@ -1738 +1741 @@
         $< $@
 
+#
+# Generate the STD wrappers.
+#
+_STD_SOURCE_EXTRAS := \
+        src/msun/std-complex.c \
+        src/msun/std-math.c
+_STD_SOURCE_VARS := \
+        libclibc_SOURCES \
+        libclibc_SOURCES.$(BUILD_TARGET) \
+        libclibc_SOURCES.$(BUILD_TARGET_ARCH) \
+        libclibc_SOURCES.$(BUILD_TARGET_CPU) \
+        \
+        fbsdlibc_SOURCES \
+        fbsdlibc_SOURCES.$(BUILD_TARGET) \
+        fbsdlibc_SOURCES.$(BUILD_TARGET_ARCH) \
+        fbsdlibc_SOURCES.$(BUILD_TARGET_CPU) \
+        \
+        glibc_SOURCES \
+        glibc_SOURCES.$(BUILD_TARGET) \
+        glibc_SOURCES.$(BUILD_TARGET_ARCH) \
+        glibc_SOURCES.$(BUILD_TARGET_CPU) \
+        \
+        msun_SOURCES \
+        \
+        b_knix_os2_SOURCES \
+        b_knix_os2_SOURCES.$(BUILD_TARGET) \
+        b_knix_os2_SOURCES.$(BUILD_TARGET_ARCH) \
+        b_knix_os2_SOURCES.$(BUILD_TARGET_CPU)
+## @todo the backend must be removed!
+# We're creating a timestamp file early on in the build process.
+# (std-update is a phony target for doing this.)
+$(PATH_TARGET)/libc-std.ts std-update: $(foreach var, $(_STD_SOURCE_VARS), $($(var))) $(_STD_SOURCE_EXTRAS)
+        $(RM) -f $(PATH_TARGET)/libc-std.ts $(PATH_TARGET)/libc-std.files $(PATH_TARGET)/libc-std.tmp.h
+        $(foreach src, $^\
+                ,$(NL)$(TAB)@$(APPEND) $(PATH_TARGET)/libc-std.files "$(src)")
+        gawk -f ./mkstd.awk @$(PATH_TARGET)/libc-std.files > $(PATH_TARGET)/libc-std.tmp.h
+        if diff $(PATH_TARGET)/libc-std.tmp.h $(PATH_TARGET)/libc-std.h > /dev/null 2> /dev/null; then \
+                cp $(PATH_TARGET)/libc-std.tmp.h $(PATH_TARGET)/libc-std.h; \
+                echo "* libc-std.h updated"; \
+        else \
+                echo "* libc-std.h unchanged"; \
+        fi
+        $(APPEND) $(PATH_TARGET)/libc-std.ts done
+
+#
+# Create non-existing libc-std.h.
+#
+$(PATH_TARGET)/libc-std.h:
+        $(MAKE) std-update
+
+#
+# Generate the aliases.
+#
+$(PATH_TARGET)/libc_alias.a: $(PATH_TARGET)/libc-std.h
+        $(MAKE) -f alias.kmk libraries
+

trunk/libc/aliasbsdfuncs.awk

@@ -4 +4 @@
 #
 # ARG1: path to libc-std.h
-# ARG2: "" or "_".
 #
 
 BEGIN {
-  fn = ARGV [1]"libc-std.h";
-  want_underscore = (ARGV [2] == "_");
+  fn = ARGV [1];
 
   while ((getline < fn) > 0)
@@ -26 +24 @@
          fun2 = substr(fun2, 1, par - 1);
 
-       print fun " " fun2 " "
+       print fun "=" fun2 " "
     }
 

trunk/libc/aliasfuncs.awk

@@ -8 +8 @@
 
 BEGIN {
-  fn = ARGV [1]"libc-std.h";
+  fn = ARGV [1];
   want_underscore = (ARGV [2] == "_");
 
@@ -22 +22 @@
       has_underscore = (substr(fun, 1, 1) == "_");
       if (has_underscore == want_underscore)
-        print has_underscore ? substr(fun, 2) : fun;
+      {
+        if (has_underscore)
+           fun = substr(fun, 2);
+        if (want_underscore)
+          print "_" fun "=_std_" fun;
+        else
+          print "" fun "=_std_" fun;
+      }
     }
 

trunk/libc/aliasgnufuncs.awk

@@ -8 +8 @@
 
 BEGIN {
-  fn = ARGV [1]"libc-std.h";
+  fn = ARGV [1];
   want_underscore = (ARGV [2] == "_");
 
@@ -26 +26 @@
          fun2 = substr(fun2, 1, par - 1);
 
-       print fun " " fun2 " "
+       print fun "=" fun2 " "
     }