diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
| commit | 57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch) | |
| tree | 5466406472918d3adb63398f5fb9ea1511a5e73f /libc/sysdeps/linux/sparc/pipe.S | |
| parent | 4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff) | |
| parent | 5dea871ac73ef4608022c058b50adc946917f9b9 (diff) | |
Merge commit 'origin/master' into prelink
Conflicts:
ldso/include/dl-hash.h
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/sysdeps/linux/sparc/pipe.S')
| -rw-r--r-- | libc/sysdeps/linux/sparc/pipe.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/sparc/pipe.S b/libc/sysdeps/linux/sparc/pipe.S index 76a5b9617..94913d486 100644 --- a/libc/sysdeps/linux/sparc/pipe.S +++ b/libc/sysdeps/linux/sparc/pipe.S @@ -49,7 +49,7 @@ pipe: st %o0,[%i0] st %o1,[%i0+4] ret - restore %o0,%g0,%o0 + restore %g0,%g0,%o0 .Lerror: call HIDDEN_JUMPTARGET(__errno_location) |