From: Ulrich Drepper Date: Thu, 22 Dec 2011 19:23:28 +0000 (-0500) Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc X-Git-Tag: glibc-2.15~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2797beae36e8869459b80c51f216cb4558675dad;p=thirdparty%2Fglibc.git Merge branch 'master' of ssh://sourceware.org/git/glibc Conflicts: ChangeLog --- 2797beae36e8869459b80c51f216cb4558675dad diff --cc ChangeLog index 8595c0396d2,f74e0a5d8d5..205020dd9f4 --- a/ChangeLog +++ b/ChangeLog @@@ -1,8 -1,31 +1,36 @@@ +2011-12-22 Liubov Dmitrieva + + * sysdeps/i386/i686/multiarch/strcpy-ssse3.S: Fix wrong copying + processing for last bytes. + + 2011-12-22 Joseph Myers + + * sysdeps/unix/sysv/linux/Makefile (syscall-list-variants) + (syscall-list-default-options, syscall-list-default-condition) + (syscall-list-includes): Define. + ($(objpfx)syscall-%.h $(objpfx)syscall-%.d): Support arbitrary + list of ABIs and options and #if conditions for each ABI. Do not + handle common syscalls between ABIs specially. + * sysdeps/unix/sysv/linux/powerpc/Makefile (64bit-predefine): + Remove. + (syscall-list-variants, syscall-list-32bit-options) + (syscall-list-32bit-condition, syscall-list-64bit-options) + (syscall-list-64bit-condition): Define. + * sysdeps/unix/sysv/linux/s390/Makefile (64bit-predefine): Remove. + (syscall-list-variants, syscall-list-32bit-options) + (syscall-list-32bit-condition, syscall-list-64bit-options) + (syscall-list-64bit-condition): Define. + * sysdeps/unix/sysv/linux/sparc/Makefile (64bit-predefine): + Remove. + (syscall-list-variants, syscall-list-32bit-options) + (syscall-list-32bit-condition, syscall-list-64bit-options) + (syscall-list-64bit-condition): Define. + * sysdeps/unix/sysv/linux/x86_64/Makefile (64bit-predefine): + Remove. + (syscall-list-variants, syscall-list-32bit-options) + (syscall-list-32bit-condition, syscall-list-64bit-options) + (syscall-list-64bit-condition): Define. + 2011-12-22 Ulrich Drepper * locale/iso-639.def: Add brx entry.