Changeset 485

Timestamp:

Jul 30, 2003, 8:10:01 PM (22 years ago)

Author:

bird

Message:

'

Location:

trunk/src/emx/src/emxomf

Files:

• emxomf.c (modified) (6 diffs, 1 prop)
• emxomf.smak (modified) (1 diff, 1 prop)
• emxomfld.c (modified) (13 diffs, 1 prop)
• grow.c (modified) (1 diff, 1 prop)
• weakld.c (added)
• weakld.h (added)

trunk/src/emx/src/emxomf/emxomf.c

@@ -1110 +1110 @@
         add_extdef (&started, str_ptr + sym_ptr[i].n_un.n_strx);
       }
+
+
+
+
+
+
+
+
   if (started)
     write_rec ();
@@ -1147 +1155 @@
    mark it as N_WEAKU so that it is later writen within a WKEXT record.
    Also we convert a.out-style weak symbols here as normal public symbols,
-   as the sense of weak is reverse in OMF */
+   as the sense of weak is reverse in OMF 
+   
+   Weak Hack Method 1.
+   */
 
 static void weak_process (void)
@@ -1184 +1195 @@
           }
       }
+
     else if ((sym_ptr[i].n_type & N_EXT) && is_weak (str_ptr + sym_ptr[i].n_un.n_strx))
       {
@@ -1193 +1205 @@
          /*SETTYPE (N_WEAKU);*/
       }
-
+    #endif 
 #undef SETTYPE
 }
@@ -1211 +1223 @@
  * @param   cchName     Size of the buffer pointed to by pachName.
  * @remark I'm sorry this function is written in my coding style - not!
+
  */
 static const char *weak_process_name(const struct nlist *pSym, const char *pszOrgName, char *pachName, int cchName)
@@ -1217 +1230 @@
     {
         /*
-         * Hmmm... Check that we handle this correctly else where
+         * 
          */
         case N_WEAKU:               /* 0x0d  Weak undefined symbol. */

trunk/src/emx/src/emxomf/emxomf.smak

@@ -20 +20 @@
 .TARGET := emxomfld.exe
 .TKIND  := $(TOOLFMT)
-.TSRC   := src/emxomf/emxomfld.c
+.TSRC   := 
 .TCF    := $(CFLAGS.DEF.VERSION)
 .TDEP   := @O@moddef$A

trunk/src/emx/src/emxomf/emxomfld.c

@@ -36 +36 @@
 #include <sys/omflib.h>
 #include "defs.h"
+
 
 #define FALSE 0
@@ -109 +110 @@
 static FILE *response_file = NULL;
 
+
+
+
 /* Non-zero if debugging information is to be omitted.  Set by the -s
    and -S options. */
@@ -132 +136 @@
 
 static void usage (void) NORETURN2;
-static void *xmalloc (size_t n);
-static char *xstrdup (const char *s);
+extern void *xmalloc (size_t n);
+extern void *xrealloc (void *ptr, size_t n);
+extern char *xstrdup (const char *s);
 static void add_name_list (name_list ***add, const char *src);
 static void conv_path (char *name);
@@ -156 +161 @@
 static void usage (void)
 {
-  fprintf (stderr, "emxomfld " VERSION INNOTEK_VERSION " -- "
-           "Copyright (c) 1992-1996 by Eberhard Mattes\n\n");
+  fprintf (stderr, "emxomfld " VERSION INNOTEK_VERSION "\n"
+           "Copyright (c) 1992-1996 by Eberhard Mattes\n"
+           "Copyright (c) 2003 by InnoTek Systemberatung GmbH\n\n");
+
   fprintf (stderr,
            "Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-sS]\n"
@@ -169 +176 @@
    used like malloc(), but we don't have to check the return value. */
 
-static void *xmalloc (size_t n)
+void *xmalloc (size_t n)
 {
   void *p;
@@ -181 +188 @@
   return p;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -187 +213 @@
    return value. */
 
-static char *xstrdup (const char *s)
+char *xstrdup (const char *s)
 {
   char *p;
@@ -387 +413 @@
 
 
-/* Put a list of library arguments on to the command line or into the
-   response file. Filenames without path and extension will be 'resolved'
-   using libdirs and the LIB environment variable and a '.lib' extension.
-   If not found a search for a 'lib' prefixed filename is attempted, if
-   still not found we'll let link386 do the complaining and pass filename
-   unresolved to link386.
-
-   The motivation for doing this is to have the same behaviour of ld and
-   emxomfld which allows us to lax the libsomething.lib to something.lib
-   renaming and addapt to the gcc/unix library naming standards.
-   (see Innotek Defect #416)
-
-   Note. make_env () *must* be called before this function is called. */
-
-static void put_lib_args(const name_list *list)
-{
-  const char *pszLib = getenv ("LIB");
-  for (;list != NULL; list = list->next)
-    {
-      char  szFilename[260];
-      int   fFound = 0;
-
-      if (!strpbrk (list->name, ":\\/."))
-        { /* search for it */
-          const char *psz, *pszEnd;
-          for (psz = pszLib; !fFound && psz; psz = pszEnd + (pszEnd != NULL))
-            {
-              pszEnd = strchr(psz, ';');
-              if (pszEnd > psz)
-                {
-                  int  cchPath = pszEnd - psz;
-                  struct stat s;
-
-                  strncpy(szFilename, psz, pszEnd - psz);
-                  if (   szFilename[cchPath-1] != '\\'
-                      && szFilename[cchPath-1] != '/'
-                      && szFilename[cchPath-1] != ':')
-                    szFilename[cchPath++] = '\\';
-
-                  /* Files we're looking for:
-                   *    1. file with .lib extention.
-                   *    2. file with .lib extention and lib prefix.
-                   *    3. file with .a extention which is an OMF library.
-                   *    4. file with .a extention and lib prefix which is an OMF library.
-                   */
-                  strcat(strcpy(szFilename + cchPath, list->name), ".lib");
-                  fFound = !stat(szFilename, &s);
-                  if (!fFound)
-                    {
-                      strcat(strcpy(strcpy(szFilename + cchPath, "lib") + 3, list->name), ".lib");
-                      fFound = !stat(szFilename, &s);
-                      if (!fFound)
-                        {
-                          strcat(strcpy(szFilename + cchPath, list->name), ".a");
-                          fFound = !stat(szFilename, &s);
-                          if (!fFound)
-                            {
-                              strcat(strcpy(strcpy(szFilename + cchPath, "lib") + 3, list->name), ".a");
-                              fFound = !stat(szFilename, &s);
-                            }
-                          /*
-                           * Is this an OMF library?
-                           * We will open it hand do some verification of the LIBHDR.
-                           */
-                          if (fFound)
-                            {
-                              FILE *pFile = fopen(szFilename, "rb");
-                              fFound = 0;
-                              if (pFile)
-                                {
-                                  #pragma pack(1)
-                                  struct
-                                  {
-                                      byte rec_type;
-                                      word rec_len;
-                                      dword dict_offset;
-                                      word dict_blocks;
-                                      byte flags;
-                                  } libhdr;
-                                  #pragma pack()
-                                  if (  fread(&libhdr, 1, sizeof(libhdr), pFile) == sizeof(libhdr)
-                                      && libhdr.rec_type == LIBHDR
-                                      && libhdr.flags <= 1 /* ASSUME only first bit is used... */
-                                      )
-                                    {
-                                      int page_size = libhdr.rec_len + 3;
-                                      if (   page_size >= 16
-                                          && page_size <= 32768
-                                          && !(page_size & (page_size - 1)) != 0)
-                                          fFound = 1;
-                                    }
-                                  fclose(pFile);
-                                }
-                            }
-                        }
-                    }
-                }
-            } /* foreach path in $LIB */
-        }
-
-      put_arg (fFound ? szFilename : list->name, TRUE, TRUE);
-//fprintf(stderr, "%s -> %s\n", list->name, fFound ? szFilename : strpbrk(list->name,     ":\\/.") ? "not searched for" : "not found");
-    } /* foreach list entry */
-}
-
-
 /* Build the environment for LINK386: define the LIB environment
    variable. */
@@ -536 +456 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* Start a new set of command line arguments.  If RSP is non-zero, we
    are allowed to use a response file. */
@@ -575 +679 @@
       response_file = NULL;
     }
-  if (response_fname[0] != 0)
+  if (response_fname[0] != )
     {
       remove (response_fname);
-      response_fname[0] = 0;
+      response_fname[0] = '\0';
+    }
+  if (weakobj_fname[0] != '\0')
+    {
+      remove (weakobj_fname);
+      weakobj_fname[0] = '\0';
     }
 }
@@ -790 +899 @@
     }
 
-  t = getenv ("EMXOMFLD_LINKER");
-  if (t != NULL)
-    linker_name = t;
-
-  /* Build the environment for LINK386.
-     This must be done before calling put_lib_args (). */
+  /* Build the environment for LINK386. */
 
   make_env ();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
   /* Start building the LINK386 command line.  We can use a response
@@ -829 +956 @@
   */
 
+
+
+
   put_arg (linker_name, TRUE, FALSE);
 
@@ -914 +1044 @@
   /* Put the library file names onto the command line. */
 
-  put_lib_args (lib_fnames);
+  put_);
   put_arg (",", FALSE, FALSE);
 

trunk/src/emx/src/emxomf/grow.c

@@ -332 +332 @@
   return strpool_addn (p, s, strlen (s));
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+