OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

* sysdeps/generic/dl-sysdep.c (_dl_important_hwcaps): Fix creation
	of .str elements in the returned data structure.
This commit is contained in:
Ulrich Drepper 2002-03-02 10:32:19 +00:00
parent cc8594b155
commit 0e25633a77
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2002-03-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/dl-sysdep.c (_dl_important_hwcaps): Fix creation
of .str elements in the returned data structure.
* elf/elf.h: Add Alpha TLS bits.
2002-02-28 Jakub Jelinek <jakub@redhat.com>

8
sysdeps/generic/dl-sysdep.c
View File

@ -325,15 +325,16 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
temp[m].len = platform_len;
++m;
}
assert (m == cnt);
/* Determine the total size of all strings together. */
if (cnt == 1)
total = temp[0].len;
else
{
total = (1 << (cnt - 2)) * (temp[0].len + temp[cnt - 1].len + 2);
total = (1UL << (cnt - 2)) * (temp[0].len + temp[cnt - 1].len + 2);
for (n = 1; n + 1 < cnt; ++n)
total += (1 << (cnt - 3)) * (temp[n].len + 1);
total += (1UL << (cnt - 3)) * (temp[n].len + 1);
}
/* The result structure: we use a very compressed way to store the
@ -415,12 +416,11 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
rp = &result[2];
while (n != (1UL << (cnt - 1)))
{
if ((n & 1) != 0)
if ((--n & 1) != 0)
rp[0].str = rp[-2].str + rp[-2].len;
else
rp[0].str = rp[-1].str;
++rp;
--n;
}
/* The second have starts right after the first part of the string of