2008-08-01 H.J. Lu <hongjiu.lu@intel.com>

	* config/i386/i386.c (override_options): Replace ABI_STACK_BOUNDARY
	with MIN_STACK_BOUNDARY.
	(ix86_update_stack_boundary): Likewise.
	(ix86_expand_prologue): Assert MIN_STACK_BOUNDARY instead of
	STACK_BOUNDARY.

	* config/i386/i386.h (ABI_STACK_BOUNDARY): Renamed to ...
	(MIN_STACK_BOUNDARY): This.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@138517 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 46505cc..f41ccd2 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -3045,9 +3045,9 @@ override_options (bool main_args_p)
     ix86_force_align_arg_pointer = STACK_REALIGN_DEFAULT;
 
   /* Validate -mincoming-stack-boundary= value or default it to
-     ABI_STACK_BOUNDARY/PREFERRED_STACK_BOUNDARY.  */
+     MIN_STACK_BOUNDARY/PREFERRED_STACK_BOUNDARY.  */
   if (ix86_force_align_arg_pointer)
-    ix86_default_incoming_stack_boundary = ABI_STACK_BOUNDARY;
+    ix86_default_incoming_stack_boundary = MIN_STACK_BOUNDARY;
   else
     ix86_default_incoming_stack_boundary = PREFERRED_STACK_BOUNDARY;
   ix86_incoming_stack_boundary = ix86_default_incoming_stack_boundary;
@@ -7520,10 +7520,10 @@ ix86_update_stack_boundary (void)
   /* Incoming stack alignment can be changed on individual functions
      via force_align_arg_pointer attribute.  We use the smallest
      incoming stack boundary.  */
-  if (ix86_incoming_stack_boundary > ABI_STACK_BOUNDARY
+  if (ix86_incoming_stack_boundary > MIN_STACK_BOUNDARY
       && lookup_attribute (ix86_force_align_arg_pointer_string,
                           TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl))))
-    ix86_incoming_stack_boundary = ABI_STACK_BOUNDARY;
+    ix86_incoming_stack_boundary = MIN_STACK_BOUNDARY;
 
   /* Stack at entrance of main is aligned by runtime.  We use the
      smallest incoming stack boundary. */
@@ -7710,7 +7710,7 @@ ix86_expand_prologue (void)
   if (stack_realign_fp)
     {
       int align_bytes = crtl->stack_alignment_needed / BITS_PER_UNIT;
-      gcc_assert (align_bytes > STACK_BOUNDARY / BITS_PER_UNIT);
+      gcc_assert (align_bytes > MIN_STACK_BOUNDARY / BITS_PER_UNIT);
 
       /* Align the stack.  */
       insn = emit_insn ((*ix86_gen_andsp) (stack_pointer_rtx,

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index a98e278..3247c10 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -651,14 +651,14 @@ enum target_cpu_default
 /* Stack boundary of the main function guaranteed by OS.  */
 #define MAIN_STACK_BOUNDARY (TARGET_64BIT ? 128 : 32)
 
-/* Stack boundary guaranteed by ABI.  */
-#define ABI_STACK_BOUNDARY (TARGET_64BIT ? 128 : 32)
+/* Minimum stack boundary.  */
+#define MIN_STACK_BOUNDARY (TARGET_64BIT ? 128 : 32)
 
 /* Boundary (in *bits*) on which the stack pointer prefers to be
    aligned; the compiler cannot rely on having this alignment.  */
 #define PREFERRED_STACK_BOUNDARY ix86_preferred_stack_boundary
 
-/* It should be ABI_STACK_BOUNDARY.  But we set it to 128 bits for
+/* It should be MIN_STACK_BOUNDARY.  But we set it to 128 bits for
    both 32bit and 64bit, to support codes that need 128 bit stack
    alignment for SSE instructions, but can't realign the stack.  */
 #define PREFERRED_STACK_BOUNDARY_DEFAULT 128