Module Name: src
Committed By: joerg
Date: Mon Mar 24 21:26:01 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/ginclude: unwind-arm-common.h
src/external/gpl3/gcc/dist/libgcc: unwind-compat.c unwind-dw2.c
unwind-generic.h unwind-seh.c unwind-sjlj.c
src/external/gpl3/gcc/dist/libgcc/config/arm: pr-support.c
src/external/gpl3/gcc/dist/libgcc/config/c6x: pr-support.c
src/external/gpl3/gcc/dist/libgcc/config/cr16: unwind-cr16.c
src/external/gpl3/gcc/dist/libgcc/config/ia64: unwind-ia64.c
src/external/gpl3/gcc/dist/libgcc/config/xtensa: unwind-dw2-xtensa.c
src/lib/libexecinfo: unwind.c unwind.h
Log Message:
_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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/unwind-compat.c \
src/external/gpl3/gcc/dist/libgcc/unwind-dw2.c \
src/external/gpl3/gcc/dist/libgcc/unwind-generic.h \
src/external/gpl3/gcc/dist/libgcc/unwind-sjlj.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/libgcc/unwind-seh.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libexecinfo/unwind.c \
src/lib/libexecinfo/unwind.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h
diff -u src/external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h:1.1.1.1 src/external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h:1.2
--- src/external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h:1.1.1.1 Sat Mar 1 08:43:02 2014
+++ src/external/gpl3/gcc/dist/gcc/ginclude/unwind-arm-common.h Mon Mar 24 21:26:01 2014
@@ -183,7 +183,7 @@ extern "C" {
#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 @@ extern "C" {
}
_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
Index: src/external/gpl3/gcc/dist/libgcc/unwind-compat.c
diff -u src/external/gpl3/gcc/dist/libgcc/unwind-compat.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/unwind-compat.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/unwind-compat.c:1.1.1.1 Sat Mar 1 08:41:45 2014
+++ src/external/gpl3/gcc/dist/libgcc/unwind-compat.c Mon Mar 24 21:26:01 2014
@@ -137,10 +137,10 @@ _Unwind_GetIPInfo (struct _Unwind_Contex
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);
Index: src/external/gpl3/gcc/dist/libgcc/unwind-dw2.c
diff -u src/external/gpl3/gcc/dist/libgcc/unwind-dw2.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/unwind-dw2.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/unwind-dw2.c:1.1.1.1 Sat Mar 1 08:41:45 2014
+++ src/external/gpl3/gcc/dist/libgcc/unwind-dw2.c Mon Mar 24 21:26:01 2014
@@ -365,7 +365,7 @@ _Unwind_SetIP (struct _Unwind_Context *c
context->ra = (void *) val;
}
-void *
+_Unwind_Ptr
_Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
{
return context->lsda;
Index: src/external/gpl3/gcc/dist/libgcc/unwind-generic.h
diff -u src/external/gpl3/gcc/dist/libgcc/unwind-generic.h:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/unwind-generic.h:1.2
--- src/external/gpl3/gcc/dist/libgcc/unwind-generic.h:1.1.1.1 Sat Mar 1 08:41:45 2014
+++ src/external/gpl3/gcc/dist/libgcc/unwind-generic.h Mon Mar 24 21:26:01 2014
@@ -177,7 +177,7 @@ extern void _Unwind_SetIP (struct _Unwin
/* @@@ 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 *);
Index: src/external/gpl3/gcc/dist/libgcc/unwind-sjlj.c
diff -u src/external/gpl3/gcc/dist/libgcc/unwind-sjlj.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/unwind-sjlj.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/unwind-sjlj.c:1.1.1.1 Sat Mar 1 08:41:45 2014
+++ src/external/gpl3/gcc/dist/libgcc/unwind-sjlj.c Mon Mar 24 21:26:01 2014
@@ -231,7 +231,7 @@ _Unwind_SetIP (struct _Unwind_Context *c
context->fc->call_site = val - 1;
}
-void *
+_Unwind_Ptr
_Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
{
return context->fc->lsda;
Index: src/external/gpl3/gcc/dist/libgcc/unwind-seh.c
diff -u src/external/gpl3/gcc/dist/libgcc/unwind-seh.c:1.1.1.2 src/external/gpl3/gcc/dist/libgcc/unwind-seh.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/unwind-seh.c:1.1.1.2 Mon Mar 3 02:43:19 2014
+++ src/external/gpl3/gcc/dist/libgcc/unwind-seh.c Mon Mar 24 21:26:01 2014
@@ -131,8 +131,8 @@ _Unwind_SetIP (struct _Unwind_Context *c
c->ra = val;
}
-void *
-_Unwind_GetLanguageSpecificData (struct _Unwind_Context *c)
+_Unwind_Ptr
+_Unwind_GetLanguageSpecificData (struct _Unwind_Context *c
{
return c->disp->HandlerData;
}
Index: src/external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c
diff -u src/external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c:1.1.1.1 Sat Mar 1 08:41:47 2014
+++ src/external/gpl3/gcc/dist/libgcc/config/arm/pr-support.c Mon Mar 24 21:26:01 2014
@@ -352,7 +352,7 @@ _Unwind_GetRegionStart (_Unwind_Context
/* Find the Language specific exception data. */
-void *
+_Unwind_Ptr
_Unwind_GetLanguageSpecificData (_Unwind_Context * context)
{
_Unwind_Control_Block *ucbp;
Index: src/external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c
diff -u src/external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c:1.1.1.1 Sat Mar 1 08:41:46 2014
+++ src/external/gpl3/gcc/dist/libgcc/config/c6x/pr-support.c Mon Mar 24 21:26:01 2014
@@ -518,7 +518,7 @@ _Unwind_GetRegionStart (_Unwind_Context
return (_Unwind_Ptr) ucbp->pr_cache.fnstart;
}
-void *
+_Unwind_Ptr
_Unwind_GetLanguageSpecificData (_Unwind_Context *context)
{
_Unwind_Control_Block *ucbp;
Index: src/external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c
diff -u src/external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c:1.1.1.1 Sat Mar 1 08:41:59 2014
+++ src/external/gpl3/gcc/dist/libgcc/config/cr16/unwind-cr16.c Mon Mar 24 21:26:01 2014
@@ -347,7 +347,7 @@ _Unwind_SetIP (struct _Unwind_Context *c
context->ra = (void *) val;
}
-void *
+_Unwind_Ptr
_Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
{
return context->lsda;
Index: src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c
diff -u src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c:1.1.1.1 Sat Mar 1 08:41:47 2014
+++ src/external/gpl3/gcc/dist/libgcc/config/ia64/unwind-ia64.c Mon Mar 24 21:26:01 2014
@@ -1715,7 +1715,7 @@ _Unwind_SetIP (struct _Unwind_Context *c
context->rp = val;
}
-void *
+_Unwind_Ptr
_Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
{
return context->lsda;
Index: src/external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c
diff -u src/external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c:1.1.1.1 Sat Mar 1 08:41:59 2014
+++ src/external/gpl3/gcc/dist/libgcc/config/xtensa/unwind-dw2-xtensa.c Mon Mar 24 21:26:01 2014
@@ -172,7 +172,7 @@ _Unwind_SetIP (struct _Unwind_Context *c
context->ra = (void *) val;
}
-void *
+_Unwind_Ptr
_Unwind_GetLanguageSpecificData (struct _Unwind_Context *context)
{
return context->lsda;
Index: src/lib/libexecinfo/unwind.c
diff -u src/lib/libexecinfo/unwind.c:1.1 src/lib/libexecinfo/unwind.c:1.2
--- src/lib/libexecinfo/unwind.c:1.1 Sat May 26 22:02:29 2012
+++ src/lib/libexecinfo/unwind.c Mon Mar 24 21:26:01 2014
@@ -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 @@ tracer(struct _Unwind_Context *ctx, void
return 0;
}
if (t->n < t->len)
- t->arr[t->n++] = _Unwind_GetIP(ctx);
+ t->arr[t->n++] = (void *)_Unwind_GetIP(ctx);
return 0;
}
Index: src/lib/libexecinfo/unwind.h
diff -u src/lib/libexecinfo/unwind.h:1.1 src/lib/libexecinfo/unwind.h:1.2
--- src/lib/libexecinfo/unwind.h:1.1 Sat May 26 22:02:29 2012
+++ src/lib/libexecinfo/unwind.h Mon Mar 24 21:26:01 2014
@@ -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_Ptr _Unwind_GetDataRelBase(str
_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 *);
