* symtab.cc (Symbol_table::add_from_relobj): Don't set the version

[deliverable/binutils-gdb.git] / gold / dynobj.cc

diff --git a/gold/dynobj.cc b/gold/dynobj.cc
index 6c0a4b28a56811e7bfac37daf9b91df3054380f0..b6868675df77655433816212cdbff07291d12184 100644 (file)
--- a/gold/dynobj.cc
+++ b/gold/dynobj.cc
@@ -687,20 +687,22 @@ Dynobj::compute_bucket_count(const std::vector<uint32_t>& hashcodes,
   // based on the number of symbols there are.  If there are fewer
   // than 3 symbols we use 1 bucket, fewer than 17 symbols we use 3
   // buckets, fewer than 37 we use 17 buckets, and so forth.  We never
-  // use more than 32771 buckets.  This is straight from the old GNU
+  // use more than 262147 buckets.  This is straight from the old GNU
   // linker.
   static const unsigned int buckets[] =
   {
     1, 3, 17, 37, 67, 97, 131, 197, 263, 521, 1031, 2053, 4099, 8209,
-    16411, 32771
+    16411, 32771, 65537, 131101, 262147
   };
   const int buckets_count = sizeof buckets / sizeof buckets[0];
 
   unsigned int symcount = hashcodes.size();
   unsigned int ret = 1;
+  const double full_fraction
+    = 1.0 - parameters->options().hash_bucket_empty_fraction();
   for (int i = 0; i < buckets_count; ++i)
     {
-      if (symcount < buckets[i])
+      if (symcount < buckets[i] * full_fraction)
        break;
       ret = buckets[i];
     }