summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>2003-11-02 00:00:08 +0000
committersayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>2003-11-02 00:00:08 +0000
commitc8e184601327cb603d612a327d2e1b3006e5b572 (patch)
treee20cc0d85a84fb6cc4b38b1b7e8999ad740e55be
parentd80d207431480614c84e6f4fde0a157c5dc590f9 (diff)
downloadgcc-c8e184601327cb603d612a327d2e1b3006e5b572.tar.gz
* unwind-sjlj.c (_Unwind_GetCFA): Return (_Unwind_Word)0 instead
of NULL. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73184 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/unwind-sjlj.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 76ef0df3caf..73a9401b626 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-01 Roger Sayle <roger@eyesopen.com>
+
+ * unwind-sjlj.c (_Unwind_GetCFA): Return (_Unwind_Word)0 instead
+ of NULL.
+
2003-11-01 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
PR preprocessor/12847
diff --git a/gcc/unwind-sjlj.c b/gcc/unwind-sjlj.c
index a02fc325a78..505bb86dc5a 100644
--- a/gcc/unwind-sjlj.c
+++ b/gcc/unwind-sjlj.c
@@ -185,7 +185,7 @@ _Unwind_Word
_Unwind_GetCFA (struct _Unwind_Context *context __attribute__((unused)))
{
/* ??? Ideally __builtin_setjmp places the CFA in the jmpbuf. */
- return NULL;
+ return (_Unwind_Word) 0;
}
void