[gcc-6] 321/401: - Fix the libiberty update

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 1096a7842a1dc8f768ce20cb8d2274aa8fa6bc18
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Dec 15 19:47:40 2016 +0000

     - Fix the libiberty update
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9189 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/libiberty-updates.diff | 66 +++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/debian/patches/libiberty-updates.diff b/debian/patches/libiberty-updates.diff
index 46658db..f1a81ab 100644
--- a/debian/patches/libiberty-updates.diff
+++ b/debian/patches/libiberty-updates.diff
@@ -2526,6 +2526,72 @@
     FLAGS	As above.
 --- a/src/include/demangle.h
 +++ b/src/include/demangle.h
+@@ -63,9 +63,10 @@
+ #define DMGL_GNU_V3	 (1 << 14)
+ #define DMGL_GNAT	 (1 << 15)
+ #define DMGL_DLANG	 (1 << 16)
++#define DMGL_RUST	 (1 << 17)	/* Rust wraps GNU_V3 style mangling.  */
+ 
+ /* If none of these are set, use 'current_demangling_style' as the default. */
+-#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_V3|DMGL_JAVA|DMGL_GNAT|DMGL_DLANG)
++#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_V3|DMGL_JAVA|DMGL_GNAT|DMGL_DLANG|DMGL_RUST)
+ 
+ /* Enumeration of possible demangling styles.
+ 
+@@ -88,7 +89,8 @@
+   gnu_v3_demangling = DMGL_GNU_V3,
+   java_demangling = DMGL_JAVA,
+   gnat_demangling = DMGL_GNAT,
+-  dlang_demangling = DMGL_DLANG
++  dlang_demangling = DMGL_DLANG,
++  rust_demangling = DMGL_RUST
+ } current_demangling_style;
+ 
+ /* Define string names for the various demangling styles. */
+@@ -104,6 +106,7 @@
+ #define JAVA_DEMANGLING_STYLE_STRING          "java"
+ #define GNAT_DEMANGLING_STYLE_STRING          "gnat"
+ #define DLANG_DEMANGLING_STYLE_STRING         "dlang"
++#define RUST_DEMANGLING_STYLE_STRING          "rust"
+ 
+ /* Some macros to test what demangling style is active. */
+ 
+@@ -118,6 +121,7 @@
+ #define JAVA_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_JAVA)
+ #define GNAT_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_GNAT)
+ #define DLANG_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_DLANG)
++#define RUST_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_RUST)
+ 
+ /* Provide information about the available demangle styles. This code is
+    pulled from gdb into libiberty because it is useful to binutils also.  */
+@@ -175,6 +179,27 @@
+ extern char *
+ dlang_demangle (const char *mangled, int options);
+ 
++/* Returns non-zero iff MANGLED is a rust mangled symbol.  MANGLED must
++   already have been demangled through cplus_demangle_v3.  If this function
++   returns non-zero then MANGLED can be demangled (in-place) using
++   RUST_DEMANGLE_SYM.  */
++extern int
++rust_is_mangled (const char *mangled);
++
++/* Demangles SYM (in-place) if RUST_IS_MANGLED returned non-zero for SYM.
++   If RUST_IS_MANGLED returned zero for SYM then RUST_DEMANGLE_SYM might
++   replace characters that cannot be demangled with '?' and might truncate
++   SYM.  After calling RUST_DEMANGLE_SYM SYM might be shorter, but never
++   larger.  */
++extern void
++rust_demangle_sym (char *sym);
++
++/* Demangles MANGLED if it was GNU_V3 and then RUST mangled, otherwise
++   returns NULL. Uses CPLUS_DEMANGLE_V3, RUST_IS_MANGLED and
++   RUST_DEMANGLE_SYM.  Returns a new string that is owned by the caller.  */
++extern char *
++rust_demangle (const char *mangled, int options);
++
+ enum gnu_v3_ctor_kinds {
+   gnu_v3_complete_object_ctor = 1,
+   gnu_v3_base_object_ctor,
 @@ -449,7 +449,9 @@
    /* A transaction-safe function type.  */
    DEMANGLE_COMPONENT_TRANSACTION_SAFE,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git