diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-08-05 05:17:29 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-08-08 23:46:44 -0400 |
| commit | ef086ef8baada5bd485f3f21dde1c9bc10bd6bd5 (patch) | |
| tree | 6785403f9c52ec7d582e3e3696ca7b110a92f86d | |
| parent | 04ece7d2dec91fe870c5f1a38032875915f44633 (diff) | |
| download | glibc-ef086ef8baada5bd485f3f21dde1c9bc10bd6bd5.tar.gz | |
hppa: put custom madvise defines behind __USE_MISC
No other arch exports these defines, and having them in the default
namespace causes conformance header tests to fail. Put them behind
the __USE_MISC define as that is what other arches seem to use.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/bits/mman.h | 19 |
2 files changed, 16 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2015-08-09 Mike Frysinger <vapier@gentoo.org> + + * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]: Move all + MADV_*_PAGES defines behind this feature check. + 2015-08-09 John David Anglin <danglin@gcc.gnu.org> [BZ #18480] diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h index e7ee5b869e..cbde4b8d43 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h @@ -93,14 +93,17 @@ #endif /* The range 12-64 is reserved for page size specification. */ -#define MADV_4K_PAGES 12 /* Use 4K pages */ -#define MADV_16K_PAGES 14 /* Use 16K pages */ -#define MADV_64K_PAGES 16 /* Use 64K pages */ -#define MADV_256K_PAGES 18 /* Use 256K pages */ -#define MADV_1M_PAGES 20 /* Use 1 Megabyte pages */ -#define MADV_4M_PAGES 22 /* Use 4 Megabyte pages */ -#define MADV_16M_PAGES 24 /* Use 16 Megabyte pages */ -#define MADV_64M_PAGES 26 /* Use 64 Megabyte pages */ +/* These are Linux-specific. */ +#ifdef __USE_MISC +# define MADV_4K_PAGES 12 /* Use 4K pages. */ +# define MADV_16K_PAGES 14 /* Use 16K pages. */ +# define MADV_64K_PAGES 16 /* Use 64K pages. */ +# define MADV_256K_PAGES 18 /* Use 256K pages. */ +# define MADV_1M_PAGES 20 /* Use 1 Megabyte pages. */ +# define MADV_4M_PAGES 22 /* Use 4 Megabyte pages. */ +# define MADV_16M_PAGES 24 /* Use 16 Megabyte pages. */ +# define MADV_64M_PAGES 26 /* Use 64 Megabyte pages. */ +#endif /* The POSIX people had to invent similar names for the same things. */ #ifdef __USE_XOPEN2K |