Bug 6839 - Remove CHECK_STATIC_TLS to prevent redefinition warning
Summary: Remove CHECK_STATIC_TLS to prevent redefinition warning
Status: RESOLVED FIXED
Alias: None
Product: glibc
Classification: Unclassified
Component: libc (show other bugs)
Version: 2.8
: P2 normal
Target Milestone: 2.9
Assignee: Ulrich Drepper
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-08-12 16:16 UTC by Ryan S. Arnold
Modified: 2014-07-02 07:53 UTC (History)
1 user (show)

See Also:
Host: powerpc64-linux
Target: powerpc64-linux
Build: powerpc64-linux
Last reconfirmed:
fweimer: security-


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Ryan S. Arnold 2008-08-12 16:16:59 UTC
The CHECK_STATIC_TLS macro in sysdeps/powerpc/powerpc32/dl-machine.c is now
redundant and unnecessary since this macro has been provided in common code
elf/dynamic-link.h.

2008-08-12  Ryan S. Arnold  <rsa@us.ibm.com>

	* sysdeps/powerpc/powerpc32/dl-machine.c (CHECK_STATIC_TLS): Remove
	macro since it is now available in elf/dynamic-link.h.

--- glibc/sysdeps/powerpc/powerpc32/dl-machine.c	2008-08-12 11:04:40.000000000 -0500
+++ glibc.new/sysdeps/powerpc/powerpc32/dl-machine.c	2008-08-12
11:07:40.000000000 -0500
@@ -557,11 +557,6 @@
       }
       break;
 
-#define CHECK_STATIC_TLS(map, sym_map)					      \
-    do {								      \
-      if (__builtin_expect ((sym_map)->l_tls_offset == NO_TLS_OFFSET, 0))     \
-	_dl_allocate_static_tls (sym_map);				      \
-    } while (0)
 #define DO_TLS_RELOC(suffix)						      \
     case R_PPC_DTPREL##suffix:						      \
       /* During relocation all TLS symbols are defined and used.	      \
Comment 1 Ulrich Drepper 2008-08-13 04:04:41 UTC
Applied to cvs.