diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1998-10-12 20:08:10 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-10-12 16:08:10 -0400 |
| commit | 6f87c7d816816fdd66e28e4fa72c52f05bba82b9 (patch) | |
| tree | 33f42f7258003e602ecb526953556338525f92f1 | |
| parent | c98e175c2d01b99a2b76bd6e1a815553c540a19b (diff) | |
| download | gcc-6f87c7d816816fdd66e28e4fa72c52f05bba82b9.zip gcc-6f87c7d816816fdd66e28e4fa72c52f05bba82b9.tar.gz gcc-6f87c7d816816fdd66e28e4fa72c52f05bba82b9.tar.bz2 | |
* collect2.c (extract_init_priority): No priority is 65535.
From-SVN: r23033
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/collect2.c | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6f71290..087d5dd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +Mon Oct 12 19:57:34 1998 Jason Merrill <jason@yorick.cygnus.com> + + * collect2.c (extract_init_priority): No priority is 65535. + Mon Oct 12 12:10:37 1998 Alexandre Oliva <oliva@dcc.unicamp.br> * Makefile.in (build_tooldir): new variable, same as old diff --git a/gcc/collect2.c b/gcc/collect2.c index bfa9155..cd269c4 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -151,6 +151,9 @@ extern char *make_temp_file PROTO ((char *)); #define SYMBOL__MAIN __main #endif +/* This must match tree.h. */ +#define DEFAULT_INIT_PRIORITY 65535 + #if defined (LDD_SUFFIX) || SUNOS4_SHARED_LIBRARIES #define SCAN_LIBRARIES #endif @@ -1763,14 +1766,15 @@ static int extract_init_priority (name) char *name; { - int pos = 0; + int pos = 0, pri; while (name[pos] == '_') ++pos; pos += 10; /* strlen ("GLOBAL__X_") */ /* Extract init_p number from ctor/dtor name. */ - return atoi (name + pos); + pri = atoi (name + pos); + return pri ? pri : DEFAULT_INIT_PRIORITY; } /* Insertion sort the ids from ctor/dtor list HEAD_PTR in descending order. |