diff options
| -rw-r--r-- | ChangeLog.csl | 9 | ||||
| -rw-r--r-- | gcc/config/arm/pr-support.c | 14 | ||||
| -rw-r--r-- | gcc/config/arm/unwind-arm.c | 13 |
3 files changed, 23 insertions, 13 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 019caf0daac..c2b0164716b 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,12 @@ +2006-11-15 Paul Brook <paul@codesourcery.com> + + gcc/ + Backport form mainline. + * config/arm/unwind-arm.c (_Unwind_GetDataRelBase, + _Unwind_GetTextRelBase): Move from here ... + * config/arm/pr-support.c (_Unwind_GetDataRelBase, + _Unwind_GetTextRelBase): ... To here. + 2006-11-14 Joseph Myers <joseph@codesourcery.com> gcc/testsuite/ diff --git a/gcc/config/arm/pr-support.c b/gcc/config/arm/pr-support.c index b7d22458536..b5592b192fc 100644 --- a/gcc/config/arm/pr-support.c +++ b/gcc/config/arm/pr-support.c @@ -389,3 +389,17 @@ _Unwind_GetLanguageSpecificData (_Unwind_Context * context) return ptr; } + +/* These two should never be used. */ + +_Unwind_Ptr +_Unwind_GetDataRelBase (_Unwind_Context *context __attribute__ ((unused))) +{ + abort (); +} + +_Unwind_Ptr +_Unwind_GetTextRelBase (_Unwind_Context *context __attribute__ ((unused))) +{ + abort (); +} diff --git a/gcc/config/arm/unwind-arm.c b/gcc/config/arm/unwind-arm.c index 714b7e68ce8..be74461abfc 100644 --- a/gcc/config/arm/unwind-arm.c +++ b/gcc/config/arm/unwind-arm.c @@ -1203,16 +1203,3 @@ __aeabi_unwind_cpp_pr2 (_Unwind_State state, { return __gnu_unwind_pr_common (state, ucbp, context, 2); } - -/* These two should never be used. */ -_Unwind_Ptr -_Unwind_GetDataRelBase (_Unwind_Context *context __attribute__ ((unused))) -{ - abort (); -} - -_Unwind_Ptr -_Unwind_GetTextRelBase (_Unwind_Context *context __attribute__ ((unused))) -{ - abort (); -} |