r2921 - in glibc-package/trunk/debian: . patches/any
Author: aurel32
Date: 2008-05-10 15:58:33 +0000 (Sat, 10 May 2008)
New Revision: 2921
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-no-pagesize.diff
Log:
* patches/any/local-no-pagesize.diff: don't include asm/page.h on alpha.
Closes: #480295.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-05-10 15:24:20 UTC (rev 2920)
+++ glibc-package/trunk/debian/changelog 2008-05-10 15:58:33 UTC (rev 2921)
@@ -23,8 +23,10 @@
nexttowardf() on s390 with gcc-4.3.
* sysdeps/arm.mk, sysdeps/s390.mk, control.in/main: use gcc-4.3 on arm
and s390.
- * i386/cvs-short-for-fnstsw.diff: patch for upstream to fix build with
- latest binutils.
+ * patches/i386/cvs-short-for-fnstsw.diff: patch for upstream to fix build
+ with latest binutils.
+ * patches/any/local-no-pagesize.diff: don't include asm/page.h on alpha.
+ Closes: #480295.
[ Pierre Habouzit ]
* Add any/cvs-strerror_r.diff to make strerror_r actually thread safe.
@@ -34,7 +36,7 @@
* patches/hurd-i386/cvs-termios.diff: new patch to revamp ioctls/termios
bits.
- -- Aurelien Jarno <aurel32@debian.org> Sat, 10 May 2008 17:23:04 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 10 May 2008 17:57:29 +0200
glibc (2.7-10) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/any/local-no-pagesize.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-no-pagesize.diff 2008-05-10 15:24:20 UTC (rev 2920)
+++ glibc-package/trunk/debian/patches/any/local-no-pagesize.diff 2008-05-10 15:58:33 UTC (rev 2921)
@@ -1,19 +1,20 @@
---- glibc-2.6.orig/sysdeps/unix/sysv/linux/alpha/sys/user.h
-+++ glibc-2.6/sysdeps/unix/sysv/linux/alpha/sys/user.h
-@@ -23,6 +23,7 @@
+--- glibc-2.7.orig/sysdeps/unix/sysv/linux/alpha/sys/user.h
++++ glibc-2.7/sysdeps/unix/sysv/linux/alpha/sys/user.h
+@@ -23,7 +23,7 @@
only. Don't read too much into it. Don't use it for anything other
than gdb/strace unless you know what you are doing. */
+-#include <asm/page.h>
+#include <unistd.h>
- #include <asm/page.h>
#include <asm/reg.h>
-@@ -41,7 +42,7 @@
+ struct user
+@@ -41,7 +41,7 @@
char u_comm[32]; /* user command name */
};
-#define NBPG PAGE_SIZE
-+#define NBPG sysconf(_SC_PAGESIZE)
++#define NBPG (sysconf(_SC_PAGESIZE))
#define UPAGES 1
#define HOST_TEXT_START_ADDR (u.start_code)
#define HOST_DATA_START_ADDR (u.start_data)
@@ -32,7 +33,7 @@
};
-#define NBPG PAGE_SIZE
-+#define NBPG sysconf(_SC_PAGESIZE)
++#define NBPG (sysconf(_SC_PAGESIZE))
#define UPAGES 1
#define HOST_TEXT_START_ADDR (u.start_code)
#define HOST_DATA_START_ADDR (u.start_data)
@@ -52,7 +53,7 @@
-#define PAGE_SHIFT 12
-#define PAGE_SIZE (1UL << PAGE_SHIFT)
-+#define PAGE_SIZE sysconf(_SC_PAGESIZE)
++#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
#define PAGE_MASK (~(PAGE_SIZE-1))
#define NBPG PAGE_SIZE
#define UPAGES 1
@@ -72,7 +73,7 @@
-#define PAGE_SHIFT 12
-#define PAGE_SIZE (1UL << PAGE_SHIFT)
-+#define PAGE_SIZE sysconf(_SC_PAGESIZE)
++#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
#define PAGE_MASK (~(PAGE_SIZE-1))
#define NBPG PAGE_SIZE
#define UPAGES 1
Reply to: