Changeset 1079

Timestamp:

Jan 25, 2004, 11:16:10 PM (22 years ago)

Author:

bird

Message:

GNU aliases.

Location:

trunk/src/emx/src/lib

Files:

• alias/alias.smak (modified) (1 diff, 1 prop)
• alias/aliasbsdfuncs.awk (modified) (1 diff, 1 prop)
• alias/aliasgnufuncs.awk (added)
• libc.smak (modified) (1 diff, 1 prop)
• mkstd.awk (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/alias/alias.smak

@@ -16 +16 @@
 ALIAS._FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk $. _)
 # list of alias pairs:
-ALIAS.ALIASES = $(shell gawk -f src/lib/alias/aliasbsdfuncs.awk $.) \
+ALIAS.ALIASES = $(shell gawk -f src/lib/alias/aliasbsdfuncs.awk $.) $(shell gawk -f src/lib/alias/aliasgnufuncs.awk $.) \
         strcasecmp              _std_stricmp \
         strncasecmp     _std_strnicmp \

trunk/src/emx/src/lib/alias/aliasbsdfuncs.awk

@@ -12 +12 @@
 
   while ((getline < fn) > 0)
-    if (match($0, "_BSDALIAS\\(") != 0)
+    if (match($0, "_GNUALIAS\\(") != 0)
     {
        blank = match($0, " ");

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

@@ -250 +250 @@
 # files for _STD() macros invocations. Fortunately, gawk rulez forever thus
 # this happens in just a fraction of second.
-$.stmp-libc-std: $(wildcard src/lib/*/*.c src/lib/*/386/*.s src/lib/bsd/*/*.c)
+$.stmp-libc-std: $(wildcard src/lib/*/*.c src/lib/*/386/*.s src/lib/bsd/*/*.c src/lib/lgpl/*/*.c)
         gawk -f src/lib/mkstd.awk $^ >__tmp__
         $(call UPDATE,__tmp__,$.libc-std.h)

trunk/src/emx/src/lib/mkstd.awk

@@ -30 +30 @@
   {
     fun2 = bsd_aliases[fun];
-    print "/*#define " fun2 " _BSDALIAS(" fun ")*/"
+    if (!(fun2 in std_fun))
+      print "/*#define " fun2 " _BSDALIAS(" fun ")*/"
+  }
+
+  print ""
+  print "/* GNU aliasing */"
+  for (fun in gnu_aliases)
+  {
+    fun2 = gnu_aliases[fun];
+    if (!(fun2 in std_fun))
+      print "/*#define " fun2 " _GNUALIAS(" fun ")*/"
   }
 
@@ -59 +69 @@
     fun1 = gensub("__weak_alias\\( *([_0-9A-Za-z]+) *, *[_0-9A-Za-z]+ *\\).*", "\\1", "", substr($0,RSTART,RLENGTH));
     fun2 = gensub("__weak_alias\\( *[_0-9A-Za-z]+ *, *([_0-9A-Za-z]+) *\\).*", "\\1", "", substr($0,RSTART,RLENGTH));
-    bsd_aliases[fun1] = fun2;
+    bsd_aliases[fun2] = fun1;
     $0 = substr($0, 1, RSTART-1) substr($0, RSTART+RLENGTH);
   }
 }
+
+/^[^_0-9A-Za-z]*weak_alias *\( *[_0-9A-Za-z]+ *, *[_0-9A-Za-z]+ *\)/{
+  while (match($0, "weak_alias *\\( *[_0-9A-Za-z ]+ *, *[_0-9A-Za-z ]+ *\\)"))
+  {
+    fun1 = gensub("weak_alias *\\( *([_0-9A-Za-z]+) *, *[_0-9A-Za-z]+ *\\).*", "\\1", "", substr($0,RSTART,RLENGTH));
+    fun2 = gensub("weak_alias *\\( *[_0-9A-Za-z]+ *, *([_0-9A-Za-z]+) *\\).*", "\\1", "", substr($0,RSTART,RLENGTH));
+    gnu_aliases[fun1] = fun2;
+    $0 = substr($0, 1, RSTART-1) substr($0, RSTART+RLENGTH);
+  }
+}
+