Changeset 156 for trunk/src/emx/src/emxbind/fixup.c

Timestamp:

May 16, 2003, 9:27:59 AM (22 years ago)

Author:

zap

Message:

o Modified makefiles so that os2.a builds correctly (with Vio, Kbd and friends,

not just from the import files).

o Moved os2.smak to the os2_386 directory (tcp32dll.imp will go into socket.a).
o Added the rules into libc.smak to build libc##.dll (finally it links without

errors! Don't know if it works, though ;-)

o Fixed emxbind so that it doesn't add underscores to exported symbols (taken

from the EXPORTS section of a .def file).

o Fixed emxexp so that it doesn't remove underscores from symbol names.
o Fixed all references to OS/2 functions to not contain an initial underscore

(since they are _System now).

o Added one builder makefile: mkimplib.smak, and two auxiliary submakefiles:

mkomflib.smak (included from both mklib and mkimplib), and a version.smak
that contains the version number, description and copyright for libc.

o Made a lot of small changes in order to remove duplicate symbols in libc.dll.
o Added sys/settime.c which was missing in EMX's -Zomf -Zsys variant.

File:

• trunk/src/emx/src/emxbind/fixup.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/emxbind/fixup.c

@@ -98 +98 @@
 
 
-/* Find the symbol NAME in the a.out symbol table of the input
-   executable.  If UNDERSCORE is true, an underscore is prepended to
-   NAME.  If the symbol is found, find_symbol() returns a pointer to
-   the symbol table entry.  Otherwise, NULL is returned. */
-
-struct nlist *find_symbol (const char *name, int underscore)
+/* Find the symbol NAME in the a.out symbol table of the input executable.
+   If the symbol is found, find_symbol() returns a pointer to the symbol
+   table entry.  Otherwise, NULL is returned. */
+
+struct nlist *find_symbol (const char *name)
 {
   int j, len;
@@ -109 +108 @@
 
   len = strlen (name);
-  if (underscore)
-  {
-    name1 = alloca (len + 2);
-    ((char *)name1)[0] = '_';
-    memcpy (((char *)name1) + 1, name, len + 1);
-  }
 
   for (j = sym_hash_table[sym_hash (name1)]; j != -1;
@@ -499 +492 @@
     }
   mod_idx = find_module (mod, NO_ADDR);
-  if (memcmp ("__16_", name1, 5) == 0)
+  if (memcmp ("_16_", name1, 4) == 0)
     {
       if (r->pcrel)