summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-08-02 18:35:04 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-08-02 18:35:04 +0000
commitd0b776bb912b59d6e9e220768e460317b562ce34 (patch)
tree69fa5d9159d0f00c4f4027bab4153148e2e156a4
parent474b6bcaefb317d1da0ff9296612da2b154685fc (diff)
downloadgcc-49-d0b776bb912b59d6e9e220768e460317b562ce34.tar.gz
* Update to SVN 20140802 (r213518) from the gcc-4_9-branch.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7555 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/svn-updates.diff43
2 files changed, 42 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index d5b8d9f..c8888ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
gcc-4.9 (4.9.1-5) UNRELEASED; urgency=medium
- * Update to SVN 20140802 (r213510) from the gcc-4_9-branch.
+ * Update to SVN 20140802 (r213518) from the gcc-4_9-branch.
- Fix PR tree-optimization/61964. LP: #1347147.
* Fix libphobos cross build.
- -- Matthias Klose <doko@debian.org> Sat, 02 Aug 2014 02:36:26 +0200
+ -- Matthias Klose <doko@debian.org> Sat, 02 Aug 2014 20:34:30 +0200
gcc-4.9 (4.9.1-4) unstable; urgency=high
diff --git a/debian/patches/svn-updates.diff b/debian/patches/svn-updates.diff
index e0bbe86..7a41a72 100644
--- a/debian/patches/svn-updates.diff
+++ b/debian/patches/svn-updates.diff
@@ -1,10 +1,10 @@
-# DP: updates from the 4.9 branch upto 20140802 (r213510).
+# DP: updates from the 4.9 branch upto 20140802 (r213518).
last_update()
{
cat > ${dir}LAST_UPDATED <EOF
-Sat Aug 2 02:28:42 CEST 2014
-Sat Aug 2 00:28:42 UTC 2014 (revision 213510)
+Sat Aug 2 20:28:45 CEST 2014
+Sat Aug 2 18:28:45 UTC 2014 (revision 213518)
EOF
}
@@ -3947,6 +3947,43 @@ Index: gcc/config/arm/t-rtems-eabi
+MULTILIB_EXCEPTIONS += mfpu=fpv4-sp-d16/mfloat-abi=hard
+MULTILIB_EXCEPTIONS += mfpu=fpv4-sp-d16
MULTILIB_EXCEPTIONS += mfloat-abi=hard
+Index: libgo/runtime/go-caller.c
+===================================================================
+--- a/src/libgo/runtime/go-caller.c (.../tags/gcc_4_9_1_release)
++++ b/src/libgo/runtime/go-caller.c (.../branches/gcc-4_9-branch)
+@@ -7,6 +7,9 @@
+ /* Implement runtime.Caller. */
+
+ #include <stdint.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
+
+ #include "backtrace.h"
+
+@@ -99,6 +102,7 @@
+ if (back_state == NULL)
+ {
+ const char *filename;
++ struct stat s;
+
+ filename = (const char *) runtime_progname ();
+
+@@ -108,6 +112,14 @@
+ if (__builtin_strchr (filename, '/') == NULL)
+ filename = NULL;
+
++ /* If the file is small, then it's not the real executable.
++ This is specifically to deal with Docker, which uses a bogus
++ argv[0] (http://gcc.gnu.org/PR61895). It would be nice to
++ have a better check for whether this file is the real
++ executable. */
++ if (stat (filename, &s) < 0 || s.st_size < 1024)
++ filename = NULL;
++
+ back_state = backtrace_create_state (filename, 1, error_callback, NULL);
+ }
+ runtime_unlock (&back_state_lock);
Index: libobjc/encoding.c
===================================================================
--- a/src/libobjc/encoding.c (.../tags/gcc_4_9_1_release)