git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcc.c: Revert previous patch for now. 

* gcc.c: Revert previous patch for now.
* config/i386/djgpp.h: Likewise.

From-SVN: r51658
This commit is contained in:
Alexandre Oliva 2002-03-31 18:24:49 +00:00 committed by Alexandre Oliva
parent 5c7060d317
commit ba2b743542
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2002-03-31 Alexandre Oliva <aoliva@redhat.com>
* gcc.c: Revert previous patch for now.
* config/i386/djgpp.h: Likewise.
2002-03-31 Hans-Peter Nilsson <hp@bitrange.com>
* config/mmix/crti.asm (_init): Register _fini with atexit.

4
gcc/config/i386/djgpp.h
View File

@ -1,5 +1,5 @@
/* Configuration for an i386 running MS-DOS with DJGPP.
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU CC.
@ -106,7 +106,7 @@ Boston, MA 02111-1307, USA. */
\t%{r} %{s} %{t} %{u*} %{x} %{z} %{Z}\
\t%{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
\t%{static:} %{L*} %D %o\
\t%{!nostdlib:%{!nodefaultlibs:%G}}\
\t%{!nostdlib:%{!nodefaultlibs:%G %L %G}}\
\t%{!A:%{!nostdlib:%{!nostartfiles:%E}}}\
\t-Tdjgpp.djl %{T*}}}}}}}\n\
%{!c:%{!M:%{!MM:%{!E:%{!S:stubify %{v} %{o*:%*} %{!o*:a.out} }}}}}"

26
gcc/gcc.c
View File

@ -558,9 +558,9 @@ proper position among the other output files. */
#ifndef LIBGCC_SPEC
#if defined(LINK_LIBGCC_SPECIAL) || defined(LINK_LIBGCC_SPECIAL_1)
/* Have gcc do the search for libgcc.a. */
#define LIBGCC_SPEC "libgcc.a%s %L libgcc.a%s"
#define LIBGCC_SPEC "libgcc.a%s"
#else
#define LIBGCC_SPEC "-lgcc %L -lgcc"
#define LIBGCC_SPEC "-lgcc"
#endif
#endif
@ -620,7 +620,7 @@ proper position among the other output files. */
%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
%(linker) %l %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r} %{s} %{t}\
%{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
%{static:} %{L*} %(link_libgcc) %o %{!nostdlib:%{!nodefaultlibs:%G}}\
%{static:} %{L*} %(link_libgcc) %o %{!nostdlib:%{!nodefaultlibs:%G %L %G}}\
%{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}}"
#endif
@ -1426,16 +1426,7 @@ init_gcc_specs (obstack, shared_name, static_name, eh_name)
#else
shared_name,
#endif
"}}} %L ",
"%{static|static-libgcc:", static_name, " ", eh_name,
"}%{!static:%{!static-libgcc:",
"%{!shared:%{!shared-libgcc:", static_name, " ",
eh_name, "}%{shared-libgcc:",
static_name, "}}",
#ifdef LINK_EH_SPEC
"%{shared:%{!shared-libgcc:", static_name, "}}",
#endif
"}}", NULL);
"}}}", NULL);
obstack_grow (obstack, buf, strlen (buf));
free (buf);
@ -1516,7 +1507,7 @@ init_spec ()
when given the proper command line arguments. */
while (*p)
{
if (in_sep && *p == '-' && strncmp (p, "-lgcc %L -lgcc", 14) == 0)
if (in_sep && *p == '-' && strncmp (p, "-lgcc", 5) == 0)
{
init_gcc_specs (&obstack,
#ifdef NO_SHARED_LIBGCC_MULTILIB
@ -1527,11 +1518,10 @@ init_spec ()
,
"-lgcc",
"-lgcc_eh");
p += 14;
p += 5;
in_sep = 0;
}
else if (in_sep && *p == 'l'
&& strncmp (p, "libgcc.a%s %L libgcc.a%s", 24) == 0)
else if (in_sep && *p == 'l' && strncmp (p, "libgcc.a%s", 10) == 0)
{
/* Ug. We don't know shared library extensions. Hope that
systems that use this form don't do shared libraries. */
@ -1544,7 +1534,7 @@ init_spec ()
,
"libgcc.a%s",
"libgcc_eh.a%s");
p += 24;
p += 10;
in_sep = 0;
}
else