OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Come up with stack_protector enum. 

gcc/ChangeLog:

2020-05-15  Martin Liska  <mliska@suse.cz>

	* cfgexpand.c: Move the enum to ...
	* coretypes.h (enum stack_protector): ... here.
	* function.c (assign_parm_adjust_stack_rtl): Use the stack_protector
	enum.

gcc/c-family/ChangeLog:

2020-05-15  Martin Liska  <mliska@suse.cz>

	* c-cppbuiltin.c (c_cpp_builtins): Use the stack_protector enum.
This commit is contained in:
Martin Liska 2020-05-15 14:51:24 +02:00
parent df7f0a3a21
commit 5a99796b85
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/c-family/c-cppbuiltin.c
View File

@ -1427,13 +1427,13 @@ c_cpp_builtins (cpp_reader *pfile)
/* Make the choice of the stack protector runtime visible to source code.
The macro names and values here were chosen for compatibility with an
earlier implementation, i.e. ProPolice. */
if (flag_stack_protect == 4)
if (flag_stack_protect == SPCT_FLAG_EXPLICIT)
cpp_define (pfile, "__SSP_EXPLICIT__=4");
if (flag_stack_protect == 3)
if (flag_stack_protect == SPCT_FLAG_STRONG)
cpp_define (pfile, "__SSP_STRONG__=3");
if (flag_stack_protect == 2)
if (flag_stack_protect == SPCT_FLAG_ALL)
cpp_define (pfile, "__SSP_ALL__=2");
else if (flag_stack_protect == 1)
else if (flag_stack_protect == SPCT_FLAG_DEFAULT)
cpp_define (pfile, "__SSP__=1");
if (flag_openacc)

7
gcc/cfgexpand.c
View File

@ -1762,13 +1762,6 @@ clear_tree_used (tree block)
clear_tree_used (t);
}
enum {
SPCT_FLAG_DEFAULT = 1,
SPCT_FLAG_ALL = 2,
SPCT_FLAG_STRONG = 3,
SPCT_FLAG_EXPLICIT = 4
};
/* Examine TYPE and determine a bit mask of the following features. */
#define SPCT_HAS_LARGE_CHAR_ARRAY 1

8
gcc/coretypes.h
View File

@ -219,6 +219,14 @@ enum profile_reproducibility {
PROFILE_REPRODUCIBILITY_MULTITHREADED
};
/* Type of -fstack-protector-*. */
enum stack_protector {
SPCT_FLAG_DEFAULT = 1,
SPCT_FLAG_ALL = 2,
SPCT_FLAG_STRONG = 3,
SPCT_FLAG_EXPLICIT = 4
};
/* Types of unwind/exception handling info that can be generated. */
enum unwind_info_type

2
gcc/function.c
View File

@ -2846,7 +2846,7 @@ assign_parm_adjust_stack_rtl (struct assign_parm_data_one *data)
/* If stack protection is in effect for this function, don't leave any
pointers in their passed stack slots. */
else if (crtl->stack_protect_guard
&& (flag_stack_protect == 2
&& (flag_stack_protect == SPCT_FLAG_ALL
|| data->arg.pass_by_reference
|| POINTER_TYPE_P (data->nominal_type)))
stack_parm = NULL;