diff options
author | Alexandre Oliva <aoliva@redhat.com> | 2009-09-01 21:10:12 +0000 |
---|---|---|
committer | Alexandre Oliva <aoliva@redhat.com> | 2009-09-01 21:10:12 +0000 |
commit | bbd2d1141f4c957d232042c6c757776fc1d0b9f3 (patch) | |
tree | 457d72335a5b86fced2ea8460ad9303376fcc1d9 /gcc/config/i386/i386.c | |
parent | 47d1e2fcf09977ed6a87d789f073937942fcab71 (diff) |
Merged with gcc-4_4-branch@151281.var-tracking-assignments-4_4-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/var-tracking-assignments-4_4-branch@151286 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config/i386/i386.c')
-rw-r--r-- | gcc/config/i386/i386.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 3406117f0f6..4e8a923b2d0 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -8630,7 +8630,8 @@ ix86_expand_epilogue (int style) ix86_emit_restore_sse_regs_using_mov (stack_pointer_rtx, frame.to_allocate, style == 2); pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx, - GEN_INT (frame.nsseregs * 16), style); + GEN_INT (frame.nsseregs * 16 + + frame.padding0), style); } else if (frame.to_allocate || frame.nsseregs) { @@ -25321,7 +25322,7 @@ ix86_veclibabi_acml (enum built_in_function fn, tree type_out, tree type_in) static tree ix86_vectorize_builtin_conversion (unsigned int code, tree type) { - if (TREE_CODE (type) != VECTOR_TYPE + if (!TARGET_SSE2 || TREE_CODE (type) != VECTOR_TYPE /* There are only conversions from/to signed integers. */ || TYPE_UNSIGNED (TREE_TYPE (type))) return NULL_TREE; |