diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-07-02 00:11:45 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-07-02 00:11:45 +0000 |
| commit | 94ba134cf6431dad0aaece271a16761bc793d490 (patch) | |
| tree | b2b77be695fb5add3d132101bf25f2be915f3139 /libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h | |
| parent | f42fd2771adb82cb5f34ba9e80a607975111da48 (diff) | |
Merge changes between r23363 and r23421 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@23422 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h')
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h | 6 |
1 files changed, 5 insertions, 1 deletions
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) |