r309327 - Headers: fix _Unwind_{G,S}etGR for non-EHABI targets

[Hans Wennborg via cfe-commits]

Reverted from the 5.0 branch (together with r309226) in r311597.

On Thu, Jul 27, 2017 at 3:08 PM, Hans Wennborg <hans at chromium.org> wrote:
> Merged to 5.0 in r309328.
>
> On Thu, Jul 27, 2017 at 2:56 PM, Saleem Abdulrasool via cfe-commits
> <cfe-commits at lists.llvm.org> wrote:
>> Author: compnerd
>> Date: Thu Jul 27 14:56:25 2017
>> New Revision: 309327
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=309327&view=rev
>> Log:
>> Headers: fix _Unwind_{G,S}etGR for non-EHABI targets
>>
>> The EHABI definition was being inlined into the users even when EHABI
>> was not in use.  Adjust the condition to ensure that the right version
>> is defined.
>>
>> Modified:
>>     cfe/trunk/lib/Headers/unwind.h
>>
>> Modified: cfe/trunk/lib/Headers/unwind.h
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/unwind.h?rev=309327&r1=309326&r2=309327&view=diff
>> ==============================================================================
>> --- cfe/trunk/lib/Headers/unwind.h (original)
>> +++ cfe/trunk/lib/Headers/unwind.h Thu Jul 27 14:56:25 2017
>> @@ -177,8 +177,7 @@ typedef _Unwind_Personality_Fn __persona
>>  typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn)(struct _Unwind_Context *,
>>                                                  void *);
>>
>> -#if defined(__arm__) && !defined(__APPLE__)
>> -
>> +#if defined(__arm__) && !(defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH___))
>>  typedef enum {
>>    _UVRSC_CORE = 0,        /* integer register */
>>    _UVRSC_VFP = 1,         /* vfp */
>> @@ -200,14 +199,12 @@ typedef enum {
>>    _UVRSR_FAILED = 2
>>  } _Unwind_VRS_Result;
>>
>> -#if !defined(__USING_SJLJ_EXCEPTIONS__) && !defined(__ARM_DWARF_EH__)
>>  typedef uint32_t _Unwind_State;
>>  #define _US_VIRTUAL_UNWIND_FRAME  ((_Unwind_State)0)
>>  #define _US_UNWIND_FRAME_STARTING ((_Unwind_State)1)
>>  #define _US_UNWIND_FRAME_RESUME   ((_Unwind_State)2)
>>  #define _US_ACTION_MASK           ((_Unwind_State)3)
>>  #define _US_FORCE_UNWIND          ((_Unwind_State)8)
>> -#endif
>>
>>  _Unwind_VRS_Result _Unwind_VRS_Get(struct _Unwind_Context *__context,
>>    _Unwind_VRS_RegClass __regclass,
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits