projects
/
external
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 2.33.1
[external/binutils.git]
/
binutils
/
dllwrap.c
diff --git
a/binutils/dllwrap.c
b/binutils/dllwrap.c
index
c807f49
..
3a58e5f
100644
(file)
--- a/
binutils/dllwrap.c
+++ b/
binutils/dllwrap.c
@@
-1,6
+1,5
@@
/* dllwrap.c -- wrapper for DLLTOOL and GCC to generate PE style DLLs
/* dllwrap.c -- wrapper for DLLTOOL and GCC to generate PE style DLLs
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009
- Free Software Foundation, Inc.
+ Copyright (C) 1998-2019 Free Software Foundation, Inc.
Contributed by Mumit Khan (khan@xraylith.wisc.edu).
This file is part of GNU Binutils.
Contributed by Mumit Khan (khan@xraylith.wisc.edu).
This file is part of GNU Binutils.
@@
-20,13
+19,6
@@
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
02110-1301, USA. */
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
02110-1301, USA. */
-/* AIX requires this to be the first thing in the file. */
-#ifndef __GNUC__
-# ifdef _AIX
- #pragma alloca
-#endif
-#endif
-
#include "sysdep.h"
#include "bfd.h"
#include "libiberty.h"
#include "sysdep.h"
#include "bfd.h"
#include "libiberty.h"
@@
-35,7
+27,6
@@
#include "bucomm.h"
#include <time.h>
#include "bucomm.h"
#include <time.h>
-#include <sys/stat.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
@@
-152,28
+143,30
@@
display (const char * message, va_list args)
static void
static void
-inform
VPARAMS ((const char *message, ...)
)
+inform
(const char *message, ...
)
{
{
- VA_OPEN (args, message);
- VA_FIXEDARG (args, const char *, message);
+ va_list args;
+
+ va_start (args, message);
if (!verbose)
return;
display (message, args);
if (!verbose)
return;
display (message, args);
-
VA_CLOSE
(args);
+
va_end
(args);
}
static void
}
static void
-warn
VPARAMS ((const char *format, ...)
)
+warn
(const char *format, ...
)
{
{
- VA_OPEN (args, format);
- VA_FIXEDARG (args, const char *, format);
+ va_list args;
+
+ va_start (args, format);
display (format, args);
display (format, args);
-
VA_CLOSE
(args);
+
va_end
(args);
}
/* Look for the program formed by concatenating PROG_NAME and the
}
/* Look for the program formed by concatenating PROG_NAME and the
@@
-371,7
+364,7
@@
run (const char *what, char *args)
if (*s == ' ')
i++;
i++;
if (*s == ' ')
i++;
i++;
- argv =
alloca
(sizeof (char *) * (i + 3));
+ argv =
xmalloc
(sizeof (char *) * (i + 3));
i = 0;
argv[i++] = what;
s = args;
i = 0;
argv[i++] = what;
s = args;
@@
-399,6
+392,7
@@
run (const char *what, char *args)
pid = pexecute (argv[0], (char * const *) argv, prog_name, temp_base,
&errmsg_fmt, &errmsg_arg, PEXECUTE_ONE | PEXECUTE_SEARCH);
pid = pexecute (argv[0], (char * const *) argv, prog_name, temp_base,
&errmsg_fmt, &errmsg_arg, PEXECUTE_ONE | PEXECUTE_SEARCH);
+ free (argv);
if (pid == -1)
{
if (pid == -1)
{
@@
-414,7
+408,7
@@
run (const char *what, char *args)
pid = pwait (pid, &wait_status, 0);
if (pid == -1)
{
pid = pwait (pid, &wait_status, 0);
if (pid == -1)
{
- warn (
"wait: %s"
, strerror (errno));
+ warn (
_("pwait returns: %s")
, strerror (errno));
retcode = 1;
}
else if (WIFSIGNALED (wait_status))
retcode = 1;
}
else if (WIFSIGNALED (wait_status))
@@
-482,7
+476,7
@@
usage (FILE *file, int status)
{
fprintf (file, _("Usage %s <option(s)> <object-file(s)>\n"), prog_name);
fprintf (file, _(" Generic options:\n"));
{
fprintf (file, _("Usage %s <option(s)> <object-file(s)>\n"), prog_name);
fprintf (file, _(" Generic options:\n"));
- fprintf (file, _(" @<file> Read options from <file>\n"));
+ fprintf (file, _(" @<file> Read options from <file>\n"));
fprintf (file, _(" --quiet, -q Work quietly\n"));
fprintf (file, _(" --verbose, -v Verbose\n"));
fprintf (file, _(" --version Print dllwrap version\n"));
fprintf (file, _(" --quiet, -q Work quietly\n"));
fprintf (file, _(" --verbose, -v Verbose\n"));
fprintf (file, _(" --version Print dllwrap version\n"));
@@
-855,6
+849,9
@@
Creating one, but that may not be what you want"));
else
which_cpu = UNKNOWN_CPU;
else
which_cpu = UNKNOWN_CPU;
+ if (is_leading_underscore == -1)
+ is_leading_underscore = (which_cpu != X64_CPU && which_cpu != ARM_CPU);
+
/* Re-create the command lines as a string, taking care to quote stuff. */
dlltool_cmdline = dyn_string_new (cmdline_len);
if (verbose)
/* Re-create the command lines as a string, taking care to quote stuff. */
dlltool_cmdline = dyn_string_new (cmdline_len);
if (verbose)
@@
-1025,9
+1022,9
@@
Creating one, but that may not be what you want"));
/* Step 1. Call GCC/LD to create base relocation file. If using GCC, the
driver command line will look like the following:
/* Step 1. Call GCC/LD to create base relocation file. If using GCC, the
driver command line will look like the following:
-
+
% gcc -Wl,--dll --Wl,--base-file,foo.base [rest of command line]
% gcc -Wl,--dll --Wl,--base-file,foo.base [rest of command line]
-
+
If the user does not specify a base name, create temporary one that
is deleted at exit. */
If the user does not specify a base name, create temporary one that
is deleted at exit. */
@@
-1069,9
+1066,9
@@
Creating one, but that may not be what you want"));
/* Step 2. generate the exp file by running dlltool.
dlltool command line will look like the following:
/* Step 2. generate the exp file by running dlltool.
dlltool command line will look like the following:
-
+
% dlltool -Wl,--dll --Wl,--base-file,foo.base [rest of command line]
% dlltool -Wl,--dll --Wl,--base-file,foo.base [rest of command line]
-
+
If the user does not specify a base name, create temporary one that
is deleted at exit. */
If the user does not specify a base name, create temporary one that
is deleted at exit. */