diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2002-03-31 18:24:49 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2002-03-31 18:24:49 +0000 |
| commit | ba2b743542e9113a391d40c0ac4de75565c4f6d5 (patch) | |
| tree | 5f0a8abbf42f328e0f334bd502d8c7976d329d6d | |
| parent | 5c7060d3179ce4d0dc3dc6881fff36fd904c7088 (diff) | |
| download | gcc-ba2b743542e9113a391d40c0ac4de75565c4f6d5.zip gcc-ba2b743542e9113a391d40c0ac4de75565c4f6d5.tar.gz gcc-ba2b743542e9113a391d40c0ac4de75565c4f6d5.tar.bz2 | |
gcc.c: Revert previous patch for now.
* gcc.c: Revert previous patch for now.
* config/i386/djgpp.h: Likewise.
From-SVN: r51658
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/i386/djgpp.h | 4 | ||||
| -rw-r--r-- | gcc/gcc.c | 26 |
3 files changed, 15 insertions, 20 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0eb7702..9e687a5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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. diff --git a/gcc/config/i386/djgpp.h b/gcc/config/i386/djgpp.h index ba30600..600a11e 100644 --- a/gcc/config/i386/djgpp.h +++ b/gcc/config/i386/djgpp.h @@ -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} }}}}}" @@ -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 |