From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 13 Aug 2004 18:52:51 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~198
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8b9340e6f26ef1b19c983fa481b75fd12c01d1b;p=platform%2Fupstream%2Fglibc.git

Update.

	non-hidden over hidden symbols and strong over weak symbols
	if both don't start with '_'.
---

diff --git a/ChangeLog b/ChangeLog
index 8b5a2ea88a..64949aa3fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2004-08-13  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/sprof.c (read_symbols): When comparing aliases, prefer
-	strong over weak symbols if both don't start with '_'.
+	non-hidden over hidden symbols and strong over weak symbols
+	if both don't start with '_'.
 
 	* malloc/malloc.c: Use strong_alias instead of weak_alias wherever
 	possible.
diff --git a/elf/sprof.c b/elf/sprof.c
index 458a0905c0..1a4b0681a7 100644
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -28,6 +28,7 @@
 #include <locale.h>
 #include <obstack.h>
 #include <search.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -148,7 +149,8 @@ struct known_symbol
   const char *name;
   uintptr_t addr;
   size_t size;
-  int weak;
+  bool weak;
+  bool hidden;
 
   uintmax_t ticks;
   uintmax_t calls;
@@ -940,6 +942,8 @@ read_symbols (struct shobj *shobj)
 	    newsym->addr = sym->st_value;
 	    newsym->size = sym->st_size;
 	    newsym->weak = ELFW(ST_BIND) (sym->st_info) == STB_WEAK;
+	    newsym->hidden = (ELFW(ST_VISIBILITY) (sym->st_other)
+			      != STV_DEFAULT);
 	    newsym->ticks = 0;
 	    newsym->calls = 0;
 
@@ -954,9 +958,10 @@ read_symbols (struct shobj *shobj)
 	      {
 		/* The function is already defined.  See whether we have
 		   a better name here.  */
-		if (((*existp)->name[0] == '_' && newsym->name[0] != '_')
+		if (((*existp)->hidden && !newsym->hidden)
+		    || ((*existp)->name[0] == '_' && newsym->name[0] != '_')
 		    || ((*existp)->name[0] != '_' && newsym->name[0] != '_'
-			&& (*existp)->weak && !newsym->weak))
+			&& ((*existp)->weak && !newsym->weak)))
 		  *existp = newsym;
 		else
 		  /* We don't need the allocated memory.  */
@@ -995,6 +1000,8 @@ read_symbols (struct shobj *shobj)
 	      newsym->addr = symtab->st_value;
 	      newsym->size = symtab->st_size;
 	      newsym->weak = ELFW(ST_BIND) (symtab->st_info) == STB_WEAK;
+	      newsym->hidden = (ELFW(ST_VISIBILITY) (symtab->st_other)
+				!= STV_DEFAULT);
 	      newsym->ticks = 0;
 	      newsym->froms = NULL;
 	      newsym->tos = NULL;
@@ -1010,9 +1017,10 @@ read_symbols (struct shobj *shobj)
 		{
 		  /* The function is already defined.  See whether we have
 		     a better name here.  */
-		  if (((*existp)->name[0] == '_' && newsym->name[0] != '_')
+		  if (((*existp)->hidden && !newsym->hidden)
+		      || ((*existp)->name[0] == '_' && newsym->name[0] != '_')
 		      || ((*existp)->name[0] != '_' && newsym->name[0] != '_'
-			  && (*existp)->weak && !newsym->weak))
+			  && ((*existp)->weak && !newsym->weak)))
 		    *existp = newsym;
 		  else
 		    /* We don't need the allocated memory.  */