Changeset 929

Timestamp:

Jan 2, 2004, 8:26:15 PM (22 years ago)

Author:

bird

Message:

Added 'BSD' aliases.

Location:

trunk/src/emx/src

Files:

• include/libc_private.h (modified) (1 diff, 1 prop)
• include/namespace.h (modified) (1 diff, 1 prop)
• include/un-namespace.h (modified) (1 diff, 1 prop)
• lib/alias/alias.smak (modified) (3 diffs, 1 prop)
• lib/alias/aliasbsdfuncs.awk (added)
• lib/mkstd.awk (modified) (3 diffs, 1 prop)

trunk/src/emx/src/include/libc_private.h

@@ -1 +1 @@
 /* placeholder */
+extern const char *__progname;
+

trunk/src/emx/src/include/namespace.h

@@ -6 +6 @@
 #define _NAMESPACE_H_
 #include "libc-alias.h"
+/* kill these as they're handles by alias/aliasbsdfuncs.awk */
+#define __weak_reference(a,b)
+#define __make_alias(a,b)
+
+#define err _err
+#define warn _warn
+#define getprogname _getprogname
 #endif
 

trunk/src/emx/src/include/un-namespace.h

@@ -6 +6 @@
 #ifndef _UN_NAMESPACE_H_
 #define _UN_NAMESPACE_H_
+
+#undef err
+#undef warn
+#undef getprogname
+
 #endif
 

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

@@ -15 +15 @@
 ALIAS.FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk $.)
 ALIAS._FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk $. _)
+# list of alias pairs:
+ALIAS.ALIASES = $(shell gawk -f src/lib/alias/aliasbsdfuncs.awk $.) \
+        _strcasecmp     __std_stricmp \
+        _strncasecmp    __std_strnicmp \
+        _itoa                   __std_ltoa \
+        __itoa                  __std_ltoa \
+        __Exit                  __exit
 
 DO.STDALIAS = \
@@ -30 +37 @@
         $(call RM,$.aliases/*.o)
         $(call RM,$.aliases/*.s)
-        @$(call DO.STDALIAS,_strcasecmp,__std_stricmp,$.aliases/strcasecmp.o)
-        @$(call DO.STDALIAS,_strncasecmp,__std_strnicmp,$.aliases/strncasecmp.o)
-        @$(call DO.STDALIAS,_itoa,__std_ltoa,$.aliases/itoa.o)
-        @$(call DO.STDALIAS,__itoa,__std_ltoa,$.aliases/_itoa.o)
-        @$(call DO.STDALIAS,__Exit,__exit,$.aliases/__Exit.o)
         for i in $(ALIAS.FUNCS); do \
                 echo "Aliasing _$$i to __std_$$i ..."; \
@@ -49 +51 @@
                 fi \
         done
+        fun2=; \
+        for fun in $(ALIAS.ALIASES); do \
+            if test -z "$$fun2"; then \
+                        fun2=$$fun; \
+                else \
+                        echo "Aliasing $$fun to $$fun2 ..."; \
+                        echo ".stabs \"_$$fun\",11,0,0,0;.stabs \"_$$fun2\",1,0,0,0;" > $.aliases/_$$fun.s; \
+                        if as -o $.aliases/_$$fun.o $.aliases/_$$fun.s; then \
+                        else false; \
+                        fi \
+                        fun2=; \
+                fi \    
+        done
         $(AR) $(ARFLAGS) $@ $.aliases/*.o
 

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

@@ -17 +17 @@
   print "#ifndef __LIBC_STD_H__"
   print "#define __LIBC_STD_H__\n"
-
+  print ""
   for (fun in std_fun)
   {
@@ -23 +23 @@
     if (!(fun in std_fun2))
       print "/*#define _" fun " _STD(" fun ")*/"
+  }
+
+  print ""
+  print "/* BSD aliasing */"
+  for (fun in bsd_aliases)
+  {
+    fun2 = bsd_aliases[fun];
+    print "/*#define " fun2 " _BSDALIAS(" fun ")*/"
   }
 
@@ -35 +43 @@
   }
 }
+
+/__weak_reference\( *[_0-9A-Za-z]+ *, *[_0-9A-Za-z]+ *\)/{
+  while (match($0, "__weak_reference\\( *[_0-9A-Za-z ]+ *, *[_0-9A-Za-z ]+ *\\)"))
+  {
+    fun1 = gensub("__weak_reference\\( *([_0-9A-Za-z]+) *, *[_0-9A-Za-z]+ *\\).*", "\\1", "", substr($0,RSTART,RLENGTH));
+    fun2 = gensub("__weak_reference\\( *[_0-9A-Za-z]+ *, *([_0-9A-Za-z]+) *\\).*", "\\1", "", substr($0,RSTART,RLENGTH));
+    bsd_aliases[fun1] = fun2;
+    $0 = substr($0, 1, RSTART-1) substr($0, RSTART+RLENGTH);
+  }
+}
+
+/__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));
+    bsd_aliases[fun1] = fun2;
+    $0 = substr($0, 1, RSTART-1) substr($0, RSTART+RLENGTH);
+  }
+}
+
 
 /MATHSUFFIX1\( *[_0-9A-Za-z]+ *\)/{