/* nlmconv.c -- NLM conversion program
- Copyright (C) 1993 Free Software Foundation, Inc.
+ Copyright (C) 1993, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
This file is part of GNU Binutils.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* Written by Ian Lance Taylor <ian@cygnus.com>.
This program can be used to convert any appropriate object file
into a NetWare Loadable Module (an NLM). It will accept a linker
specification file which is identical to that accepted by the
- NetWare linker, NLMLINK, except that the INPUT command, normally
- used to give a list of object files to link together, is not used.
- This program will convert only a single object file. */
+ NetWare linker, NLMLINK. */
+
+/* AIX requires this to be the first thing in the file. */
+#ifndef __GNUC__
+# ifdef _AIX
+ #pragma alloca
+#endif
+#endif
+
+#include "bfd.h"
+#include "libiberty.h"
+#include "bucomm.h"
#include <ansidecl.h>
-#include <stdio.h>
#include <time.h>
#include <ctype.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <assert.h>
#include <getopt.h>
-#include "bfd.h"
-#include "libiberty.h"
-#include "sysdep.h"
-#include "bucomm.h"
+
/* Internal BFD NLM header. */
#include "libnlm.h"
#include "nlmconv.h"
extern struct tm *localtime ();
#endif
-#ifndef getenv
-extern char *getenv ();
-#endif
-
#ifndef SEEK_SET
#define SEEK_SET 0
#endif
/* The name used to invoke the program. */
char *program_name;
-/* The version number. */
-extern char *program_version;
-
/* Local variables. */
/* Whether to print out debugging information (currently just controls
long *, char *,
bfd_size_type));
static char *link_inputs PARAMS ((struct string_list *, char *));
-static const char *choose_temp_base_try PARAMS ((const char *,
- const char *));
-static void choose_temp_base PARAMS ((void));
-static int pexecute PARAMS ((char *, char *[]));
#ifdef NLMCONV_I386
static void i386_mangle_relocs PARAMS ((bfd *, asection *, arelent ***,
char inlead, outlead;
boolean gotstart, gotexit, gotcheck;
struct stat st;
- FILE *custom_data, *help_data, *message_data, *rpc_data, *shared_data;
- size_t custom_size, help_size, message_size, module_size, rpc_size;
- asection *custom_section, *help_section, *message_section, *module_section;
- asection *rpc_section, *shared_section;
+ FILE *custom_data = NULL;
+ FILE *help_data = NULL;
+ FILE *message_data = NULL;
+ FILE *rpc_data = NULL;
+ FILE *shared_data = NULL;
+ size_t custom_size = 0;
+ size_t help_size = 0;
+ size_t message_size = 0;
+ size_t module_size = 0;
+ size_t rpc_size = 0;
+ asection *custom_section = NULL;
+ asection *help_section = NULL;
+ asection *message_section = NULL;
+ asection *module_section = NULL;
+ asection *rpc_section = NULL;
+ asection *shared_section = NULL;
bfd *sharedbfd;
- size_t shared_offset, shared_size;
+ size_t shared_offset = 0;
+ size_t shared_size = 0;
Nlm_Internal_Fixed_Header sharedhdr;
int len;
char *modname;
char **matching;
+ setlocale (LC_MESSAGES, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
program_name = argv[0];
xmalloc_set_program_name (program_name);
bfd_init ();
+ set_default_bfd_target ();
while ((opt = getopt_long (argc, argv, "dhI:l:O:T:V", long_options,
(int *) NULL))
header_file = optarg;
break;
case 'V':
- printf ("GNU %s version %s\n", program_name, program_version);
- exit (0);
+ print_version ("nlmconv");
/*NOTREACHED*/
case 0:
break;
if (strcmp (input_file, output_file) == 0)
{
fprintf (stderr,
- "%s: input and output files must be different\n",
+ _("%s: input and output files must be different\n"),
program_name);
exit (1);
}
if (input_file != NULL)
{
fprintf (stderr,
- "%s: input file named both on command line and with INPUT\n",
+ _("%s: input file named both on command line and with INPUT\n"),
program_name);
exit (1);
}
}
else if (input_file == NULL)
{
- fprintf (stderr, "%s: no input file\n", program_name);
+ fprintf (stderr, _("%s: no input file\n"), program_name);
show_usage (stderr, 1);
}
if (output_format == NULL)
output_format = select_output_format (bfd_get_arch (inbfd),
bfd_get_mach (inbfd),
- inbfd->xvec->byteorder_big_p);
+ bfd_big_endian (inbfd));
assert (output_format != NULL);
Otherwise use the file named in the OUTPUT statement. */
if (output_file == NULL)
{
- fprintf (stderr, "%s: no name for output file\n",
+ fprintf (stderr, _("%s: no name for output file\n"),
program_name);
show_usage (stderr, 1);
}
if (bfd_arch_get_compatible (inbfd, outbfd) == NULL)
fprintf (stderr,
- "%s: warning:input and output formats are not compatible\n",
+ _("%s: warning:input and output formats are not compatible\n"),
program_name);
/* Move the values read from the command file into outbfd. */
if (bss_sec == NULL
|| ! bfd_set_section_flags (outbfd, bss_sec, SEC_ALLOC)
|| ! bfd_set_section_alignment (outbfd, bss_sec, 1))
- bfd_fatal ("make .bss section");
+ bfd_fatal (_("make .bss section"));
}
/* We store the original section names in the .nlmsections section,
the NLM header area. */
secsec = bfd_make_section (outbfd, ".nlmsections");
if (secsec == NULL)
- bfd_fatal ("make .nlmsections section");
+ bfd_fatal (_("make .nlmsections section"));
if (! bfd_set_section_flags (outbfd, secsec, SEC_HAS_CONTENTS))
- bfd_fatal ("set .nlmsections flags");
+ bfd_fatal (_("set .nlmsections flags"));
#ifdef NLMCONV_POWERPC
/* For PowerPC NetWare we need to build stubs for calls to undefined
add = ((vma + align - 1) &~ (align - 1)) - vma;
vma += add;
if (! bfd_set_section_vma (outbfd, bss_sec, vma))
- bfd_fatal ("set .bss vma");
+ bfd_fatal (_("set .bss vma"));
if (add != 0)
{
bfd_size_type data_size;
data_size = bfd_get_section_size_before_reloc (data_sec);
if (! bfd_set_section_size (outbfd, data_sec, data_size + add))
- bfd_fatal ("set .data size");
+ bfd_fatal (_("set .data size"));
}
}
}
if (l == NULL)
fprintf (stderr,
- "%s: warning: symbol %s imported but not in import list\n",
+ _("%s: warning: symbol %s imported but not in import list\n"),
program_name, bfd_asymbol_name (sym));
}
&& text_sec != (asection *) NULL)
val += bfd_section_size (outbfd, text_sec);
if (! bfd_set_start_address (outbfd, val))
- bfd_fatal ("set start address");
+ bfd_fatal (_("set start address"));
gotstart = true;
}
if (strcmp (bfd_asymbol_name (sym), exit_procedure) == 0)
bfd_set_symtab (outbfd, outsyms, symcount + newsymcount);
if (! gotstart)
- fprintf (stderr, "%s: warning: START procedure %s not defined\n",
+ fprintf (stderr, _("%s: warning: START procedure %s not defined\n"),
program_name, start_procedure);
if (! gotexit)
- fprintf (stderr, "%s: warning: EXIT procedure %s not defined\n",
+ fprintf (stderr, _("%s: warning: EXIT procedure %s not defined\n"),
program_name, exit_procedure);
if (check_procedure != NULL
&& ! gotcheck)
- fprintf (stderr, "%s: warning: CHECK procedure %s not defined\n",
+ fprintf (stderr, _("%s: warning: CHECK procedure %s not defined\n"),
program_name, check_procedure);
/* Add additional sections required for the header information. */
|| ! bfd_set_section_size (outbfd, custom_section, custom_size)
|| ! bfd_set_section_flags (outbfd, custom_section,
SEC_HAS_CONTENTS))
- bfd_fatal ("custom section");
+ bfd_fatal (_("custom section"));
}
}
if (help_file != NULL)
|| ! bfd_set_section_size (outbfd, help_section, help_size)
|| ! bfd_set_section_flags (outbfd, help_section,
SEC_HAS_CONTENTS))
- bfd_fatal ("help section");
+ bfd_fatal (_("help section"));
strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8);
}
}
|| ! bfd_set_section_size (outbfd, message_section, message_size)
|| ! bfd_set_section_flags (outbfd, message_section,
SEC_HAS_CONTENTS))
- bfd_fatal ("message section");
+ bfd_fatal (_("message section"));
strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8);
}
}
|| ! bfd_set_section_size (outbfd, module_section, module_size)
|| ! bfd_set_section_flags (outbfd, module_section,
SEC_HAS_CONTENTS))
- bfd_fatal ("module section");
+ bfd_fatal (_("module section"));
}
if (rpc_file != NULL)
{
|| ! bfd_set_section_size (outbfd, rpc_section, rpc_size)
|| ! bfd_set_section_flags (outbfd, rpc_section,
SEC_HAS_CONTENTS))
- bfd_fatal ("rpc section");
+ bfd_fatal (_("rpc section"));
strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8);
}
}
{
/* There is no place to record this information. */
fprintf (stderr,
- "%s:%s: warning: shared libraries can not have uninitialized data\n",
+ _("%s:%s: warning: shared libraries can not have uninitialized data\n"),
program_name, sharelib_file);
}
shared_offset = st.st_size;
- if (shared_offset > sharedhdr.codeImageOffset)
+ if (shared_offset > (size_t) sharedhdr.codeImageOffset)
shared_offset = sharedhdr.codeImageOffset;
- if (shared_offset > sharedhdr.dataImageOffset)
+ if (shared_offset > (size_t) sharedhdr.dataImageOffset)
shared_offset = sharedhdr.dataImageOffset;
- if (shared_offset > sharedhdr.relocationFixupOffset)
+ if (shared_offset > (size_t) sharedhdr.relocationFixupOffset)
shared_offset = sharedhdr.relocationFixupOffset;
- if (shared_offset > sharedhdr.externalReferencesOffset)
+ if (shared_offset > (size_t) sharedhdr.externalReferencesOffset)
shared_offset = sharedhdr.externalReferencesOffset;
- if (shared_offset > sharedhdr.publicsOffset)
+ if (shared_offset > (size_t) sharedhdr.publicsOffset)
shared_offset = sharedhdr.publicsOffset;
shared_size = st.st_size - shared_offset;
shared_section = bfd_make_section (outbfd, ".nlmshared");
shared_size)
|| ! bfd_set_section_flags (outbfd, shared_section,
SEC_HAS_CONTENTS))
- bfd_fatal ("shared section");
+ bfd_fatal (_("shared section"));
strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8);
}
}
/* Check whether a version was given. */
if (strncmp (version_hdr->stamp, "VeRsIoN#", 8) != 0)
- fprintf (stderr, "%s: warning: No version number given\n",
+ fprintf (stderr, _("%s: warning: No version number given\n"),
program_name);
/* At least for now, always create an extended header, because that
data = xmalloc (custom_size);
if (fread (data, 1, custom_size, custom_data) != custom_size)
- fprintf (stderr, "%s:%s: read: %s\n", program_name, custom_file,
+ fprintf (stderr, _("%s:%s: read: %s\n"), program_name, custom_file,
strerror (errno));
else
{
if (! bfd_set_section_contents (outbfd, custom_section, data,
(file_ptr) 0, custom_size))
- bfd_fatal ("custom section");
+ bfd_fatal (_("custom section"));
nlm_fixed_header (outbfd)->customDataOffset =
custom_section->filepos;
nlm_fixed_header (outbfd)->customDataSize = custom_size;
}
if (map_file != NULL)
fprintf (stderr,
- "%s: warning: MAP and FULLMAP are not supported; try ld -M\n",
+ _("%s: warning: MAP and FULLMAP are not supported; try ld -M\n"),
program_name);
if (help_file != NULL)
{
data = xmalloc (help_size);
if (fread (data, 1, help_size, help_data) != help_size)
- fprintf (stderr, "%s:%s: read: %s\n", program_name, help_file,
+ fprintf (stderr, _("%s:%s: read: %s\n"), program_name, help_file,
strerror (errno));
else
{
if (! bfd_set_section_contents (outbfd, help_section, data,
(file_ptr) 0, help_size))
- bfd_fatal ("help section");
+ bfd_fatal (_("help section"));
nlm_extended_header (outbfd)->helpFileOffset =
help_section->filepos;
nlm_extended_header (outbfd)->helpFileLength = help_size;
data = xmalloc (message_size);
if (fread (data, 1, message_size, message_data) != message_size)
- fprintf (stderr, "%s:%s: read: %s\n", program_name, message_file,
+ fprintf (stderr, _("%s:%s: read: %s\n"), program_name, message_file,
strerror (errno));
else
{
if (! bfd_set_section_contents (outbfd, message_section, data,
(file_ptr) 0, message_size))
- bfd_fatal ("message section");
+ bfd_fatal (_("message section"));
nlm_extended_header (outbfd)->messageFileOffset =
message_section->filepos;
nlm_extended_header (outbfd)->messageFileLength = message_size;
}
if (! bfd_set_section_contents (outbfd, module_section, data,
(file_ptr) 0, module_size))
- bfd_fatal ("module section");
+ bfd_fatal (_("module section"));
nlm_fixed_header (outbfd)->moduleDependencyOffset =
module_section->filepos;
nlm_fixed_header (outbfd)->numberOfModuleDependencies = c;
data = xmalloc (rpc_size);
if (fread (data, 1, rpc_size, rpc_data) != rpc_size)
- fprintf (stderr, "%s:%s: read: %s\n", program_name, rpc_file,
+ fprintf (stderr, _("%s:%s: read: %s\n"), program_name, rpc_file,
strerror (errno));
else
{
if (! bfd_set_section_contents (outbfd, rpc_section, data,
(file_ptr) 0, rpc_size))
- bfd_fatal ("rpc section");
+ bfd_fatal (_("rpc section"));
nlm_extended_header (outbfd)->RPCDataOffset =
rpc_section->filepos;
nlm_extended_header (outbfd)->RPCDataLength = rpc_size;
data = xmalloc (shared_size);
if (fseek (shared_data, shared_offset, SEEK_SET) != 0
|| fread (data, 1, shared_size, shared_data) != shared_size)
- fprintf (stderr, "%s:%s: read: %s\n", program_name, sharelib_file,
+ fprintf (stderr, _("%s:%s: read: %s\n"), program_name, sharelib_file,
strerror (errno));
else
{
if (! bfd_set_section_contents (outbfd, shared_section, data,
(file_ptr) 0, shared_size))
- bfd_fatal ("shared section");
+ bfd_fatal (_("shared section"));
}
nlm_extended_header (outbfd)->sharedCodeOffset =
sharedhdr.codeImageOffset - shared_offset + shared_section->filepos;
for (modname = nlm_fixed_header (outbfd)->moduleName;
*modname != '\0';
modname++)
- if (islower (*modname))
+ if (islower ((unsigned char) *modname))
*modname = toupper (*modname);
strncpy (nlm_variable_header (outbfd)->oldThreadName, " LONG",
static void
show_help ()
{
- printf ("%s: Convert an object file into a NetWare Loadable Module\n",
+ printf (_("%s: Convert an object file into a NetWare Loadable Module\n"),
program_name);
show_usage (stdout, 0);
}
FILE *file;
int status;
{
- fprintf (file, "\
+ fprintf (file, _("\
Usage: %s [-dhV] [-I bfdname] [-O bfdname] [-T header-file] [-l linker]\n\
[--input-target=bfdname] [--output-target=bfdname]\n\
[--header-file=file] [--linker=linker] [--debug]\n\
[--help] [--version]\n\
- [in-file [out-file]]\n",
+ [in-file [out-file]]\n"),
program_name);
+ if (status == 0)
+ fprintf (file, _("Report bugs to bug-gnu-utils@gnu.org\n"));
exit (status);
}
\f
return "nlm32-powerpc";
#endif
default:
- fprintf (stderr, "%s: support not compiled in for %s\n",
+ fprintf (stderr, _("%s: support not compiled in for %s\n"),
program_name, bfd_printable_arch_mach (arch, mach));
exit (1);
/* Avoid warning. */
{
outsec = bfd_make_section (outbfd, outname);
if (outsec == NULL)
- bfd_fatal ("make section");
+ bfd_fatal (_("make section"));
}
insec->output_section = outsec;
(bfd_section_size (outbfd, outsec)
+ bfd_section_size (inbfd, insec)
+ add)))
- bfd_fatal ("set section size");
+ bfd_fatal (_("set section size"));
if ((bfd_section_alignment (inbfd, insec)
> bfd_section_alignment (outbfd, outsec))
&& ! bfd_set_section_alignment (outbfd, outsec,
bfd_section_alignment (inbfd, insec)))
- bfd_fatal ("set section alignment");
+ bfd_fatal (_("set section alignment"));
- if (! bfd_set_section_flags (outbfd, outsec, f))
- bfd_fatal ("set section flags");
+ if (! bfd_set_section_flags (outbfd, outsec,
+ f | bfd_get_section_flags (outbfd, outsec)))
+ bfd_fatal (_("set section flags"));
bfd_set_reloc (outbfd, outsec, (arelent **) NULL, 0);
secsecsize = (secsecsize + 3) &~ 3;
secsecsize += 8;
if (! bfd_set_section_size (outbfd, secsec, secsecsize))
- bfd_fatal ("set .nlmsections size");
+ bfd_fatal (_("set .nlmsections size"));
}
/* Copy the section contents. */
/* Add this section to .nlmsections. */
if (! bfd_set_section_contents (outbfd, secsec, (PTR) inname, secsecoff,
strlen (inname) + 1))
- bfd_fatal ("set .nlmsection contents");
+ bfd_fatal (_("set .nlmsection contents"));
secsecoff += strlen (inname) + 1;
add = ((secsecoff + 3) &~ 3) - secsecoff;
{
bfd_h_put_32 (outbfd, (bfd_vma) 0, buf);
if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, add))
- bfd_fatal ("set .nlmsection contents");
+ bfd_fatal (_("set .nlmsection contents"));
secsecoff += add;
}
else
bfd_h_put_32 (outbfd, (bfd_vma) 0, buf);
if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, 4))
- bfd_fatal ("set .nlmsection contents");
+ bfd_fatal (_("set .nlmsection contents"));
secsecoff += 4;
bfd_h_put_32 (outbfd, (bfd_vma) size, buf);
if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, 4))
- bfd_fatal ("set .nlmsection contents");
+ bfd_fatal (_("set .nlmsection contents"));
secsecoff += 4;
}
{
register bfd_size_type i;
- for (i = 0; i < old_reloc_count; i++, relocs++)
+ for (i = 0; i < (bfd_size_type) old_reloc_count; i++, relocs++)
(*relocs)->address += insec->output_offset;
}
}
(got_base
+ (stubcount
* POWERPC_STUB_TOC_ENTRY_SIZE))))
- bfd_fatal ("stub section sizes");
+ bfd_fatal (_("stub section sizes"));
}
-
- /* PowerPC NetWare requires a custom header. We create it here.
- The first word is the header version number, currently 1. The
- second word is the timestamp of the input file. Unfortunately,
- they do not conform to the emergent standard for custom headers.
- We must fake the version number and timestamp in the offset and
- length fields. */
- memcpy (nlm_custom_header (outbfd)->stamp, "CuStHeAd", 8);
- nlm_custom_header (outbfd)->hdrLength = 0;
- /* Put version number in dataOffset field. */
- nlm_custom_header (outbfd)->dataOffset = 1;
- /* Put timestamp in length field. */
- {
- struct stat s;
-
- if (stat (bfd_get_filename (inbfd), &s) < 0)
- s.st_mtime = 0;
- nlm_custom_header (outbfd)->dataLength = s.st_mtime;
- }
- /* No data stamp. */
- memset (nlm_custom_header (outbfd)->dataStamp, 0,
- sizeof (nlm_custom_header (outbfd)->dataStamp));
}
/* Resolve all the stubs for PowerPC NetWare. We fill in the contents
buf,
l->start->value,
POWERPC_STUB_SIZE))
- bfd_fatal ("writing stub");
+ bfd_fatal (_("writing stub"));
/* Create a new reloc for the TOC entry. */
reloc = (arelent *) xmalloc (sizeof (arelent));
char *contents;
bfd_size_type contents_size;
{
- const reloc_howto_type *toc_howto;
+ reloc_howto_type *toc_howto;
long reloc_count;
register arelent **relocs;
register long i;
going to write out whatever we return in the contents field. */
if (strcmp (bfd_get_section_name (insec->owner, insec), ".got") == 0)
memset (contents + powerpc_initial_got_size, 0,
- (bfd_get_section_size_after_reloc (insec)
- - powerpc_initial_got_size));
+ (size_t) (bfd_get_section_size_after_reloc (insec)
+ - powerpc_initial_got_size));
reloc_count = *reloc_count_ptr;
relocs = *relocs_ptr;
{
arelent *rel;
asymbol *sym;
- bfd_vma symvalue;
+ bfd_vma sym_value;
rel = *relocs++;
sym = *rel->sym_ptr_ptr;
+ /* Convert any relocs against the .bss section into relocs
+ against the .data section. */
+ if (strcmp (bfd_get_section_name (outbfd, bfd_get_section (sym)),
+ NLM_UNINITIALIZED_DATA_NAME) == 0)
+ {
+ asection *datasec;
+
+ datasec = bfd_get_section_by_name (outbfd,
+ NLM_INITIALIZED_DATA_NAME);
+ if (datasec != NULL)
+ {
+ rel->addend += (bfd_get_section_vma (outbfd,
+ bfd_get_section (sym))
+ + sym->value);
+ rel->sym_ptr_ptr = datasec->symbol_ptr_ptr;
+ sym = *rel->sym_ptr_ptr;
+ }
+ }
+
/* We must be able to resolve all PC relative relocs at this
point. If we get a branch to an undefined symbol we build a
stub, since NetWare will resolve undefined symbols into a
between two sections both of which were placed in the
same output section. This should not happen. */
if (bfd_get_section (sym) != insec->output_section)
- fprintf (stderr, "%s: unresolved PC relative reloc against %s\n",
+ fprintf (stderr, _("%s: unresolved PC relative reloc against %s\n"),
program_name, bfd_asymbol_name (sym));
else
{
symbol value. The symbol will be start of the TOC section
(which is named .got). We do want to include the addend. */
if (rel->howto == toc_howto)
- symvalue = 0;
+ sym_value = 0;
else
- symvalue = sym->value;
+ sym_value = sym->value;
/* If this is a relocation against a symbol with a value, or
there is a reloc addend, we need to update the addend in the
object file. */
- if (symvalue + rel->addend != 0)
+ if (sym_value + rel->addend != 0)
{
bfd_vma val;
(bfd_byte *) contents + rel->address);
val = ((val &~ rel->howto->dst_mask)
| (((val & rel->howto->src_mask)
- + symvalue
+ + sym_value
+ rel->addend)
& rel->howto->dst_mask));
if ((bfd_signed_vma) val < - 0x8000
|| (bfd_signed_vma) val >= 0x8000)
fprintf (stderr,
- "%s: overflow when adjusting relocation against %s\n",
+ _("%s: overflow when adjusting relocation against %s\n"),
program_name, bfd_asymbol_name (sym));
bfd_put_16 (outbfd, val, (bfd_byte *) contents + rel->address);
break;
(bfd_byte *) contents + rel->address);
val = ((val &~ rel->howto->dst_mask)
| (((val & rel->howto->src_mask)
- + symvalue
+ + sym_value
+ rel->addend)
& rel->howto->dst_mask));
bfd_put_32 (outbfd, val, (bfd_byte *) contents + rel->address);
abort ();
}
- rel->sym_ptr_ptr = bfd_get_section (sym)->symbol_ptr_ptr;
+ if (! bfd_is_und_section (bfd_get_section (sym)))
+ rel->sym_ptr_ptr = bfd_get_section (sym)->symbol_ptr_ptr;
rel->addend = 0;
}
size_t i;
int pid;
int status;
+ char *errfmt;
+ char *errarg;
c = 0;
for (q = inputs; q != NULL; q = q->next)
++c;
- argv = (char **) alloca (c + 5);
+ argv = (char **) alloca ((c + 5) * sizeof(char *));
#ifndef __MSDOS__
if (ld == NULL)
if (ld == NULL)
ld = (char *) LD_NAME;
- choose_temp_base ();
+ temp_filename = choose_temp_base ();
unlink_on_exit = xmalloc (strlen (temp_filename) + 3);
sprintf (unlink_on_exit, "%s.O", temp_filename);
argv[0] = ld;
- argv[1] = (char *) "-r";
+ argv[1] = (char *) "-Ur";
argv[2] = (char *) "-o";
argv[3] = unlink_on_exit;
i = 4;
fprintf (stderr, "\n");
}
- pid = pexecute (ld, argv);
-
- if (waitpid (pid, &status, 0) < 0)
+ pid = pexecute (ld, argv, program_name, (char *) NULL, &errfmt, &errarg,
+ PEXECUTE_SEARCH | PEXECUTE_ONE);
+ if (pid == -1)
{
- perror ("waitpid");
+ fprintf (stderr, _("%s: execution of %s failed: "), program_name, ld);
+ fprintf (stderr, errfmt, errarg);
unlink (unlink_on_exit);
exit (1);
}
- if (status != 0)
+ if (pwait (pid, &status, 0) < 0)
{
- fprintf (stderr, "%s: Execution of %s failed\n", program_name, ld);
+ perror ("pwait");
unlink (unlink_on_exit);
exit (1);
}
- return unlink_on_exit;
-}
-
-/* Choose a temporary file name. Stolen from gcc.c. */
-
-static const char *
-choose_temp_base_try (try, base)
- const char *try;
- const char *base;
-{
- const char *rv;
-
- if (base)
- rv = base;
- else if (try == NULL)
- rv = NULL;
- else if (access (try, R_OK | W_OK) != 0)
- rv = NULL;
- else
- rv = try;
- return rv;
-}
-
-static void
-choose_temp_base ()
-{
- const char *base = NULL;
- int len;
-
- base = choose_temp_base_try (getenv ("TMPDIR"), base);
- base = choose_temp_base_try (getenv ("TMP"), base);
- base = choose_temp_base_try (getenv ("TEMP"), base);
-
-#ifdef P_tmpdir
- base = choose_temp_base_try (P_tmpdir, base);
-#endif
-
- base = choose_temp_base_try ("/usr/tmp", base);
- base = choose_temp_base_try ("/tmp", base);
-
- /* If all else fails, use the current directory! */
- if (base == NULL)
- base = "./";
-
- len = strlen (base);
- temp_filename = xmalloc (len + sizeof("/ccXXXXXX") + 1);
- strcpy (temp_filename, base);
- if (len > 0 && temp_filename[len-1] != '/')
- temp_filename[len++] = '/';
- strcpy (temp_filename + len, "ccXXXXXX");
-
- mktemp (temp_filename);
- if (*temp_filename == '\0')
- abort ();
-}
-
-/* Execute a job. Stolen from gcc.c. */
-
-#ifndef OS2
-#ifdef __MSDOS__
-
-static int
-pexecute (program, argv)
- char *program;
- char *argv[];
-{
- char *scmd, *rf;
- FILE *argfile;
- int i;
-
- scmd = (char *)malloc (strlen (program) + strlen (temp_filename) + 10);
- rf = scmd + strlen(program) + 2 + el;
- sprintf (scmd, "%s.exe @%s.gp", program, temp_filename);
- argfile = fopen (rf, "w");
- if (argfile == 0)
- pfatal_with_name (rf);
-
- for (i=1; argv[i]; i++)
- {
- char *cp;
- for (cp = argv[i]; *cp; cp++)
- {
- if (*cp == '"' || *cp == '\'' || *cp == '\\' || isspace (*cp))
- fputc ('\\', argfile);
- fputc (*cp, argfile);
- }
- fputc ('\n', argfile);
- }
- fclose (argfile);
-
- i = system (scmd);
-
- remove (rf);
-
- if (i == -1)
- {
- perror (program);
- return MIN_FATAL_STATUS << 8;
- }
-
- return i << 8;
-}
-
-#else /* not __MSDOS__ */
-
-static int
-pexecute (program, argv)
- char *program;
- char *argv[];
-{
- int pid;
- int retries, sleep_interval;
-
- /* Fork a subprocess; wait and retry if it fails. */
- sleep_interval = 1;
- for (retries = 0; retries < 4; retries++)
- {
- pid = vfork ();
- if (pid >= 0)
- break;
- sleep (sleep_interval);
- sleep_interval *= 2;
- }
-
- switch (pid)
+ if (status != 0)
{
- case -1:
-#ifdef vfork
- perror ("fork");
-#else
- perror ("vfork");
-#endif
- exit (1);
- /* NOTREACHED */
- return 0;
-
- case 0: /* child */
- /* Exec the program. */
- execvp (program, argv);
- perror (program);
+ fprintf (stderr, _("%s: Execution of %s failed\n"), program_name, ld);
+ unlink (unlink_on_exit);
exit (1);
- /* NOTREACHED */
- return 0;
-
- default:
- /* Return child's process number. */
- return pid;
}
-}
-
-#endif /* not __MSDOS__ */
-#else /* not OS2 */
-static int
-pexecute (program, argv)
- char *program;
- char *argv[];
-{
- return spawnvp (1, program, argv);
+ return unlink_on_exit;
}
-#endif /* not OS2 */
projects / deliverable / binutils-gdb.git / blobdiff