Skip to content

Commit

Permalink
hppa: put custom madvise defines behind __USE_MISC
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Mike Frysinger committed Aug 9, 2015
1 parent 04ece7d commit ef086ef
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
19 changes: 11 additions & 8 deletions sysdeps/unix/sysv/linux/hppa/bits/mman.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ef086ef

Please sign in to comment.