about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-12-22 14:23:28 -0500
committerUlrich Drepper <drepper@gmail.com>2011-12-22 14:23:28 -0500
commit2797beae36e8869459b80c51f216cb4558675dad (patch)
treef972fb95ae89872d0ef11869d8f9fe26a65e2a52 /ChangeLog
parent2bd779ae3f3a86bce22fcb7665d740b14ac677ca (diff)
parent154bfc16225aaa3d3104e758eed2a17297131599 (diff)
downloadglibc-2797beae36e8869459b80c51f216cb4558675dad.tar.gz
glibc-2797beae36e8869459b80c51f216cb4558675dad.tar.xz
glibc-2797beae36e8869459b80c51f216cb4558675dad.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog28
1 files changed, 28 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8595c0396d..205020dd9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,34 @@
 	* sysdeps/i386/i686/multiarch/strcpy-ssse3.S: Fix wrong copying
 	processing for last bytes.
 
+2011-12-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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  <drepper@gmail.com>
 
 	* locale/iso-639.def: Add brx entry.