[review v3] slotinfo in struct dtv_slotinfo_list should be flexible array [BZ #25...

["Florian Weimer (Code Review)" <gerrit@gnutoolchain-gerrit.osci.io>]

Florian Weimer has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/489
......................................................................


Patch Set 3:

(2 comments)

This should be ready for committing.

| --- csu/libc-tls.c
| +++ csu/libc-tls.c
| @@ -199,18 +193,18 @@ #endif
|    /* Update the executable's link map with enough information to make
|       the TLS routines happy.  */
|    main_map->l_tls_align = align;
|    main_map->l_tls_blocksize = memsz;
|    main_map->l_tls_initimage = initimage;
|    main_map->l_tls_initimage_size = filesz;
|    main_map->l_tls_modid = 1;
|  
|    init_slotinfo ();
|    // static_slotinfo.si.slotinfo[1].gen = 0; already zero

PS2, Line 202:

Right, fixed. That removes the last .si reference from the file.

| -  static_slotinfo.si.slotinfo[1].map = main_map;
| +  static_slotinfo.slotinfo[1].map = main_map;
|  
|    memsz = roundup (memsz, align ?: 1);
|  
|  #if TLS_DTV_AT_TP
|    memsz += tcb_offset;
|  #endif
|  
| --- nptl_db/db_info.c
| +++ nptl_db/db_info.c
| @@ -49,15 +49,18 @@ #define schedparam_sched_priority schedparam.sched_priority
|  
|  #define eventbuf_eventmask eventbuf.eventmask
|  #define eventbuf_eventmask_event_bits eventbuf.eventmask.event_bits
|  
|  #define DESC(name, offset, obj) \
|    DB_DEFINE_DESC (name, 8 * sizeof (obj), 1, offset);
|  #define ARRAY_DESC(name, offset, obj) \
|    DB_DEFINE_DESC (name, \
| -		  8 * sizeof (obj)[0], sizeof (obj) / sizeof (obj)[0], \
| +		  8 * sizeof (obj)[0], sizeof (obj) / sizeof (obj)[0],	\

PS2, Line 57:

No, it's not, it's a leftover from previous changes. Fixed.

|  		  offset);
| +/* Flexible arrays do not have a length that can be determined.  */
| +#define FLEXIBLE_ARRAY_DESC(name, offset, obj) \
| +  DB_DEFINE_DESC (name, 8 * sizeof (obj)[0], 0, offset);
|  
|  #if TLS_TCB_AT_TP
|  # define dtvp header.dtv
|  #elif TLS_DTV_AT_TP
|  /* Special case hack.  If TLS_TCB_SIZE == 0 (on PowerPC), there is no TCB

-- 
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I51be146a7857186a4ede0bb40b332509487bdde8
Gerrit-Change-Number: 489
Gerrit-PatchSet: 3
Gerrit-Owner: Florian Weimer <fweimer@redhat.com>
Gerrit-Reviewer: Florian Weimer <fweimer@redhat.com>
Gerrit-Reviewer: Szabolcs Nagy <szabolcs.nagy@arm.com>
Gerrit-Comment-Date: Tue, 12 Nov 2019 11:47:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Szabolcs Nagy <szabolcs.nagy@arm.com>
Gerrit-MessageType: comment