Fix changelogs.

4 files changed, 47 insertions, 42 deletions

diff --git a/ChangeLog.linaro b/ChangeLog.linaro
deleted file mode 100644
index 0e78c9c58..000000000
--- a/ChangeLog.linaro
+++ /dev/null
@@ -1,42 +0,0 @@
-2013-09-23  Carlos O'Donell  <carlos@redhat.com>
-
-	[BZ #15754]
-	* sysdeps/generic/stackguard-macros.h: If PTRGUARD_LOCAL use
-	__pointer_chk_guard_local, otherwise __pointer_chk_guard.
-	* elf/Makefile: Define CFLAGS-tst-ptrguard1-static.c.
-
-	[BZ #15754]
-	* elf/Makefile (tests): Add tst-ptrguard1.
-	(tests-static): Add tst-ptrguard1-static.
-2013-09-23  Carlos O'Donell  <carlos@redhat.com>
-
-	[BZ #15754]
-	* elf/Makefile (tests): Add tst-ptrguard1.
-	(tests-static): Add tst-ptrguard1-static.
-	(tst-ptrguard1-ARGS): Define.
-	(tst-ptrguard1-static-ARGS): Define.
-	* elf/tst-ptrguard1.c: New file.
-	* elf/tst-ptrguard1-static.c: New file.
-	* sysdeps/x86_64/stackguard-macros.h: Define POINTER_CHK_GUARD.
-	* sysdeps/i386/stackguard-macros.h: Likewise.
-	* sysdeps/powerpc/powerpc32/stackguard-macros.h: Likewise.
-	* sysdeps/powerpc/powerpc64/stackguard-macros.h: Likewise.
-	* sysdeps/s390/s390-32/stackguard-macros.h: Likewise.
-	* sysdeps/s390/s390-64/stackguard-macros.h: Likewise.
-	* sysdeps/sparc/sparc32/stackguard-macros.h: Likewise.
-	* sysdeps/sparc/sparc64/stackguard-macros.h: Likewise.
-2013-09-11  Will Newton  <will.newton@linaro.org>
-
-	[BZ #15857]
-	* malloc/malloc.c (__libc_memalign): Check the value of bytes
-	does not overflow.
-2013-09-11  Will Newton  <will.newton@linaro.org>
-
-	[BZ #15855]
-	* malloc/malloc.c (__libc_pvalloc): Check the value of bytes
-	does not overflow.
-2013-09-11  Will Newton  <will.newton@linaro.org>
-
-	[BZ #15856]
-	* malloc/malloc.c (__libc_valloc): Check the value of bytes
-	does not overflow.
diff --git a/libc/ChangeLog.linaro b/libc/ChangeLog.linaro
index c213414e5..fad9dbad4 100644
--- a/libc/ChangeLog.linaro
+++ b/libc/ChangeLog.linaro
@@ -1,3 +1,50 @@
+2013-09-23  Carlos O'Donell  <carlos@redhat.com>
+
+	[BZ #15754]
+	* sysdeps/generic/stackguard-macros.h: If PTRGUARD_LOCAL use
+	__pointer_chk_guard_local, otherwise __pointer_chk_guard.
+	* elf/Makefile: Define CFLAGS-tst-ptrguard1-static.c.
+
+	[BZ #15754]
+	* elf/Makefile (tests): Add tst-ptrguard1.
+	(tests-static): Add tst-ptrguard1-static.
+
+2013-09-23  Carlos O'Donell  <carlos@redhat.com>
+
+	[BZ #15754]
+	* elf/Makefile (tests): Add tst-ptrguard1.
+	(tests-static): Add tst-ptrguard1-static.
+	(tst-ptrguard1-ARGS): Define.
+	(tst-ptrguard1-static-ARGS): Define.
+	* elf/tst-ptrguard1.c: New file.
+	* elf/tst-ptrguard1-static.c: New file.
+	* sysdeps/x86_64/stackguard-macros.h: Define POINTER_CHK_GUARD.
+	* sysdeps/i386/stackguard-macros.h: Likewise.
+	* sysdeps/powerpc/powerpc32/stackguard-macros.h: Likewise.
+	* sysdeps/powerpc/powerpc64/stackguard-macros.h: Likewise.
+	* sysdeps/s390/s390-32/stackguard-macros.h: Likewise.
+	* sysdeps/s390/s390-64/stackguard-macros.h: Likewise.
+	* sysdeps/sparc/sparc32/stackguard-macros.h: Likewise.
+	* sysdeps/sparc/sparc64/stackguard-macros.h: Likewise.
+
+2013-09-11  Will Newton  <will.newton@linaro.org>
+
+	[BZ #15857]
+	* malloc/malloc.c (__libc_memalign): Check the value of bytes
+	does not overflow.
+
+2013-09-11  Will Newton  <will.newton@linaro.org>
+
+	[BZ #15855]
+	* malloc/malloc.c (__libc_pvalloc): Check the value of bytes
+	does not overflow.
+
+2013-09-11  Will Newton  <will.newton@linaro.org>
+
+	[BZ #15856]
+	* malloc/malloc.c (__libc_valloc): Check the value of bytes
+	does not overflow.
+
 2013-09-05  Will Newton  <will.newton@linaro.org>
 
 	* version.h: Bump version.
diff --git a/ports/ChangeLog.ia64.linaro b/libc/ports/ChangeLog.ia64.linaro
index 5cf777516..5cf777516 100644
--- a/ports/ChangeLog.ia64.linaro
+++ b/libc/ports/ChangeLog.ia64.linaro
diff --git a/ports/ChangeLog.tile.linaro b/libc/ports/ChangeLog.tile.linaro
index a0fe38792..a0fe38792 100644
--- a/ports/ChangeLog.tile.linaro
+++ b/libc/ports/ChangeLog.tile.linaro