summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elfxx-target.h15
2 files changed, 17 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1ac3321489..bfec9df515 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-20 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * elfxx-target.h [ELF_COMMONPAGESIZE && ELF_MAXPAGESIZE]
+ (ELF_MINPAGESIZE): Fixed its size guess. Sanity checked its size.
+ (ELF_COMMONPAGESIZE, ELF_MAXPAGESIZE): Sanity checked their size.
+
2007-08-20 Nick Clifton <nickc@redhat.com>
* elflink.c (elf_fixup_link_order): Rewrite conversion of
diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h
index 4eea908027..c803763d11 100644
--- a/bfd/elfxx-target.h
+++ b/bfd/elfxx-target.h
@@ -298,16 +298,23 @@
#endif
#ifndef ELF_MAXPAGESIZE
- #error ELF_MAXPAGESIZE is not defined
+# error ELF_MAXPAGESIZE is not defined
#define ELF_MAXPAGESIZE 1
#endif
+#ifndef ELF_COMMONPAGESIZE
+#define ELF_COMMONPAGESIZE ELF_MAXPAGESIZE
+#endif
+
#ifndef ELF_MINPAGESIZE
-#define ELF_MINPAGESIZE ELF_MAXPAGESIZE
+#define ELF_MINPAGESIZE ELF_COMMONPAGESIZE
#endif
-#ifndef ELF_COMMONPAGESIZE
-#define ELF_COMMONPAGESIZE ELF_MAXPAGESIZE
+#if ELF_COMMONPAGESIZE > ELF_MAXPAGESIZE
+# error ELF_COMMONPAGESIZE > ELF_MAXPAGESIZE
+#endif
+#if ELF_MINPAGESIZE > ELF_COMMONPAGESIZE
+# error ELF_MINPAGESIZE > ELF_COMMONPAGESIZE
#endif
#ifndef ELF_DYNAMIC_SEC_FLAGS