This commit is contained in:
Jakub Jelinek 2007-08-05 11:41:46 +00:00
parent ca63d6a542
commit 3a5173db70
2 changed files with 35 additions and 1 deletions

View File

@ -6,6 +6,9 @@
<IS_IN_rtld> (CENABLE, CDISABLE): Don't use JUMPTARGET, branch to <IS_IN_rtld> (CENABLE, CDISABLE): Don't use JUMPTARGET, branch to
@local symbol. @local symbol.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S (__socket):
Don't use CGOTSETUP and CGOTRESTORE macros.
--- libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h.jj 2006-10-29 22:48:07.000000000 +0100 --- libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h.jj 2006-10-29 22:48:07.000000000 +0100
+++ libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h 2007-08-05 12:29:44.000000000 +0200 +++ libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h 2007-08-05 12:29:44.000000000 +0200
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
@ -64,3 +67,28 @@
# else # else
# error Unsupported library # error Unsupported library
# endif # endif
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S.jj 2006-01-04 20:58:34.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S 2007-08-05 13:39:59.000000000 +0200
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,96,97,99, 2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997, 1999, 2003, 2006, 2007
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -93,7 +94,6 @@ ENTRY(__socket)
mflr r9
stw r9,52(r1)
cfi_offset (lr, 4)
- CGOTSETUP
CENABLE
stw r3,16(r1)
li r3,P(SOCKOP_,socket)
@@ -107,7 +107,6 @@ ENTRY(__socket)
lwz r4,52(r1)
lwz r0,12(r1)
lwz r3,8(r1)
- CGOTRESTORE
mtlr r4
mtcr r0
addi r1,r1,48

View File

@ -3,7 +3,7 @@
%define glibcsrcdir glibc-20070804T2027 %define glibcsrcdir glibc-20070804T2027
%define glibc_release_tarballs 0 %define glibc_release_tarballs 0
%define glibcversion 2.6.90 %define glibcversion 2.6.90
%define glibcrelease 3 %define glibcrelease 4
%define auxarches i586 i686 athlon sparcv9 alphaev6 %define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon %define xenarches i686 athlon
%ifarch %{xenarches} %ifarch %{xenarches}
@ -42,6 +42,7 @@ Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
Patch0: %{glibcname}-fedora.patch Patch0: %{glibcname}-fedora.patch
Patch1: %{name}-ia64-lib64.patch Patch1: %{name}-ia64-lib64.patch
Patch2: glibc-ldconfig-speedup.patch Patch2: glibc-ldconfig-speedup.patch
Patch3: glibc-ppc-rt.patch
Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@ -255,6 +256,7 @@ package or when debugging this package.
%endif %endif
%endif %endif
%patch2 -p1 %patch2 -p1
%patch3 -p1
# A lot of programs still misuse memcpy when they have to use # A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at # memmove. The memcpy implementation below is not tolerant at
@ -1053,6 +1055,10 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Sun Aug 5 2007 Jakub Jelinek <jakub@redhat.com> 2.6.90-4
- fix librt.so and librtkaio.so on ppc32, so that it is not using
bss PLT
* Sat Aug 4 2007 Jakub Jelinek <jakub@redhat.com> 2.6.90-3 * Sat Aug 4 2007 Jakub Jelinek <jakub@redhat.com> 2.6.90-3
- fix open{,at}{,64} macro for -pedantic (#250897) - fix open{,at}{,64} macro for -pedantic (#250897)
- add transliteration for l with stroke (#250492) - add transliteration for l with stroke (#250492)