Changeset 113 for trunk/src/binutils

Timestamp:

May 9, 2003, 11:15:46 PM (22 years ago)

Author:

bird

Message:

Initial hacking.

File:

• trunk/src/binutils/binutils/objcopy.c (modified) (8 diffs, 1 prop)

trunk/src/binutils/binutils/objcopy.c

@@ -550 +550 @@
   char * buffer;
   unsigned int line_count;
-  
+
   if (stat (filename, & st) < 0)
     fatal (_("cannot stat: %s: %s"), filename, strerror (errno));
@@ -569 +569 @@
 
   line_count = 1;
-  
+
   for (line = buffer; * line != '\0'; line ++)
     {
@@ -588 +588 @@
               finished = true;
               break;
-              
+        
             case '\r':
               * eol = '\0';
@@ -596 +596 @@
               finished = true;
               break;
-              
+        
             case 0:
               finished = true;
               break;
-              
+        
             case '#':
               /* Line comment, Terminate the line here, in case a
@@ -607 +607 @@
               * eol = '\0';
               break;
-              
+        
             default:
               break;
@@ -638 +638 @@
                        line_count, filename);
         }
-  
+
       * name_end = '\0';
 
@@ -1346 +1346 @@
   bfd *ibfd;
   char **matching;
+#ifdef __EMX__
+  /* Check if they're both zero so we know when to use emxbind or not. */
+  int  bothtargetsnull = (input_target == NULL && output_target == NULL);
+#endif
+
 
   /* To allow us to do "strip *" without dying on the first
@@ -1389 +1394 @@
       if (!bfd_close (ibfd))
         RETURN_NONFATAL (input_filename);
+
+      #ifdef __EMX__
+      /*
+       * On OS/2 executables are normally pushed thru emxbind.
+       * So, if input and target format was both NULL and this was
+       * an emxbind'ed executable, then redo the emxbinding. We're
+       * a bit careful not to break anything therefore the NULL target
+       * precautions.
+       *
+       * THIS IS A HACK! It's motivation is to skip some trouble
+       * during GCC building.
+       *
+       * We really don't get everything right now, just get the
+       * "strip xgcc.exe" working good enough.
+       */
+      if (bothtargetsnull && status == 0 && !getenv("NO_STRIP_EMXBIND"))
+        {
+          FILE *child;
+          char szCmd[1024];
+          char *psz;
+          sprintf (szCmd, "emxbind.exe -i \"%s\" 2> nul", input_filename);
+          for (psz = szCmd; *psz; psz++)
+              if (*psz == '\\')  *psz = '/';
+          if ((child = popen (szCmd, "r")) != NULL)
+            {
+              if (!pclose (child))
+                {
+                  char *tmpname;
+                  char  tmpnameexe[260];
+
+                  tmpname = make_tempname (output_filename);
+                  if (!tmpname)
+                      RETURN_NONFATAL (input_filename);
+                  strcat(strcpy(tmpnameexe, tmpname), ".exe");
+                  free(tmpname);
+
+                  sprintf(szCmd, "emxbind.exe -bq -o \"%s\" \"%s\"", tmpnameexe, output_filename);
+                  for (psz = szCmd; *psz; psz++)
+                      if (*psz == '\\')  *psz = '/';
+                  if (!system (szCmd))
+                      smart_rename (tmpnameexe, output_filename, preserve_dates);
+                  unlink (tmpnameexe);
+                }
+            }
+        }
+      #endif
     }
   else