Attachment #589904 for bug #672946

Lines 253-259 Link Here

(-)a/gcc/config/i386/i386.opt (-2 / +2 lines)
253	Enum(ix86_align_data) String(cacheline) Value(ix86_align_data_type_cacheline)	253	Enum(ix86_align_data) String(cacheline) Value(ix86_align_data_type_cacheline)
254		254
255	march=	255	march=
256	Target RejectNegative Joined Var(ix86_arch_string)	256	Target RejectNegative Negative(march=) Joined Var(ix86_arch_string)
257	Generate code for given CPU.	257	Generate code for given CPU.
258		258
259	masm=	259	masm=
Lines 510-516 Link Here
510	Use direct references against %gs when accessing tls data.	510	Use direct references against %gs when accessing tls data.
511		511
512	mtune=	512	mtune=
513	Target RejectNegative Joined Var(ix86_tune_string)	513	Target RejectNegative Negative(mtune=) Joined Var(ix86_tune_string)
514	Schedule code for given CPU.	514	Schedule code for given CPU.
515		515
516	mtune-ctrl=	516	mtune-ctrl=

Lines 1015-1021 Link Here

(-)a/gcc/opts-common.c (-3 / +8 lines)
1015	goto keep;	1015	goto keep;
1016		1016
1017	/* Skip joined switches. */	1017	/* Skip joined switches. */
1018	if ((option->flags & CL_JOINED))	1018	if ((option->flags & CL_JOINED)
		1019	&& (!option->cl_reject_negative
		1020	\|\| (unsigned int) option->neg_index != opt_idx))
1019	goto keep;	1021	goto keep;
1020		1022
1021	for (j = i + 1; j < old_decoded_options_count; j++)	1023	for (j = i + 1; j < old_decoded_options_count; j++)
Lines 1027-1034 Link Here
1027	continue;	1029	continue;
1028	if (cl_options[next_opt_idx].neg_index < 0)	1030	if (cl_options[next_opt_idx].neg_index < 0)
1029	continue;	1031	continue;
1030	if ((cl_options[next_opt_idx].flags & CL_JOINED))	1032	if ((cl_options[next_opt_idx].flags & CL_JOINED)
1031	continue;	1033	&& (!cl_options[next_opt_idx].cl_reject_negative
		1034	\|\| ((unsigned int) cl_options[next_opt_idx].neg_index
		1035	!= next_opt_idx)))
		1036	continue;
1032	if (cancel_option (opt_idx, next_opt_idx, next_opt_idx))	1037	if (cancel_option (opt_idx, next_opt_idx, next_opt_idx))
1033	break;	1038	break;
1034	}	1039	}

Return to bug 672946