From 94ba134cf6431dad0aaece271a16761bc793d490 Mon Sep 17 00:00:00 2001 From: joseph Date: Tue, 2 Jul 2013 00:11:45 +0000 Subject: Merge changes between r23363 and r23421 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@23422 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h') diff --git a/libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h index 5ca4b76ca..331230443 100644 --- a/libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +++ b/libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h @@ -24,12 +24,16 @@ #undef _dl_procinfo static inline int __attribute__ ((unused)) -_dl_procinfo (int word) +_dl_procinfo (unsigned int type, unsigned long int word) { /* This table should match the information from arch/s390/kernel/setup.c in the kernel sources. */ int i; + /* Fallback to unknown output mechanism. */ + if (type == AT_HWCAP2) + return -1; + _dl_printf ("AT_HWCAP: "); for (i = 0; i < _DL_HWCAP_COUNT; ++i) -- cgit v1.2.3