[PATCH] aarch64: Fix warnings during libgcc build

[Florian Weimer via Gcc-patches]

libgcc/

        * config/aarch64/aarch64-unwind.h (aarch64_cie_signed_with_b_key):
        Add missing const qualifier.  Cast from const unsigned char *
        to const char *.  Use __builtin_strchr to avoid an implicit
        function declaration.
        * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state):
        Add missing cast.

---
 libgcc/config/aarch64/aarch64-unwind.h | 4 ++--
 libgcc/config/aarch64/linux-unwind.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libgcc/config/aarch64/aarch64-unwind.h 
b/libgcc/config/aarch64/aarch64-unwind.h
index 3ad2f8239ed..30e428862c4 100644
--- a/libgcc/config/aarch64/aarch64-unwind.h
+++ b/libgcc/config/aarch64/aarch64-unwind.h
@@ -40,8 +40,8 @@ aarch64_cie_signed_with_b_key (struct _Unwind_Context 
*context)
       const struct dwarf_cie *cie = get_cie (fde);
       if (cie != NULL)
        {
-         char *aug_str = cie->augmentation;
-         return strchr (aug_str, 'B') == NULL ? 0 : 1;
+         const char *aug_str = (const char *) cie->augmentation;
+         return __builtin_strchr (aug_str, 'B') == NULL ? 0 : 1;
        }
     }
   return 0;
diff --git a/libgcc/config/aarch64/linux-unwind.h 
b/libgcc/config/aarch64/linux-unwind.h
index 00eba866049..93da7a9537d 100644
--- a/libgcc/config/aarch64/linux-unwind.h
+++ b/libgcc/config/aarch64/linux-unwind.h
@@ -77,7 +77,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
     }
 
   rt_ = context->cfa;
-  sc = &rt_->uc.uc_mcontext;
+  sc = (struct sigcontext *) &rt_->uc.uc_mcontext;
 
 /* This define duplicates the definition in aarch64.md */
 #define SP_REGNUM 31