Allocate some additional space for dlopen'd libraries. Currently 256 byte,
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Tue, 3 May 2005 18:25:13 +0000 (18:25 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Tue, 3 May 2005 18:25:13 +0000 (18:25 +0000)
we can decide later to increase it.

libexec/rtld-elf/i386/reloc.c
sys/cpu/i386/include/tls.h
sys/i386/include/tls.h

index 79456d3..5e70e15 100644 (file)
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.6.2.2 2002/06/16 20:02:09 dillon Exp $
- * $DragonFly: src/libexec/rtld-elf/i386/reloc.c,v 1.10 2005/04/28 20:53:19 joerg Exp $
+ * $DragonFly: src/libexec/rtld-elf/i386/reloc.c,v 1.11 2005/05/03 18:25:13 joerg Exp $
  */
 
 /*
@@ -340,7 +340,7 @@ allocate_initial_tls(Obj_Entry *objs)
      *
      * We may have to replace an 'initial' TLS previously created by libc.
      */
-    tls_static_space = tls_last_offset /* + RTLD_STATIC_TLS_EXTRA */;
+    tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA;
 
     if (sys_get_tls_area(0, &ti, sizeof(ti)) == 0)
        old_tcb = ti.base;
index 513e107..0a0d2e1 100644 (file)
@@ -28,7 +28,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sys/cpu/i386/include/tls.h,v 1.2 2005/03/29 23:04:36 joerg Exp $
+ * $DragonFly: src/sys/cpu/i386/include/tls.h,v 1.3 2005/05/03 18:25:13 joerg Exp $
  */
 
 #ifndef        _MACHINE_TLS_H_
@@ -52,6 +52,7 @@ struct tls_dtv {
 #define        RTLD_TCB_HAS_SELF_POINTER
 #define        RTLD_STATIC_TLS_ALIGN           16
 #define        RTLD_STATIC_TLS_ALIGN_MASK      (RTLD_STATIC_TLS_ALIGN - 1)
+#define        RTLD_STATIC_TLS_EXTRA           256
 #define RTLD_STATIC_TLS_VARIANT_II
 
 /* Get the current TCB. */
index 03f5f5d..28c1ac7 100644 (file)
@@ -28,7 +28,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sys/i386/include/Attic/tls.h,v 1.2 2005/03/29 23:04:36 joerg Exp $
+ * $DragonFly: src/sys/i386/include/Attic/tls.h,v 1.3 2005/05/03 18:25:13 joerg Exp $
  */
 
 #ifndef        _MACHINE_TLS_H_
@@ -52,6 +52,7 @@ struct tls_dtv {
 #define        RTLD_TCB_HAS_SELF_POINTER
 #define        RTLD_STATIC_TLS_ALIGN           16
 #define        RTLD_STATIC_TLS_ALIGN_MASK      (RTLD_STATIC_TLS_ALIGN - 1)
+#define        RTLD_STATIC_TLS_EXTRA           256
 #define RTLD_STATIC_TLS_VARIANT_II
 
 /* Get the current TCB. */