aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Gretton-Dann <matthew.gretton-dann@linaro.org>2012-10-02 18:55:41 +0100
committerMatthew Gretton-Dann <matthew.gretton-dann@linaro.org>2012-10-02 18:55:41 +0100
commit89275e63aaf3ccad517d4bb8a9a0e65bf8447043 (patch)
tree2cf18d20198f42c675a3169b44af1c6640c37fa4
parentcefe27db6b6c114215902b5e7eff7bd3acaad08c (diff)
LP: #1053348 Re-merge binary files from GCC 4.7.
-rw-r--r--ChangeLog.linaro13
-rw-r--r--libgo/go/archive/zip/testdata/crc32-not-streamed.zipbin0 -> 314 bytes
-rw-r--r--libgo/go/archive/zip/testdata/go-no-datadesc-sig.zipbin0 -> 330 bytes
-rw-r--r--libgo/go/archive/zip/testdata/go-with-datadesc-sig.zipbin0 -> 242 bytes
-rw-r--r--libgo/go/archive/zip/testdata/r.zipbin440 -> 0 bytes
-rwxr-xr-xlibgo/go/debug/dwarf/testdata/typedef.elfbin10837 -> 12448 bytes
-rw-r--r--libgo/go/debug/dwarf/testdata/typedef.machobin5256 -> 5024 bytes
7 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog.linaro b/ChangeLog.linaro
index c381d6cf5ae..8a43da7d004 100644
--- a/ChangeLog.linaro
+++ b/ChangeLog.linaro
@@ -1,3 +1,16 @@
+2012-10-02 Matthew Gretton-Dann <matthew.gretton-dann@linaro.org>
+
+ LP: #1053348
+ Re-merge binary files from GCC 4.7:
+
+ libgo/
+ * go/archive/zip/testdata/r.zip: Remove.
+ * go/archive/zip/testdata/crc32-not-streamed.zip: New file.
+ * go/archive/zip/testdata/go-no-datadesc-sig.zip: Likewise.
+ * go/archive/zip/testdata/go-with-datadesc-sig.zip: Likewise.
+ * go/debug/dwarf/testdata/typedef.elf: Update.
+ * go/debug/dwarf/testdata/typedef.macho: Likewise.
+
2012-10-01 Matthew Gretton-Dann <matthew.gretton-dann@linaro.org>
Merge from FSF GCC 4.7.2 (svn branches/gcc-4_7-branch 191881).
diff --git a/libgo/go/archive/zip/testdata/crc32-not-streamed.zip b/libgo/go/archive/zip/testdata/crc32-not-streamed.zip
new file mode 100644
index 00000000000..f268d88732f
--- /dev/null
+++ b/libgo/go/archive/zip/testdata/crc32-not-streamed.zip
Binary files differ
diff --git a/libgo/go/archive/zip/testdata/go-no-datadesc-sig.zip b/libgo/go/archive/zip/testdata/go-no-datadesc-sig.zip
new file mode 100644
index 00000000000..c3d593f44f9
--- /dev/null
+++ b/libgo/go/archive/zip/testdata/go-no-datadesc-sig.zip
Binary files differ
diff --git a/libgo/go/archive/zip/testdata/go-with-datadesc-sig.zip b/libgo/go/archive/zip/testdata/go-with-datadesc-sig.zip
new file mode 100644
index 00000000000..bcfe121bb63
--- /dev/null
+++ b/libgo/go/archive/zip/testdata/go-with-datadesc-sig.zip
Binary files differ
diff --git a/libgo/go/archive/zip/testdata/r.zip b/libgo/go/archive/zip/testdata/r.zip
deleted file mode 100644
index ea0fa2ffccc..00000000000
--- a/libgo/go/archive/zip/testdata/r.zip
+++ /dev/null
Binary files differ
diff --git a/libgo/go/debug/dwarf/testdata/typedef.elf b/libgo/go/debug/dwarf/testdata/typedef.elf
index 44df8da9bc7..b2062d2c4bb 100755
--- a/libgo/go/debug/dwarf/testdata/typedef.elf
+++ b/libgo/go/debug/dwarf/testdata/typedef.elf
Binary files differ
diff --git a/libgo/go/debug/dwarf/testdata/typedef.macho b/libgo/go/debug/dwarf/testdata/typedef.macho
index 41019c1e146..f75afcccbfc 100644
--- a/libgo/go/debug/dwarf/testdata/typedef.macho
+++ b/libgo/go/debug/dwarf/testdata/typedef.macho
Binary files differ