+2013-05-03 Ryan S. Arnold <rsa@linux.vnet.ibm.com>
+
+ * elf/dl-support.c (_dl_aux_init): Add support for AT_HWCAP2.
+ * elf/dl-sysdep.c (_dl_sysdep_start, _dl_show_auxv): Likewise.
+ * misc/getauxval.c (__getauxval): Likewise.
+ * sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Add support for
+ displaying AT_HWCAP2 strings.
+ * elf/elf.h [AT_HWCAP2]: Add a new a_type entry.
+ * sysdeps/s390/dl-procinfo.h (_dl_procinfo): Add 'type' parameter for
+ AT_HWCAP2 support.
+ * sysdeps/i386/dl-procinfo.h: Likewise.
+ * sysdeps/generic/dl-procinfo.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/dl-procinfo.h: (_dl_procinfo): Add
+ nop support for AT_HWCAP2.
+ * sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Likewise.
+ * sysdeps/sparc/dl-procinfo.h: Likewise.
+
2013-05-01 Roland McGrath <roland@hack.frob.com>
* sysdeps/posix/opendir.c: Include <sys/param.h> to get MIN/MAX macros.
uid_t uid = 0;
gid_t gid = 0;
+ /* Don't rely on a specific order of AT_HWCAP and AT_HWCAP2. Collate into a
+ zeroed temp and assign to _dl_hwcap after the auxv has been parsed. */
+ uint64_t hwcap = 0;
+
_dl_auxv = av;
for (; av->a_type != AT_NULL; ++av)
switch (av->a_type)
GL(dl_phnum) = av->a_un.a_val;
break;
case AT_HWCAP:
- GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
+ hwcap |= (unsigned long int) av->a_un.a_val;
+ break;
+ case AT_HWCAP2:
+ hwcap |= ((uint64_t) av->a_un.a_val) << 32;
break;
+
#ifdef NEED_DL_SYSINFO
case AT_SYSINFO:
GL(dl_sysinfo) = av->a_un.a_val;
DL_PLATFORM_AUXV
# endif
}
+
+ GLRO(dl_hwcap) = hwcap;
+
if (seen == 0xf)
{
__libc_enable_secure = uid != 0 || gid != 0;
uintptr_t new_sysinfo = 0;
#endif
+ /* Don't rely on a specific order of AT_HWCAP and AT_HWCAP2. Collate into a
+ zeroed temp and assign to _dl_hwcap after the auxv has been parsed. */
+ uint64_t hwcap = 0;
+
__libc_stack_end = DL_STACK_END (start_argptr);
DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, INTUSE(_dl_argv), _environ,
GLRO(dl_auxv));
GLRO(dl_platform) = (void *) av->a_un.a_val;
break;
case AT_HWCAP:
- GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
+ hwcap |= (unsigned long int) av->a_un.a_val;
+ break;
+ case AT_HWCAP2:
+ hwcap |= ((uint64_t) av->a_un.a_val) << 32;
break;
case AT_CLKTCK:
GLRO(dl_clktck) = av->a_un.a_val;
#endif
}
+ GLRO(dl_hwcap) = hwcap;
+
#ifndef HAVE_AUX_SECURE
if (seen != -1)
{
[AT_SYSINFO - 2] = { "SYSINFO: 0x", hex },
[AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex },
[AT_RANDOM - 2] = { "RANDOM: 0x", hex },
+ [AT_HWCAP2 - 2] = { "HWCAP2: ", hex },
};
unsigned int idx = (unsigned int) (av->a_type - 2);
assert (AT_NULL == 0);
assert (AT_IGNORE == 1);
- if (av->a_type == AT_HWCAP)
+ if (av->a_type == AT_HWCAP || av->a_type == AT_HWCAP2)
{
- /* This is handled special. */
- if (_dl_procinfo (av->a_un.a_val) == 0)
+ /* HWCAP bits are translated into representative strings, per
+ platform. */
+ if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0)
+
continue;
}
#define AT_RANDOM 25 /* Address of 16 random bytes. */
+#define AT_HWCAP2 26 /* Extended machine dependent hints
+ about processor capabilities. */
+
#define AT_EXECFN 31 /* Filename of executable. */
/* Pointer to the global system page used for system calls and other
if (type == AT_HWCAP)
return GLRO(dl_hwcap);
+ else if (type == AT_HWCAP2)
+ return GLRO(dl_hwcap) >> 32;
for (p = GLRO(dl_auxv); p->a_type != AT_NULL; p++)
if (p->a_type == type)
+2013-05-03 Ryan S. Arnold <rsa@linux.vnet.ibm.com>
+
+ * sysdeps/alpha/dl-procinfo.h (_dl_procinfo): Add 'type' parameter for
+ AT_HWCAP2 support.
+
2013-03-06 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/alpha/bits/mman.h (MAP_HUGE_MASK)
+2013-05-03 Ryan S. Arnold <rsa@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_dl_procinfo): Add
+ nop support for AT_HWCAP2.
+
2013-04-19 Roland McGrath <roland@hack.frob.com>
* sysdeps/arm/sysdep.h
+2013-05-03 Ryan S. Arnold <rsa@linux.vnet.ibm.com>
+
+ * sysdeps/mips/dl-procinfo.h (_dl_procinfo): Add 'type' parameter for
+ AT_HWCAP2 support.
+
2013-04-02 Thomas Schwinge <thomas@codesourcery.com>
* sysdeps/mips/math_private.h: New file.
+2013-05-03 Ryan S. Arnold <rsa@linux.vnet.ibm.com>
+
+ * sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Add support for
+ displaying AT_HWCAP2 strings.
+
2013-02-28 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
};
/* We cannot provide a general printing function. */
-#define _dl_procinfo(word) -1
+#define _dl_procinfo(type, word) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
};
/* We cannot provide a general printing function. */
-#define _dl_procinfo(word) -1
+#define _dl_procinfo(type, word) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
+#include <stdint.h>
#include <ldsodefs.h>
#include <sysdep.h> /* This defines the PPC_FEATURE_* macros. */
}
#ifdef IS_IN_rtld
+
static inline int
__attribute__ ((unused))
-_dl_procinfo (int word)
+_dl_procinfo (unsigned int type, int word)
{
- _dl_printf ("AT_HWCAP: ");
+ unsigned int first, count, str_offset;
- for (int i = _DL_HWCAP_FIRST; i < _DL_HWCAP_COUNT; ++i)
+ switch(type)
+ {
+ case AT_HWCAP:
+ _dl_printf ("AT_HWCAP: ");
+ first = _DL_HWCAP_FIRST;
+ count = MIN(_DL_HWCAP_COUNT,_DL_HWCAP2_FIRST);
+ str_offset = 0;
+ break;
+ case AT_HWCAP2:
+ _dl_printf ("AT_HWCAP2: ");
+ first = 0;
+ count = _DL_HWCAP_COUNT - _DL_HWCAP2_FIRST;
+ str_offset = _DL_HWCAP2_FIRST;
+ break;
+ default:
+ /* This should not happen. */
+ return -1;
+ }
+
+ for (int i = first; i < count; ++i)
if (word & (1 << i))
- _dl_printf (" %s", _dl_hwcap_string (i));
+ _dl_printf (" %s", _dl_hwcap_string (str_offset + i));
_dl_printf ("\n");
return 0;
+
}
#endif
static inline int
__attribute__ ((unused))
-_dl_procinfo (int word)
+_dl_procinfo (unsigned int type, int word)
{
int i;
+ /* Unused for now. */
+ if (type == AT_HWCAP2)
+ return 0;
+
_dl_printf ("AT_HWCAP: ");
for (i = 0; i < _DL_HWCAP_COUNT; ++i)
#define _DL_PROCINFO_H 1
/* We cannot provide a general printing function. */
-#define _dl_procinfo(word) -1
+#define _dl_procinfo(type, word) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
};
/* We cannot provide a general printing function. */
-#define _dl_procinfo(word) -1
+#define _dl_procinfo(type, word) -1
static inline const char *
__attribute__ ((unused))
#include <ldsodefs.h>
#include <sysdep.h> /* This defines the PPC_FEATURE_* macros. */
-/* There are 25 bits used, but they are bits 7..31. */
+/* There are 25 bits used in AT_HWCAP, but they are bits 7..31. */
#define _DL_HWCAP_FIRST 7
+#define _DL_HWCAP2_FIRST 32
#define _DL_HWCAP_COUNT 32
/* These bits influence library search. */
}
#ifdef IS_IN_rtld
+
static inline int
__attribute__ ((unused))
-_dl_procinfo (int word)
+_dl_procinfo (unsigned int type, int word)
{
- _dl_printf ("AT_HWCAP: ");
+ unsigned int first, count, str_offset;
- for (int i = _DL_HWCAP_FIRST; i < _DL_HWCAP_COUNT; ++i)
+ switch(type)
+ {
+ case AT_HWCAP:
+ _dl_printf ("AT_HWCAP: ");
+ first = _DL_HWCAP_FIRST;
+ count = MIN(_DL_HWCAP_COUNT,_DL_HWCAP2_FIRST);
+ str_offset = 0;
+ break;
+ case AT_HWCAP2:
+ _dl_printf ("AT_HWCAP2: ");
+ first = 0;
+ count = _DL_HWCAP_COUNT - _DL_HWCAP2_FIRST;
+ str_offset = _DL_HWCAP2_FIRST;
+ break;
+ default:
+ /* This should not happen. */
+ return -1;
+ }
+
+ for (int i = first; i < count; ++i)
if (word & (1 << i))
- _dl_printf (" %s", _dl_hwcap_string (i));
+ _dl_printf (" %s", _dl_hwcap_string (str_offset + i));
_dl_printf ("\n");
| HWCAP_S390_EIMM | HWCAP_S390_DFP)
/* We cannot provide a general printing function. */
-#define _dl_procinfo(word) -1
+#define _dl_procinfo(type, word) -1
static inline const char *
__attribute__ ((unused))
static inline int
__attribute__ ((unused))
-_dl_procinfo (int word)
+_dl_procinfo (unsigned int type, int word)
{
int i;
+ /* Unused for now. */
+ if (type == AT_HWCAP2)
+ return 0;
+
_dl_printf ("AT_HWCAP: ");
for (i = 0; i < _DL_HWCAP_COUNT; ++i)
#undef _dl_procinfo
static inline int
__attribute__ ((unused))
-_dl_procinfo (int word)
+_dl_procinfo (unsigned int type, int word)
{
/* This table should match the information from arch/i386/kernel/setup.c
in the kernel sources. */
int i;
+ /* Unused for now. */
+ if (type == AT_HWCAP2)
+ return 0;
+
_dl_printf ("AT_HWCAP: ");
for (i = 0; i < _DL_HWCAP_COUNT; ++i)
#undef _dl_procinfo
static inline int
__attribute__ ((unused))
-_dl_procinfo (int word)
+_dl_procinfo (unsigned int type, int word)
{
/* This table should match the information from arch/s390/kernel/setup.c
in the kernel sources. */
int i;
+ /* Unused for now. */
+ if (type == AT_HWCAP2)
+ return 0;
+
_dl_printf ("AT_HWCAP: ");
for (i = 0; i < _DL_HWCAP_COUNT; ++i)
projects / thirdparty / glibc.git / commitdiff
