Changeset 1130

Timestamp:

Jan 31, 2004, 10:05:46 AM (22 years ago)

Author:

bird

Message:

Fixed problem with very long parameter lists. Added more speed and accuracy in what's included.

File:

• trunk/src/emx/src/lib/alias/alias.smak (modified) (4 diffs, 1 prop)

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

@@ -25 +25 @@
         strnlen                 __strnlen
 
-DO.STDALIAS = \
-  echo 'Aliasing $1 to $2 ...'; \
-  echo '.stabs "$1",11,0,0,0;.stabs "$2",1,0,0,0;' | as -o $3
 
 # For every aliased function create a .o file containing the alias
@@ -34 +31 @@
 ## Depending on the timestamp kind of sucks, now we depend on the
 ## header, which is better but will require libc to be build first.
-$.$(.TARG): $.libc-std.h
-        $(call RM,$@)
+$.$(.TARG): $.libc-std.h src/lib/alias/alias.smak
         $(call MKDIR,$.aliases)
-        $(call RM,$.aliases/*.o)
-        $(call RM,$.aliases/*.s)
+# custom aliases
         fun1=; \
         for fun in $(ALIAS.ALIASES); do \
@@ -52 +47 @@
                 fi; \
         done
+# standard aliases.
         for i in $(ALIAS.FUNCS); do \
                 echo "Aliasing _$$i to __std_$$i ..."; \
         echo ".stabs \"_$$i\",11,0,0,0;.stabs \"__std_$$i\",1,0,0,0;" > $.aliases/_$$i.s; \
-        if as -o $.aliases/_$$i.o $.aliases/_$$i.s; then \
+        if test -f $.aliases/_$$i.o || as -o $.aliases/_$$i.o $.aliases/_$$i.s; then \
                 else exit 1; \
                 fi \
@@ -62 +58 @@
                 echo "Aliasing __$$i to __std_$$i ..."; \
                 echo ".stabs \"__$$i\",11,0,0,0;.stabs \"__std_$$i\",1,0,0,0;" > $.aliases/__$$i.s; \
-                if as -o $.aliases/__$$i.o $.aliases/__$$i.s; then \
+                if test -f $.aliases/__$$i.o || as -o $.aliases/__$$i.o $.aliases/__$$i.s; then \
                 else exit 1; \
                 fi \
         done
-        $(AR) $(ARFLAGS) $@ $.aliases/*.o
+# archiver scripting
+        echo "CREATE $@" > $.aliases/alias.ar-script
+        fun1=; \
+        for fun in $(ALIAS.ALIASES); do \
+            if test -z "$$fun1"; then \
+                        fun1=$$fun; \
+                else \
+                        echo "ADDMOD $.aliases/_$$fun1.o" >> $.aliases/alias.ar-script; \
+                        fun1=; \
+                fi; \
+        done
+        for i in $(ALIAS.FUNCS); do \
+                echo "ADDMOD $.aliases/_$$i.o" >> $.aliases/alias.ar-script; \
+        done
+        for i in $(ALIAS._FUNCS); do \
+                echo "ADDMOD $.aliases/__$$i.o" >> $.aliases/alias.ar-script; \
+        done
+        echo "SAVE" >> $.aliases/alias.ar-script
+        echo "END" >> $.aliases/alias.ar-script
+        ar -M < $.aliases/alias.ar-script
 
 include mkomflib.smak