From 67525cb83217602994d2b75c4a07c9d92705079f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 6 Mar 2013 16:35:19 +0100 Subject: Sync with Linux 3.8 --- ports/ChangeLog.alpha | 6 ++++++ ports/ChangeLog.hppa | 6 ++++++ ports/ChangeLog.ia64 | 5 +++++ ports/ChangeLog.mips | 4 ++++ ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h | 3 +++ ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h | 1 + ports/sysdeps/unix/sysv/linux/generic/bits/msq.h | 1 + ports/sysdeps/unix/sysv/linux/hppa/bits/mman.h | 3 +++ ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h | 1 + ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h | 6 ++++-- ports/sysdeps/unix/sysv/linux/mips/bits/msq.h | 1 + 11 files changed, 35 insertions(+), 2 deletions(-) (limited to 'ports') diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha index 2814559a09..9a77d276ab 100644 --- a/ports/ChangeLog.alpha +++ b/ports/ChangeLog.alpha @@ -1,3 +1,9 @@ +2013-03-06 Andreas Jaeger + + * sysdeps/unix/sysv/linux/alpha/bits/mman.h (MAP_HUGE_MASK) + (MAP_HUGE_SHIFT): Define. + * sysdeps/unix/sysv/linux/alpha/bits/msq.h (MSG_COPY): Define. + 2013-02-19 Richard Henderson [BZ #14920] diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa index 6314f1269a..0610c177d9 100644 --- a/ports/ChangeLog.hppa +++ b/ports/ChangeLog.hppa @@ -1,3 +1,9 @@ +2013-03-06 Andreas Jaeger + + * sysdeps/unix/sysv/linux/hppa/bits/msq.h (MSG_COPY): Define. + * ports/sysdeps/unix/sysv/linux/hppa/bits/mman.h (MAP_HUGE_MASK) + (MAP_HUGE_SHIFT): Define. + 2013-02-14 Carlos O'Donell * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64 index d9fda457fc..e1835604e2 100644 --- a/ports/ChangeLog.ia64 +++ b/ports/ChangeLog.ia64 @@ -1,3 +1,8 @@ +2013-03-06 Andreas Jaeger + + * sysdeps/unix/sysv/linux/ia64/bits/msq.h (MSG_COPY): Define. + (MSG_EXCEPT): Make conditional on __USE_GNU. + 2013-02-18 Siddhesh Poyarekar * sysdeps/unix/sysv/linux/ia64/nptl/libc.abilist: Add diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index 251806572d..fe95254604 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,7 @@ +2013-03-06 Andreas Jaeger + + * sysdeps/unix/sysv/linux/mips/bits/msq.h (MSG_COPY): Define. + 2013-02-27 Chung-Lin Tang Maciej W. Rozycki Maxim Kuvyrkov diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h index 2238c2c72b..c51b05d37f 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h @@ -51,6 +51,9 @@ # define MAP_FILE 0 # define MAP_ANONYMOUS 0x10 /* Don't use a file. */ # define MAP_ANON MAP_ANONYMOUS +/* When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size. */ +# define MAP_HUGE_SHIFT 26 +# define MAP_HUGE_MASK 0x3f #endif /* Not used by Linux, but here to make sure we don't clash with diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h index 1b07465d45..8bb057b4ee 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h @@ -25,6 +25,7 @@ #define MSG_NOERROR 010000 /* no error if message is too big */ #ifdef __USE_GNU # define MSG_EXCEPT 020000 /* recv any msg except of specified type */ +# define MSG_COPY 040000 /* copy (not remove) all queue messages */ #endif /* Types used in the structure definition. */ diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h b/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h index 87f37b4d65..49cbf0611d 100644 --- a/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h +++ b/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h @@ -27,6 +27,7 @@ #define MSG_NOERROR 010000 /* no error if message is too big */ #ifdef __USE_GNU # define MSG_EXCEPT 020000 /* recv any msg except of specified type */ +# define MSG_COPY 040000 /* copy (not remove) all queue messages */ #endif /* Types used in the structure definition. */ diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/mman.h index c216ddb1fc..2835b0ff07 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/mman.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/mman.h @@ -44,6 +44,9 @@ # define MAP_ANONYMOUS 0x10 /* Don't use a file */ # define MAP_ANON MAP_ANONYMOUS # define MAP_VARIABLE 0 +/* When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size. */ +# define MAP_HUGE_SHIFT 26 +# define MAP_HUGE_MASK 0x3f #endif /* These are Linux-specific. */ diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h index e56286b283..ac35f510b5 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h @@ -26,6 +26,7 @@ #define MSG_NOERROR 010000 /* no error if message is too big */ #ifdef __USE_GNU # define MSG_EXCEPT 020000 /* recv any msg except of specified type */ +# define MSG_COPY 040000 /* copy (not remove) all queue messages */ #endif /* Types used in the structure definition. */ diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h index 68d3ed7929..8519390c48 100644 --- a/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h +++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h @@ -24,8 +24,10 @@ /* Define options for message queue functions. */ #define MSG_NOERROR 010000 /* no error if message is too big */ -#define MSG_EXCEPT 020000 /* recv any msg except of specified type */ - +#ifdef __USE_GNU +# define MSG_EXCEPT 020000 /* recv any msg except of specified type */ +# define MSG_COPY 040000 /* copy (not remove) all queue messages */ +#endif /* Structure of record for one message inside the kernel. The type `struct __msg' is opaque. */ diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h b/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h index 8439069cd7..e814bc722f 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h +++ b/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h @@ -25,6 +25,7 @@ #define MSG_NOERROR 010000 /* no error if message is too big */ #ifdef __USE_GNU # define MSG_EXCEPT 020000 /* recv any msg except of specified type */ +# define MSG_COPY 040000 /* copy (not remove) all queue messages */ #endif /* Types used in the structure definition. */ -- cgit 1.4.1