* i386.c (ix86_expand_prologue): Fix merging conflict.
authorJan Hubicka <jh@suse.cz>
Thu, 14 Jun 2001 13:41:22 +0000 (15:41 +0200)
committerJan Hubicka <hubicka@gcc.gnu.org>
Thu, 14 Jun 2001 13:41:22 +0000 (13:41 +0000)
commite323735cb29fa11ab24678c7218afdd6e3e9949d
treea5fc53c77b7b603ffdd35897166bf4ceae71c600
parent3ea099f17999ab6114515989ef3bcbc5086dd1d0
* i386.c (ix86_expand_prologue): Fix merging conflict.

From-SVN: r43373
gcc/ChangeLog
gcc/config/i386/i386.c