[src/trunk]: src _Unwind_GetLanguageSpecificData is supposed to return a _Unw...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/729410fcd910
branches:  trunk
changeset: 794795:729410fcd910
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Mar 24 21:26:01 2014 +0000

description:
_Unwind_GetLanguageSpecificData is supposed to return a _Unwind_Ptr.
This makes a difference on M68K as it uses a different register for
integer vs pointer values.

diffstat:

 external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h         |  4 ++--
 external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c           |  2 +-
 external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c           |  2 +-
 external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c         |  2 +-
 external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c         |  2 +-
 external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c |  2 +-
 external/gpl3/gcc/dist/libgcc/unwind-compat.c                   |  4 ++--
 external/gpl3/gcc/dist/libgcc/unwind-dw2.c                      |  2 +-
 external/gpl3/gcc/dist/libgcc/unwind-generic.h                  |  2 +-
 external/gpl3/gcc/dist/libgcc/unwind-seh.c                      |  4 ++--
 external/gpl3/gcc/dist/libgcc/unwind-sjlj.c                     |  2 +-
 lib/libexecinfo/unwind.c                                        |  4 ++--
 lib/libexecinfo/unwind.h                                        |  4 ++--
 13 files changed, 18 insertions(+), 18 deletions(-)

diffs (183 lines):

diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h
--- a/external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h   Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h   Mon Mar 24 21:26:01 2014 +0000
@@ -183,7 +183,7 @@
 #define _Unwind_Exception _Unwind_Control_Block
   typedef char _Unwind_Exception_Class[8];
 
-  void * _Unwind_GetLanguageSpecificData (_Unwind_Context *);
+  _Unwind_Ptr _Unwind_GetLanguageSpecificData (_Unwind_Context *);
   _Unwind_Ptr _Unwind_GetRegionStart (_Unwind_Context *);
 
   _Unwind_Ptr _Unwind_GetDataRelBase (_Unwind_Context *);
@@ -234,7 +234,7 @@
     }
 
   _Unwind_Ptr _Unwind_GetRegionStart (_Unwind_Context *);
-  void * _Unwind_GetLanguageSpecificData (_Unwind_Context *);
+  _Unwind_Ptr _Unwind_GetLanguageSpecificData (_Unwind_Context *);
 
 /* leb128 type numbers have a potentially unlimited size.
    The target of the following definitions of _sleb128_t and _uleb128_t
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c
--- a/external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c     Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c     Mon Mar 24 21:26:01 2014 +0000
@@ -352,7 +352,7 @@
 
 /* Find the Language specific exception data.  */
 
-void *
+_Unwind_Ptr
 _Unwind_GetLanguageSpecificData (_Unwind_Context * context)
 {
   _Unwind_Control_Block *ucbp;
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c
--- a/external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c     Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c     Mon Mar 24 21:26:01 2014 +0000
@@ -518,7 +518,7 @@
   return (_Unwind_Ptr) ucbp->pr_cache.fnstart;
 }
 
-void *
+_Unwind_Ptr
 _Unwind_GetLanguageSpecificData (_Unwind_Context *context)
 {
   _Unwind_Control_Block *ucbp;
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c
--- a/external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c   Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c   Mon Mar 24 21:26:01 2014 +0000
@@ -347,7 +347,7 @@
   context->ra = (void *) val;
 }
 
-void *
+_Unwind_Ptr
 _Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
 {
   return context->lsda;
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c
--- a/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c   Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c   Mon Mar 24 21:26:01 2014 +0000
@@ -1715,7 +1715,7 @@
   context->rp = val;
 }
 
-void *
+_Unwind_Ptr
 _Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
 {
   return context->lsda;
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c
--- a/external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c   Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c   Mon Mar 24 21:26:01 2014 +0000
@@ -172,7 +172,7 @@
   context->ra = (void *) val;
 }
 
-void *
+_Unwind_Ptr
 _Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
 {
   return context->lsda;
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/unwind-compat.c
--- a/external/gpl3/gcc/dist/libgcc/unwind-compat.c     Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/unwind-compat.c     Mon Mar 24 21:26:01 2014 +0000
@@ -137,10 +137,10 @@
   return __libunwind_Unwind_GetIP (context);
 }
 
-extern void *__libunwind_Unwind_GetLanguageSpecificData
+extern _Unwind_Ptr __libunwind_Unwind_GetLanguageSpecificData
   (struct _Unwind_Context *);
 
-void *
+_Unwind_Ptr
 _Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
 {
   return __libunwind_Unwind_GetLanguageSpecificData (context);
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/unwind-dw2.c
--- a/external/gpl3/gcc/dist/libgcc/unwind-dw2.c        Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/unwind-dw2.c        Mon Mar 24 21:26:01 2014 +0000
@@ -365,7 +365,7 @@
   context->ra = (void *) val;
 }
 
-void *
+_Unwind_Ptr
 _Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
 {
   return context->lsda;
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/unwind-generic.h
--- a/external/gpl3/gcc/dist/libgcc/unwind-generic.h    Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/unwind-generic.h    Mon Mar 24 21:26:01 2014 +0000
@@ -177,7 +177,7 @@
 /* @@@ Retrieve the CFA of the given context.  */
 extern _Unwind_Word _Unwind_GetCFA (struct _Unwind_Context *);
 
-extern void *_Unwind_GetLanguageSpecificData (struct _Unwind_Context *);
+extern _Unwind_Ptr _Unwind_GetLanguageSpecificData (struct _Unwind_Context *);
 
 extern _Unwind_Ptr _Unwind_GetRegionStart (struct _Unwind_Context *);
 
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/unwind-seh.c
--- a/external/gpl3/gcc/dist/libgcc/unwind-seh.c        Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/unwind-seh.c        Mon Mar 24 21:26:01 2014 +0000
@@ -131,8 +131,8 @@
   c->ra = val;
 }
 
-void *
-_Unwind_GetLanguageSpecificData (struct _Unwind_Context *c)
+_Unwind_Ptr 
+_Unwind_GetLanguageSpecificData (struct _Unwind_Context *c
 {
   return c->disp->HandlerData;
 }
diff -r 853666b94261 -r 729410fcd910 external/gpl3/gcc/dist/libgcc/unwind-sjlj.c
--- a/external/gpl3/gcc/dist/libgcc/unwind-sjlj.c       Mon Mar 24 21:25:03 2014 +0000
+++ b/external/gpl3/gcc/dist/libgcc/unwind-sjlj.c       Mon Mar 24 21:26:01 2014 +0000
@@ -231,7 +231,7 @@
   context->fc->call_site = val - 1;
 }
 
-void *
+_Unwind_Ptr
 _Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
 {
   return context->fc->lsda;
diff -r 853666b94261 -r 729410fcd910 lib/libexecinfo/unwind.c
--- a/lib/libexecinfo/unwind.c  Mon Mar 24 21:25:03 2014 +0000
+++ b/lib/libexecinfo/unwind.c  Mon Mar 24 21:26:01 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: unwind.c,v 1.1 2012/05/26 22:02:29 christos Exp $      */
+/*     $NetBSD: unwind.c,v 1.2 2014/03/24 21:26:01 joerg Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
                return 0;
        }
        if (t->n < t->len)
-               t->arr[t->n++] = _Unwind_GetIP(ctx);
+               t->arr[t->n++] = (void *)_Unwind_GetIP(ctx);
        return 0;
 }
 
diff -r 853666b94261 -r 729410fcd910 lib/libexecinfo/unwind.h
--- a/lib/libexecinfo/unwind.h  Mon Mar 24 21:25:03 2014 +0000
+++ b/lib/libexecinfo/unwind.h  Mon Mar 24 21:26:01 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: unwind.h,v 1.1 2012/05/26 22:02:29 christos Exp $      */
+/*     $NetBSD: unwind.h,v 1.2 2014/03/24 21:26:01 joerg Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
 _Unwind_Word            _Unwind_GetGR(struct _Unwind_Context *, int);
 _Unwind_Ptr             _Unwind_GetIP(struct _Unwind_Context *);
 _Unwind_Ptr             _Unwind_GetIPInfo(struct _Unwind_Context *, int *);
-void                   *_Unwind_GetLanguageSpecificData(
+_Unwind_Ptr             _Unwind_GetLanguageSpecificData(
     struct _Unwind_Context *);
 _Unwind_Ptr             _Unwind_GetRegionStart(struct _Unwind_Context *);
 _Unwind_Ptr             _Unwind_GetTextRelBase(struct _Unwind_Context *);