OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Makefile.def (target_modules): Add libssp.
[pf3gnuchains/gcc-fork.git]
/
gcc
/
collect2.c
diff --git
a/gcc/collect2.c
b/gcc/collect2.c
index
f95fe4d
..
a813e51
100644
(file)
--- a/
gcc/collect2.c
+++ b/
gcc/collect2.c
@@
-20,8
+20,8
@@
for more details.
You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING. If not, write to the Free
You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING. If not, write to the Free
-Software Foundation, 5
9 Temple Place - Suite 330
, Boston, MA
-0211
1-1307
, USA. */
+Software Foundation, 5
1 Franklin Street, Fifth Floor
, Boston, MA
+0211
0-1301
, USA. */
/* Build tables of static constructors and destructors and run ld. */
/* Build tables of static constructors and destructors and run ld. */
@@
-328,26
+328,26
@@
collect_exit (int status)
\f
/* Notify user of a non-error. */
void
\f
/* Notify user of a non-error. */
void
-notice (const char *msgid, ...)
+notice (const char *
c
msgid, ...)
{
va_list ap;
{
va_list ap;
- va_start (ap, msgid);
- vfprintf (stderr, _(msgid), ap);
+ va_start (ap,
c
msgid);
+ vfprintf (stderr, _(
c
msgid), ap);
va_end (ap);
}
/* Die when sys call fails. */
void
va_end (ap);
}
/* Die when sys call fails. */
void
-fatal_perror (const char * msgid, ...)
+fatal_perror (const char *
c
msgid, ...)
{
int e = errno;
va_list ap;
{
int e = errno;
va_list ap;
- va_start (ap, msgid);
+ va_start (ap,
c
msgid);
fprintf (stderr, "collect2: ");
fprintf (stderr, "collect2: ");
- vfprintf (stderr, _(msgid), ap);
+ vfprintf (stderr, _(
c
msgid), ap);
fprintf (stderr, ": %s\n", xstrerror (e));
va_end (ap);
fprintf (stderr, ": %s\n", xstrerror (e));
va_end (ap);
@@
-357,13
+357,13
@@
fatal_perror (const char * msgid, ...)
/* Just die. */
void
/* Just die. */
void
-fatal (const char * msgid, ...)
+fatal (const char *
c
msgid, ...)
{
va_list ap;
{
va_list ap;
- va_start (ap, msgid);
+ va_start (ap,
c
msgid);
fprintf (stderr, "collect2: ");
fprintf (stderr, "collect2: ");
- vfprintf (stderr, _(msgid), ap);
+ vfprintf (stderr, _(
c
msgid), ap);
fprintf (stderr, "\n");
va_end (ap);
fprintf (stderr, "\n");
va_end (ap);
@@
-373,13
+373,13
@@
fatal (const char * msgid, ...)
/* Write error message. */
void
/* Write error message. */
void
-error (const char * msgid, ...)
+error (const char *
g
msgid, ...)
{
va_list ap;
{
va_list ap;
- va_start (ap, msgid);
+ va_start (ap,
g
msgid);
fprintf (stderr, "collect2: ");
fprintf (stderr, "collect2: ");
- vfprintf (stderr, _(msgid), ap);
+ vfprintf (stderr, _(
g
msgid), ap);
fprintf (stderr, "\n");
va_end(ap);
}
fprintf (stderr, "\n");
va_end(ap);
}
@@
-453,7
+453,7
@@
extract_string (const char **pp)
obstack_1grow (&temporary_obstack, '\0');
*pp = p;
obstack_1grow (&temporary_obstack, '\0');
*pp = p;
- return
obstack_finish (&temporary_obstack
);
+ return
XOBFINISH (&temporary_obstack, char *
);
}
\f
void
}
\f
void
@@
-474,7
+474,7
@@
dump_file (const char *name, FILE *to)
const char *word, *p;
char *result;
obstack_1grow (&temporary_obstack, '\0');
const char *word, *p;
char *result;
obstack_1grow (&temporary_obstack, '\0');
- word =
obstack_finish (&temporary_obstack
);
+ word =
XOBFINISH (&temporary_obstack, const char *
);
if (*word == '.')
++word, putc ('.', to);
if (*word == '.')
++word, putc ('.', to);
@@
-831,6
+831,9
@@
main (int argc, char **argv)
signal (SIGCHLD, SIG_DFL);
#endif
signal (SIGCHLD, SIG_DFL);
#endif
+ /* Unlock the stdio streams. */
+ unlock_std_streams ();
+
gcc_init_libintl ();
/* Do not invoke xcalloc before this point, since locale needs to be
gcc_init_libintl ();
/* Do not invoke xcalloc before this point, since locale needs to be
@@
-1603,7
+1606,7
@@
static void
maybe_unlink (const char *file)
{
if (!debug)
maybe_unlink (const char *file)
{
if (!debug)
- unlink (file);
+ unlink
_if_ordinary
(file);
else
notice ("[Leaving %s]\n", file);
}
else
notice ("[Leaving %s]\n", file);
}