From: Jason Merrill <jason@yorick.cygnus.com>
Date: Mon, 12 Oct 1998 20:08:10 +0000 (+0000)
Subject: * collect2.c (extract_init_priority): No priority is 65535.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6f87c7d816816fdd66e28e4fa72c52f05bba82b9;p=gcc.git

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

From-SVN: r23033
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6f71290a80a..087d5dd7d60 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 bfa91550874..cd269c408b0 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.