This change provides __restore/__restore_rt on x86 and __restore_rt on
x86_64 with unwinding information to be able to unwind through signal
frame via libgcc provided unwinding interface. See comments inlined for
more details.
Also remove the test that had a dependency on
__attribute__((cleanup(foo_cleanup))). It doesn't provide us with any
better test coverage than we have from the newer tests, and it doesn't
work well across a variety architectures (presumably because no one uses
this attribute in the real world).
Tested this on host via bionic-unit-tests-run-on-host on both x86 and
x86-64.
Bug: 17436734
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
(cherry picked from commit 50321e2e66)
Change-Id: Iba90e36958b00c7cc7db5eeebf888dc89ce4d619
		
	
		
			
				
	
	
		
			43 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			43 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2012 The Android Open Source Project
 | 
						|
 *
 | 
						|
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
						|
 * you may not use this file except in compliance with the License.
 | 
						|
 * You may obtain a copy of the License at
 | 
						|
 *
 | 
						|
 *      http://www.apache.org/licenses/LICENSE-2.0
 | 
						|
 *
 | 
						|
 * Unless required by applicable law or agreed to in writing, software
 | 
						|
 * distributed under the License is distributed on an "AS IS" BASIS,
 | 
						|
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
						|
 * See the License for the specific language governing permissions and
 | 
						|
 * limitations under the License.
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef _BIONIC_TESTS_SCOPED_SIGNAL_HANDLER_H
 | 
						|
#define _BIONIC_TESTS_SCOPED_SIGNAL_HANDLER_H
 | 
						|
 | 
						|
#include <signal.h>
 | 
						|
 | 
						|
class ScopedSignalHandler {
 | 
						|
 public:
 | 
						|
  ScopedSignalHandler(int signal_number, void (*handler)(int), int sa_flags = 0)
 | 
						|
      : signal_number_(signal_number) {
 | 
						|
    sigemptyset(&action_.sa_mask);
 | 
						|
    action_.sa_flags = sa_flags;
 | 
						|
    action_.sa_handler = handler;
 | 
						|
    sigaction(signal_number_, &action_, &old_action_);
 | 
						|
  }
 | 
						|
 | 
						|
  ~ScopedSignalHandler() {
 | 
						|
    sigaction(signal_number_, &old_action_, NULL);
 | 
						|
  }
 | 
						|
 | 
						|
 private:
 | 
						|
  struct sigaction action_;
 | 
						|
  struct sigaction old_action_;
 | 
						|
  const int signal_number_;
 | 
						|
};
 | 
						|
 | 
						|
#endif // _BIONIC_TESTS_SCOPED_SIGNAL_HANDLER_H
 |