From: Maciej W. Rozycki <macro@codesourcery.com>
Date: Fri, 21 Jun 2013 23:39:42 +0000 (+0100)
Subject: Remove dead DL_DST_REQ_STATIC code.
X-Git-Tag: glibc-2.18~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1d5471579eb0426671bf94f2d71e61dfb204c30;p=platform%2Fupstream%2Fglibc.git

Remove dead DL_DST_REQ_STATIC code.
---

diff --git a/ChangeLog b/ChangeLog
index 5a62155..4888b19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-21  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elf/dl-dst.h (DL_DST_REQUIRED): Remove call to
+	DL_DST_REQ_STATIC.
+	(DL_DST_REQ_STATIC): Remove macro.
+
 2013-06-21  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #7006]
diff --git a/elf/dl-dst.h b/elf/dl-dst.h
index 20b68d9..3ed95d0 100644
--- a/elf/dl-dst.h
+++ b/elf/dl-dst.h
@@ -55,7 +55,6 @@
 	   First get the origin string if it is not available yet.	      \
 	   This can only happen for the map of the executable or, when	      \
 	   auditing, in ld.so.  */					      \
-	DL_DST_REQ_STATIC (l)						      \
 	if ((l)->l_origin == NULL)					      \
 	  {								      \
 	    assert ((l)->l_name[0] == '\0' || IS_RTLD (l));		      \
@@ -73,15 +72,3 @@
       }									      \
 									      \
     __len; })
-
-#ifdef SHARED
-# define DL_DST_REQ_STATIC(l) /* nothing */
-#else
-# define DL_DST_REQ_STATIC(l) \
-  if ((l) == NULL)							      \
-    {									      \
-      const char *origin = _dl_get_origin ();				      \
-      dst_len = (origin && origin != (char *) -1 ? strlen (origin) : 0);      \
-    }									      \
-  else
-#endif