aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-01-09 10:59:13 -0800
committerUlrich Drepper <drepper@redhat.com>2010-01-09 10:59:13 -0800
commit6651fa1216b5707b00668def26f43ee12b8cc59e (patch)
tree575e1ea8386d14c993049454641d6b591d8f9a36 /ChangeLog
parentf095bb7204d80f609a73a22796edd6cffd4c6add (diff)
parentd5ea695b42aecd48a329756a8e93228d64714d17 (diff)
downloadglibc-6651fa1216b5707b00668def26f43ee12b8cc59e.tar
glibc-6651fa1216b5707b00668def26f43ee12b8cc59e.tar.gz
glibc-6651fa1216b5707b00668def26f43ee12b8cc59e.tar.bz2
glibc-6651fa1216b5707b00668def26f43ee12b8cc59e.zip
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a2f8d1b78f..0ff613c6f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -130,6 +130,13 @@
* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
+2010-01-07 Roland McGrath <roland@redhat.com>
+
+ * elf/elf.h (PN_XNUM): New macro.
+
+ * elf/dl-sysdep.c (_dl_important_hwcaps): Use NT_GNU_HWCAP instead of
+ literal 2.
+
2010-01-06 Ulrich Drepper <drepper@redhat.com>
* dirent/dirent.h: Fix typo in feature selection macro use.