Inane conflicts:

- patch to function.c was badly indented.
- invoke.texi no longer need to special-case OpenBSD, as 2.95.2 turns
strict-aliasing off everywhere.

1 files changed, 3 insertions, 3 deletions

diff --git a/gnu/egcs/gcc/function.c b/gnu/egcs/gcc/function.c
index d2cf4c2edfb..5592e482e2f 100644
--- a/gnu/egcs/gcc/function.c
+++ b/gnu/egcs/gcc/function.c
@@ -1031,9 +1031,9 @@ assign_stack_temp_for_type (mode, size, keep, type)
       if (mode == BLKmode && align < BIGGEST_ALIGNMENT)
 	abort();
       p->slot = assign_stack_local (mode,
-                                   (mode == BLKmode
-                                    ? CEIL_ROUND (size, align / BITS_PER_UNIT)
-                                    : size),
+				    (mode == BLKmode
+				     ? CEIL_ROUND (size, align / BITS_PER_UNIT)
+				     : size),
 				    align);
 
       p->align = align;