3 changed files with 13 additions and 26 deletions
			
			
		| @ -1,25 +0,0 @@ | |||
| From 1820fedfe68182ea1fcdd8e5242da2fd0860efd3 Mon Sep 17 00:00:00 2001 | |||
| From: Cody P Schafer <cschafer@cybexintl.com> | |||
| Date: Tue, 22 Jul 2014 15:30:17 -0400 | |||
| Subject: [PATCH] arm/unwind-arm.c: mark __aeabi_unwind_cpp_pr0 WEAK | |||
| 
 | |||
| ---
 | |||
|  libgcc/config/arm/unwind-arm.c | 2 +- | |||
|  1 file changed, 1 insertion(+), 1 deletion(-) | |||
| 
 | |||
| diff --git a/libgcc/config/arm/unwind-arm.c b/libgcc/config/arm/unwind-arm.c
 | |||
| index ee23963..cda3388 100644
 | |||
| --- a/libgcc/config/arm/unwind-arm.c
 | |||
| +++ b/libgcc/config/arm/unwind-arm.c
 | |||
| @@ -144,7 +144,7 @@ restore_non_core_regs (phase1_vrs * vrs)
 | |||
|   | |||
|  /* ABI defined personality routines.  */ | |||
|  extern _Unwind_Reason_Code __aeabi_unwind_cpp_pr0 (_Unwind_State, | |||
| -    _Unwind_Control_Block *, _Unwind_Context *);// __attribute__((weak));
 | |||
| +    _Unwind_Control_Block *, _Unwind_Context *)  __attribute__((weak));
 | |||
|  extern _Unwind_Reason_Code __aeabi_unwind_cpp_pr1 (_Unwind_State, | |||
|      _Unwind_Control_Block *, _Unwind_Context *) __attribute__((weak)); | |||
|  extern _Unwind_Reason_Code __aeabi_unwind_cpp_pr2 (_Unwind_State, | |||
| -- 
 | |||
| 2.0.1 | |||
| 
 | |||
| @ -0,0 +1,11 @@ | |||
| --- a/gcc/ubsan.c
 | |||
| +++ b/gcc/ubsan.c
 | |||
| @@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
 | |||
|   | |||
|    expanded_location xloc = expand_location (loc); | |||
|    if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 | |||
| -      || xloc.file == '\0' || xloc.file[0] == '\xff'
 | |||
| +      || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
 | |||
|        || xloc.file[1] == '\xff') | |||
|      return false; | |||
|   | |||
					Loading…
					
					
				
		Reference in new issue