Attachment #760603 for bug #828400

Lines 3049-3054 ix86_option_override_internal (bool main_args_p, Link Here

(-)a/gcc/config/i386/i386-options.c (+3 lines)
3049	= build_target_option_node (opts, opts_set);	3049	= build_target_option_node (opts, opts_set);
3050	}	3050	}
3051		3051
		3052	if (TARGET_64BIT && TARGET_CMOV)
		3053	SET_OPTION_IF_UNSET (opts, opts_set, flag_cf_protection, DEFAULT_FLAG_CF);
		3054
3052	if (opts->x_flag_cf_protection != CF_NONE)	3055	if (opts->x_flag_cf_protection != CF_NONE)
3053	{	3056	{
3054	if ((opts->x_flag_cf_protection & CF_BRANCH) == CF_BRANCH	3057	if ((opts->x_flag_cf_protection & CF_BRANCH) == CF_BRANCH




#define DEFAULT_FLAG_SCP 0
#endif

/* Default value for flag_cf_protection when flag_cf_protection is
   initialized to CF_FULL.

   We use a new option (EXTRA_OPTIONS_CF) here to avoid turning
   this on accidentally for other arches. */
#ifdef EXTRA_OPTIONS_CF
#define DEFAULT_FLAG_CF CF_FULL
#endif
#ifndef DEFAULT_FLAG_CF
#define DEFAULT_FLAG_CF CF_NONE
#endif


/* By default, the C++ compiler will use function addresses in the
   vtable entries.  Setting this nonzero tells the compiler to use
   function descriptors instead.  The value of this macro says how
- 

Return to bug 828400

Lines 1463-1468 see the files COPYING3 and COPYING.RUNTIME respectively. If not, see Link Here

(-)a/gcc/defaults.h (-1 / +13 lines)
1463	#define DEFAULT_FLAG_SCP 0	1463	#define DEFAULT_FLAG_SCP 0
1464	#endif	1464	#endif
1465		1465
		1466	/* Default value for flag_cf_protection when flag_cf_protection is
		1467	initialized to CF_FULL.
		1468
		1469	We use a new option (EXTRA_OPTIONS_CF) here to avoid turning
		1470	this on accidentally for other arches. */
		1471	#ifdef EXTRA_OPTIONS_CF
		1472	#define DEFAULT_FLAG_CF CF_FULL
		1473	#endif
		1474	#ifndef DEFAULT_FLAG_CF
		1475	#define DEFAULT_FLAG_CF CF_NONE
		1476	#endif
		1477
		1478
1466	/* By default, the C++ compiler will use function addresses in the	1479	/* By default, the C++ compiler will use function addresses in the
1467	vtable entries. Setting this nonzero tells the compiler to use	1480	vtable entries. Setting this nonzero tells the compiler to use
1468	function descriptors instead. The value of this macro says how	1481	function descriptors instead. The value of this macro says how
1469	-