diff options
| author | Maciej W. Rozycki <macro@codesourcery.com> | 2013-06-22 00:39:42 +0100 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@codesourcery.com> | 2013-06-22 00:39:42 +0100 |
| commit | d1d5471579eb0426671bf94f2d71e61dfb204c30 (patch) | |
| tree | a226e0fd379a438ff738170f8b3e0261525a7cb1 | |
| parent | 638faeb6fef1cfd81efe1e2b37d2bd8a8d1b175b (diff) | |
| download | glibc-d1d5471579eb0426671bf94f2d71e61dfb204c30.tar.gz glibc-d1d5471579eb0426671bf94f2d71e61dfb204c30.tar.xz glibc-d1d5471579eb0426671bf94f2d71e61dfb204c30.zip | |
Remove dead DL_DST_REQ_STATIC code.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/dl-dst.h | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 5a62155eb4..4888b19684 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 20b68d90b6..3ed95d02d5 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 |