Commit 6f87c7d8 by Jason Merrill Committed by Jason Merrill

* collect2.c (extract_init_priority): No priority is 65535.

From-SVN: r23033
parent c98e175c
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> Mon Oct 12 12:10:37 1998 Alexandre Oliva <oliva@dcc.unicamp.br>
* Makefile.in (build_tooldir): new variable, same as old * Makefile.in (build_tooldir): new variable, same as old
......
...@@ -151,6 +151,9 @@ extern char *make_temp_file PROTO ((char *)); ...@@ -151,6 +151,9 @@ extern char *make_temp_file PROTO ((char *));
#define SYMBOL__MAIN __main #define SYMBOL__MAIN __main
#endif #endif
/* This must match tree.h. */
#define DEFAULT_INIT_PRIORITY 65535
#if defined (LDD_SUFFIX) || SUNOS4_SHARED_LIBRARIES #if defined (LDD_SUFFIX) || SUNOS4_SHARED_LIBRARIES
#define SCAN_LIBRARIES #define SCAN_LIBRARIES
#endif #endif
...@@ -1763,14 +1766,15 @@ static int ...@@ -1763,14 +1766,15 @@ static int
extract_init_priority (name) extract_init_priority (name)
char *name; char *name;
{ {
int pos = 0; int pos = 0, pri;
while (name[pos] == '_') while (name[pos] == '_')
++pos; ++pos;
pos += 10; /* strlen ("GLOBAL__X_") */ pos += 10; /* strlen ("GLOBAL__X_") */
/* Extract init_p number from ctor/dtor name. */ /* 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. /* Insertion sort the ids from ctor/dtor list HEAD_PTR in descending order.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment