Changeset 545


Ignore:
Timestamp:
Aug 8, 2003, 12:26:06 AM (22 years ago)
Author:
bird
Message:

no change only white spaces.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/src/emx/src/emxomf/emxomfld.c

    • Property cvs2svn:cvs-rev changed from 1.22 to 1.23
    r544 r545  
    142142static const char *linker_name = "ilink.exe";
    143143
    144 /* The type of linker to use. By default we assume it's VAC365 or later 
     144/* The type of linker to use. By default we assume it's VAC365 or later
    145145   version of ilink. This can be overridden with the EMXOMFLD_TYPE env.
    146146   var. using any of the value VAC365, VAC308 and LINK386. */
     
    333333
    334334      max_len = (response_file == NULL ? 110 : 52);
    335       if (   line_len + len + 1 > max_len 
     335      if (   line_len + len + 1 > max_len
    336336          || (force_response_file && !response_file))
    337337        {
     
    443443
    444444
    445 /* Build the environment for the IBM/M$ Linkers: define the LIB 
     445/* Build the environment for the IBM/M$ Linkers: define the LIB
    446446   environment variable. */
    447447
     
    725725      /* cleanup the linker */
    726726      WLDDestroy (pwld);
    727      
     727
    728728      /* last words */
    729729      if (rc)
     
    799799
    800800
    801 /* Execute commandline and returns the result. 
     801/* Execute commandline and returns the result.
    802802   pszwhat is used for opt_t trace information. */
    803803
     
    839839      if (*psz2)
    840840        *psz2++ = '\0';
    841      
     841
    842842      /* add argument to argument vector. */
    843843      if (!(argi % 32))
     
    846846
    847847      /* next */
    848       psz = psz2;                           
     848      psz = psz2;
    849849    }
    850850  argv[argi] = NULL;
     
    888888
    889889
    890 /* Main function of emxomf.  Parse the command line and call the IBM/M$ 
     890/* Main function of emxomf.  Parse the command line and call the IBM/M$
    891891   linker (and optionally RC). */
    892892
     
    899899
    900900  /* Get options from response files (@filename) and wildcard (*.o) on the command. */
    901  
     901
    902902  _response (&argc, &argv);
    903903  _wildcard (&argc, &argv);
     
    10961096  make_env ();
    10971097
    1098   /* EMXOMFLD_TYPE contains VAC365, VAC308 or LINK386 if set. If non of these 
     1098  /* EMXOMFLD_TYPE contains VAC365, VAC308 or LINK386 if set. If non of these
    10991099     we assume VAC365.
    1100      EMXOMFLD_LINKER contains the linker name and perhaps extra arguments. If 
     1100     EMXOMFLD_LINKER contains the linker name and perhaps extra arguments. If
    11011101     not set we'll use the default linker, ilink.  */
    11021102
     
    11481148  arg_init (TRUE);
    11491149
    1150   /* 
     1150  /*
    11511151     For VAC365 and VAC308 the default options is:
    11521152
     
    11551155                        are grouped and separated by commas.
    11561156
    1157      /DBGPACK           If !strip_symbols then we'll add this option, which 
     1157     /DBGPACK           If !strip_symbols then we'll add this option, which
    11581158                        will cause type tables to be merged into one global
    11591159                        table and so eliminating a lot of duplicate info.
    1160                        
     1160
    11611161     For VAC365 additional default option is:
    1162      
     1162
    11631163     /STUB:<emxomfld-path>\os2stub.bin
    1164                         Causes this MZ stub to be used when linking the 
     1164                        Causes this MZ stub to be used when linking the
    11651165                        executables instead of the default on for the linker.
    1166  
     1166
    11671167     For LINK386 the default options is:
    1168      
     1168
    11691169     /BATCH             Run in batch mode (disable prompting, don't
    11701170                        echo response file)
    1171    
     1171
    11721172     The default options for all linkers are:
    11731173
     
    11841184                        'CODE').  Not grouping neighboring code
    11851185                        segments would break sets
    1186                        
     1186
    11871187     For non DLLs targets:
    1188      
     1188
    11891189     /BASE:0x10000      Base the executable an so removing extra fixups.
    11901190
     
    11961196  /* the next part depends on the linker type. */
    11971197  if (!stricmp (linker_type, "LINK386"))
    1198       put_arg ("/bat", FALSE, FALSE); 
     1198      put_arg ("/bat", FALSE, FALSE);
    11991199  else /* vac3xx: */
    12001200    {
    1201       put_arg ("/nofree", FALSE, FALSE); 
     1201      put_arg ("/nofree", FALSE, FALSE);
    12021202      if (!strip_symbols)
    1203         put_arg ("/db", FALSE, FALSE); 
     1203        put_arg ("/db", FALSE, FALSE);
    12041204      if (map_flag)
    1205         put_arg ("/map", FALSE, FALSE); 
     1205        put_arg ("/map", FALSE, FALSE);
    12061206    }
    12071207  put_arg ("/nol", FALSE, FALSE);
     
    12101210  put_arg ("/packc", FALSE, FALSE);
    12111211
    1212  
    1213   /* VAC365: check if we have os2stub.bin. 
    1214      We must to this after the above stuff else /nol might end up in the 
     1212
     1213  /* VAC365: check if we have os2stub.bin.
     1214     We must to this after the above stuff else /nol might end up in the
    12151215     response file and we'll get the component output. */
    12161216
     
    12851285
    12861286  /* Put the object file names onto the command line. */
    1287  
     1287
    12881288  force_response_file = TRUE;           /* link386 workaround. */
    12891289  put_args (obj_fnames, TRUE);
     
    13151315  rc = emxomfld_spawn (command_line, "Linker");
    13161316  if (rc == 4 && !strnicmp(linker_type, "VAC3", 4)) /* Ignore iLink warnings. */
    1317       rc = 0;                           
     1317      rc = 0;
    13181318  if (rc < 0)
    13191319    {
     
    13521352      _execname(&execname[0], sizeof(execname));
    13531353      strcpy(_getname(&execname[0]), "ldstub.bin");
    1354      
     1354
    13551355      /* Copy stub into file */
    13561356      if (opt_t)
Note: See TracChangeset for help on using the changeset viewer.