rpms/glibc/devel glibc-ppc-rt.patch, NONE, 1.1 glibc.spec, 1.316, 1.317

[Jakub Jelinek (jakub)]

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11173

Modified Files:
	glibc.spec 
Added Files:
	glibc-ppc-rt.patch 
Log Message:
2.6.90-4

glibc-ppc-rt.patch:

--- NEW FILE glibc-ppc-rt.patch ---
2007-08-05  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h (PSEUDO):
	Don't use CGOTSETUP and CGOTRESTORE macros.
	(CGOTSETUP, CGOTRESTORE): Remove.
	<IS_IN_rtld> (CENABLE, CDISABLE): Don't use JUMPTARGET, branch to
	@local symbol.

--- 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
@@ -1,5 +1,5 @@
 /* Cancellable system call stubs.  Linux/PowerPC version.
-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Franz Sirl <Franz.Sirl-kernel at lauterbach.com>, 2003.
 
@@ -44,7 +44,6 @@
     mflr 9;								\
     stw 9,52(1);							\
     cfi_offset (lr, 4);							\
-    CGOTSETUP;								\
     DOCARGS_##args;	/* save syscall args around CENABLE.  */	\
     CENABLE;								\
     stw 3,16(1);	/* store CENABLE return value (MASK).  */	\
@@ -58,7 +57,6 @@
     lwz 4,52(1);							\
     lwz 0,12(1);	/* restore CR/R3. */				\
     lwz 3,8(1);								\
-    CGOTRESTORE;							\
     mtlr 4;								\
     mtcr 0;								\
     addi 1,1,48;
@@ -84,9 +82,6 @@
 # define DOCARGS_6	stw 8,40(1); DOCARGS_5
 # define UNDOCARGS_6	lwz 8,40(1); UNDOCARGS_5
 
-# define CGOTSETUP
-# define CGOTRESTORE
-
 # ifdef IS_IN_libpthread
 #  define CENABLE	bl __pthread_enable_asynccancel at local
 #  define CDISABLE	bl __pthread_disable_asynccancel at local
@@ -94,20 +89,8 @@
 #  define CENABLE	bl __libc_enable_asynccancel at local
 #  define CDISABLE	bl __libc_disable_asynccancel at local
 # elif defined IS_IN_librt
-#  define CENABLE	bl JUMPTARGET(__librt_enable_asynccancel)
-#  define CDISABLE	bl JUMPTARGET(__librt_disable_asynccancel)
-#  if defined HAVE_AS_REL16 && defined PIC
-#   undef CGOTSETUP
-#   define CGOTSETUP							\
-    bcl 20,31,1f;							\
- 1: stw 30,44(1);							\
-    mflr 30;								\
-    addis 30,30,_GLOBAL_OFFSET_TABLE-1b at ha;				\
-    addi 30,30,_GLOBAL_OFFSET_TABLE-1b at l
-#   undef CGOTRESTORE
-#   define CGOTRESTORE							\
-    lwz 30,44(1)
-#  endif
+#  define CENABLE	bl __librt_enable_asynccancel at local
+#  define CDISABLE	bl __librt_disable_asynccancel at local
 # else
 #  error Unsupported library
 # endif


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- glibc.spec	4 Aug 2007 21:28:38 -0000	1.316
+++ glibc.spec	5 Aug 2007 11:15:33 -0000	1.317
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-20070804T2027
 %define glibc_release_tarballs 0
 %define glibcversion 2.6.90
-%define glibcrelease 3
+%define glibcrelease 4
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -42,6 +42,7 @@
 Patch0: %{glibcname}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
 Patch2: glibc-ldconfig-speedup.patch
+Patch3: glibc-ppc-rt.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@@ -255,6 +256,7 @@
 %endif
 %endif
 %patch2 -p1
+%patch3 -p1
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@@ -1053,6 +1055,10 @@
 %endif
 
 %changelog
+* Sun Aug  5 2007 Jakub Jelinek <jakub at 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 at redhat.com> 2.6.90-3
 - fix open{,at}{,64} macro for -pedantic (#250897)
 - add transliteration for l with stroke (#250492)