r1461 - in glibc-package/branches/glibc-2.4/debian/patches: . powerpc
Author: schizo
Date: 2006-04-23 16:45:04 +0000 (Sun, 23 Apr 2006)
New Revision: 1461
Added:
glibc-package/branches/glibc-2.4/debian/patches/powerpc/local-sysconf.diff
Removed:
glibc-package/branches/glibc-2.4/debian/patches/powerpc-executable-got.diff
glibc-package/branches/glibc-2.4/debian/patches/powerpc-socket-weakalias.diff
glibc-package/branches/glibc-2.4/debian/patches/powerpc-sysconf.diff
glibc-package/branches/glibc-2.4/debian/patches/s390-tls.diff
Modified:
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
powerpc patch cleanup and sync
Copied: glibc-package/branches/glibc-2.4/debian/patches/powerpc/local-sysconf.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/powerpc-sysconf.diff)
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/powerpc-sysconf.diff 2006-04-20 21:28:44 UTC (rev 1446)
+++ glibc-package/branches/glibc-2.4/debian/patches/powerpc/local-sysconf.diff 2006-04-23 16:45:04 UTC (rev 1461)
@@ -0,0 +1,42 @@
+# DP: Add /proc/cpuinfo handling on Linux/PowerPC
+
+diff -urN glibc-2.2.4/sysdeps/unix/sysv/linux/powerpc/getsysstats.c glibc-2.2.4-ds/sysdeps/unix/sysv/linux/powerpc/getsysstats.c
+--- glibc-2.2.4/sysdeps/unix/sysv/linux/powerpc/getsysstats.c Wed Dec 31 16:00:00 1969
++++ glibc-2.2.4-ds/sysdeps/unix/sysv/linux/powerpc/getsysstats.c Wed Jan 2 05:01:46 2002
+@@ -0,0 +1,36 @@
++/* Determine various system internal values, Linux/PowerPC version.
++ Copyright (C) 2001,2002 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
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++
++/* We need to define a special parser for /proc/cpuinfo. */
++#define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \
++ do \
++ { \
++ (RESULT) = 0; \
++ /* Read all lines and count the lines starting with the string \
++ "cpu model". We don't have to fear extremely long lines since \
++ the kernel will not generate them. 8192 bytes are really \
++ enough. */ \
++ while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL) \
++ if (strncmp (BUFFER, "cpu\t\t:", 6) == 0) \
++ ++(RESULT); \
++ } \
++ while (0)
++
++#include <sysdeps/unix/sysv/linux/getsysstats.c>
Deleted: glibc-package/branches/glibc-2.4/debian/patches/powerpc-executable-got.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/powerpc-executable-got.diff 2006-04-23 16:37:10 UTC (rev 1460)
+++ glibc-package/branches/glibc-2.4/debian/patches/powerpc-executable-got.diff 2006-04-23 16:45:04 UTC (rev 1461)
@@ -1,73 +0,0 @@
-#! /bin/sh -e
-
-# DP: Fix non-executable GOT issue with 64K pages on PPC
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-2005-09-20 Roland McGrath <roland@redhat.com>
-
- [BZ #1346]
- * elf/dl-load.c (_dl_map_object_from_fd) [HAVE_Z_RELRO]: Do relro
- magic on __stack_prot only if [SHARED]. Skip mprotect if __stack_prot
- lies outside the page-rounded-down relro region.
-
---- elf/dl-load.c~ 2005-12-14 22:27:00.000000000 -0600
-+++ elf/dl-load.c 2005-12-14 22:35:59.000000000 -0600
-@@ -1314,22 +1314,36 @@
-
- if (__builtin_expect ((stack_flags &~ GL(dl_stack_flags)) & PF_X, 0))
- {
-+ if (__builtin_expect (__check_caller (RETURN_ADDRESS (0), allow_ldso),
-+ 0) != 0)
-+ {
-+ errstring = N_("invalid caller");
-+ goto call_lose;
-+ }
-+
- /* The stack is presently not executable, but this module
- requires that it be executable. We must change the
- protection of the variable which contains the flags used in
- the mprotect calls. */
--#ifdef HAVE_Z_RELRO
-+#if defined HAVE_Z_RELRO && defined SHARED
- if (mode & __RTLD_DLOPEN)
- {
-- uintptr_t p = ((uintptr_t) &__stack_prot) & ~(GLRO(dl_pagesize) - 1);
-- size_t s = (uintptr_t) &__stack_prot - p + sizeof (int);
-+ const uintptr_t p = (uintptr_t) &__stack_prot & -GLRO(dl_pagesize);
-+ const size_t s = (uintptr_t) (&__stack_prot + 1) - p;
-
-- __mprotect ((void *) p, s, PROT_READ|PROT_WRITE);
-- if (__builtin_expect (__check_caller (RETURN_ADDRESS (0),
-- allow_ldso|allow_libc) == 0,
-- 0))
-+ struct link_map *const m = &GL(dl_rtld_map);
-+ const uintptr_t relro_end = ((m->l_addr + m->l_relro_addr
-+ + m->l_relro_size)
-+ & -GLRO(dl_pagesize));
-+ if (__builtin_expect (p + s <= relro_end, 1))
-+ {
-+ /* The variable lies in the region protected by RELRO. */
-+ __mprotect ((void *) p, s, PROT_READ|PROT_WRITE);
-+ __stack_prot |= PROT_READ|PROT_WRITE|PROT_EXEC;
-+ __mprotect ((void *) p, s, PROT_READ);
-+ }
-+ else
- __stack_prot |= PROT_READ|PROT_WRITE|PROT_EXEC;
-- __mprotect ((void *) p, s, PROT_READ);
- }
- else
- #endif
-
-
Deleted: glibc-package/branches/glibc-2.4/debian/patches/powerpc-socket-weakalias.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/powerpc-socket-weakalias.diff 2006-04-23 16:37:10 UTC (rev 1460)
+++ glibc-package/branches/glibc-2.4/debian/patches/powerpc-socket-weakalias.diff 2006-04-23 16:45:04 UTC (rev 1461)
@@ -1,87 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix __bind redefinition and lround problems
-# DP: Related bugs:
-# DP: Dpatch author: Clint Adams
-# DP: Patch author: Anton Blanchard
-# DP: Upstream status: Not Submitted
-# DP: Status Details:
-# DP: Date: 2005-12-16
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-
---- sysdeps/powerpc/powerpc32/fpu/s_lround.S~ 2004-06-30 17:29:12.000000000 -0500
-+++ sysdeps/powerpc/powerpc32/fpu/s_lround.S 2005-11-18 16:48:11.000000000 -0600
-@@ -88,7 +79,6 @@
- b .L9
- END (__lround)
-
--strong_alias (__lround, __lround)
- weak_alias (__lround, lround)
-
- strong_alias (__lround, __lroundf)
---- sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S~ 2005-12-16 01:04:21.000000000 -0600
-+++ sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S 2005-12-16 01:06:26.000000000 -0600
-@@ -42,7 +42,11 @@
- #define stackblock 20
-
- #ifndef __socket
--#define __socket P(__,socket)
-+# ifndef NO_WEAK_ALIAS
-+# define __socket P(__,socket)
-+# else
-+# define __socket socket
-+# endif
- #endif
-
- .text
-@@ -116,4 +120,6 @@
-
- PSEUDO_END (__socket)
-
-+#ifndef NO_WEAK_ALIAS
- weak_alias (__socket, socket)
-+#endif
---- sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S~ 2005-12-16 01:08:45.000000000 -0600
-+++ sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S 2005-12-16 01:09:32.000000000 -0600
-@@ -41,12 +41,12 @@
-
- #define stackblock 80 /* offset to socket parm area. */
-
--#ifndef socket
--/* If this is just socket.S leave it alone! */
--#else
- #ifndef __socket
--#define __socket P(__,socket)
--#endif
-+# ifndef NO_WEAK_ALIAS
-+# define __socket P(__,socket)
-+# else
-+# define __socket socket
-+# endif
- #endif
-
- .text
-@@ -120,4 +120,6 @@
- cfi_endproc
- PSEUDO_END (__socket)
-
-+#ifndef NO_WEAK_ALIAS
- weak_alias (__socket, socket)
-+#endif
Deleted: glibc-package/branches/glibc-2.4/debian/patches/powerpc-sysconf.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/powerpc-sysconf.diff 2006-04-23 16:37:10 UTC (rev 1460)
+++ glibc-package/branches/glibc-2.4/debian/patches/powerpc-sysconf.diff 2006-04-23 16:45:04 UTC (rev 1461)
@@ -1,58 +0,0 @@
-#! /bin/sh -e
-
-# DP: Add /proc/cpuinfo handling on Linux/PowerPC
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-
-diff -urN glibc-2.2.4/sysdeps/unix/sysv/linux/powerpc/getsysstats.c glibc-2.2.4-ds/sysdeps/unix/sysv/linux/powerpc/getsysstats.c
---- glibc-2.2.4/sysdeps/unix/sysv/linux/powerpc/getsysstats.c Wed Dec 31 16:00:00 1969
-+++ glibc-2.2.4-ds/sysdeps/unix/sysv/linux/powerpc/getsysstats.c Wed Jan 2 05:01:46 2002
-@@ -0,0 +1,36 @@
-+/* Determine various system internal values, Linux/PowerPC version.
-+ Copyright (C) 2001,2002 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
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+
-+/* We need to define a special parser for /proc/cpuinfo. */
-+#define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \
-+ do \
-+ { \
-+ (RESULT) = 0; \
-+ /* Read all lines and count the lines starting with the string \
-+ "cpu model". We don't have to fear extremely long lines since \
-+ the kernel will not generate them. 8192 bytes are really \
-+ enough. */ \
-+ while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL) \
-+ if (strncmp (BUFFER, "cpu\t\t:", 6) == 0) \
-+ ++(RESULT); \
-+ } \
-+ while (0)
-+
-+#include <sysdeps/unix/sysv/linux/getsysstats.c>
Deleted: glibc-package/branches/glibc-2.4/debian/patches/s390-tls.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/s390-tls.diff 2006-04-23 16:37:10 UTC (rev 1460)
+++ glibc-package/branches/glibc-2.4/debian/patches/s390-tls.diff 2006-04-23 16:45:04 UTC (rev 1461)
@@ -1,32 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Fix ustat.c compile error for s390
-# DP: Author: Gerhard Tonn <GerhardTonn@gammatau.de>
-# DP: Upstream status: Not submitted
-# DP: Status Details:
-# DP: Date: 23 Mar 2003
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- linuxthreads/sysdeps/s390/tls.h.bak 2003-03-23 08:59:35.000000000 +0000
-+++ linuxthreads/sysdeps/s390/tls.h 2003-03-23 09:47:49.000000000 +0000
-@@ -124,7 +124,7 @@
- # ifndef __ASSEMBLER__
-
- /* Get the thread descriptor definition. */
--# include <linuxthreads/descr.h>
-+//# include <linuxthreads/descr.h>
-
- # define NONTLS_INIT_TP \
- do { \
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-23 16:37:10 UTC (rev 1460)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-23 16:45:04 UTC (rev 1461)
@@ -11,7 +11,6 @@
#glibc22-m68k-compat.diff -p1
#glibc22-m68k-fpic.diff -p1
glibc22-ttyname-devfs.diff -p0
-powerpc-sysconf.diff -p1
#arm-no-hwcap.diff -p0
#librt-mips.diff -p0
#glibc23-ctype-compat.diff -p1 # g: untilsarge
@@ -67,9 +66,7 @@
#hppa-fenv-align.diff -p1
#glibc235-hppa-fpu.diff -p1
#eh-frame-terminator.diff -p1
-#powerpc-socket-weakalias.diff -p0
#arm-socket-weakalias.diff -p0
-#powerpc-executable-got.diff -p0
#ctan.diff -p0
#any/submitted-nis-netgrp.diff
localedata/locale-ku_TR.diff -p0
@@ -129,3 +126,5 @@
sparc/local-sparcv8-target.diff -p0
sparc/submitted-timing.diff -p1
+
+powerpc/local-sysconf.diff -p1
Reply to: