From 7fd91fe0bb0c693070dcfb0f1dcc5a91f393d440 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Mon, 12 Jun 2006 11:35:45 +0000 Subject: [PATCH] [ bfd/ChangeLog ] * elf32-mips.c: Expand comment about ABI-mandated pagesize values. (ELF_MAXPAGESIZE, ELF_COMMONPAGESIZE): define in a more obvious way. * elf64-mips.c, elfn32-mips.c (ELF_MAXPAGESIZE): Fix value for IRIX6. Delete old comments. (ELF_COMMONPAGESIZE): Define in a more obvious way. [ ld/ChangeLog ] * emulparams/elf64bmip.sh, emulparams/elf64btsmip.sh (COMMONPAGESIZE): Define. [ ld/testsuite/ChangeLog ] * ld-mips-elf/multi-got-no-shared.d: Adjust for recent change of ELF_MAXPAGESIZE. --- bfd/ChangeLog | 8 ++++++++ bfd/elf32-mips.c | 14 +++++++++++--- bfd/elf64-mips.c | 10 ++++------ bfd/elfn32-mips.c | 9 +++------ ld/ChangeLog | 5 +++++ ld/emulparams/elf64bmip.sh | 1 + ld/emulparams/elf64btsmip.sh | 1 + ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-mips-elf/multi-got-no-shared.d | 4 ++-- 9 files changed, 40 insertions(+), 17 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a1b2a3f..8a369c8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2006-06-12 Thiemo Seufer + + * elf32-mips.c: Expand comment about ABI-mandated pagesize values. + (ELF_MAXPAGESIZE, ELF_COMMONPAGESIZE): define in a more obvious way. + * elf64-mips.c, elfn32-mips.c (ELF_MAXPAGESIZE): Fix value for IRIX6. + Delete old comments. + (ELF_COMMONPAGESIZE): Define in a more obvious way. + 2006-06-12 Nick Clifton PR binutils/2735 diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index fd8a427..5745df5 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -1610,15 +1610,20 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = { #undef TARGET_BIG_NAME #undef ELF_MAXPAGESIZE +#undef ELF_COMMONPAGESIZE #define TARGET_LITTLE_SYM bfd_elf32_tradlittlemips_vec #define TARGET_LITTLE_NAME "elf32-tradlittlemips" #define TARGET_BIG_SYM bfd_elf32_tradbigmips_vec #define TARGET_BIG_NAME "elf32-tradbigmips" -/* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses - page sizes of up to that limit, so we need to respect it. */ +/* The MIPS ABI says at Page 5-1: + Virtual addresses and file offsets for MIPS segments are congruent + modulo 64 KByte (0x10000) or larger powers of 2. Because 64 KBytes + is the maximum page size, the files are suitable for paging + regardless of physical page size. */ #define ELF_MAXPAGESIZE 0x10000 +#define ELF_COMMONPAGESIZE 0x1000 #define elf32_bed elf32_tradbed /* Include the target file again for this target. */ @@ -1703,6 +1708,9 @@ mips_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) #undef TARGET_BIG_SYM #undef TARGET_BIG_NAME +#undef ELF_MAXPAGESIZE +#undef ELF_COMMONPAGESIZE + #define TARGET_LITTLE_SYM bfd_elf32_littlemips_vxworks_vec #define TARGET_LITTLE_NAME "elf32-littlemips-vxworks" #define TARGET_BIG_SYM bfd_elf32_bigmips_vxworks_vec @@ -1711,8 +1719,8 @@ mips_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) #undef elf32_bed #define elf32_bed elf32_mips_vxworks_bed -#undef ELF_MAXPAGESIZE #define ELF_MAXPAGESIZE 0x1000 +#define ELF_COMMONPAGESIZE 0x1000 #undef elf_backend_want_got_plt #define elf_backend_want_got_plt 1 diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c index c8f3127..ee5bce6 100644 --- a/bfd/elf64-mips.c +++ b/bfd/elf64-mips.c @@ -3152,10 +3152,8 @@ extern bfd_boolean bfd_elf64_archive_write_armap #define TARGET_BIG_SYM bfd_elf64_bigmips_vec #define TARGET_BIG_NAME "elf64-bigmips" -/* The SVR4 MIPS ABI says that this should be 0x10000, but Irix 5 uses - a value of 0x1000, and we are compatible. - FIXME: How does this affect NewABI? */ -#define ELF_MAXPAGESIZE 0x1000 +#define ELF_MAXPAGESIZE 0x10000 +#define ELF_COMMONPAGESIZE 0x1000 #include "elf64-target.h" @@ -3166,15 +3164,15 @@ extern bfd_boolean bfd_elf64_archive_write_armap #undef TARGET_BIG_NAME #undef ELF_MAXPAGESIZE +#undef ELF_COMMONPAGESIZE #define TARGET_LITTLE_SYM bfd_elf64_tradlittlemips_vec #define TARGET_LITTLE_NAME "elf64-tradlittlemips" #define TARGET_BIG_SYM bfd_elf64_tradbigmips_vec #define TARGET_BIG_NAME "elf64-tradbigmips" -/* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses - page sizes of up to that limit, so we need to respect it. */ #define ELF_MAXPAGESIZE 0x10000 +#define ELF_COMMONPAGESIZE 0x1000 #define elf64_bed elf64_tradbed /* Include the target file again for this target. */ diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c index 8e7eb53..367bcf3 100644 --- a/bfd/elfn32-mips.c +++ b/bfd/elfn32-mips.c @@ -2380,10 +2380,7 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = { #define TARGET_BIG_SYM bfd_elf32_nbigmips_vec #define TARGET_BIG_NAME "elf32-nbigmips" -/* The SVR4 MIPS ABI says that this should be 0x10000, but Irix 5 uses - a value of 0x1000, and we are compatible. - FIXME: How does this affect NewABI? */ -#define ELF_MAXPAGESIZE 0x1000 +#define ELF_MAXPAGESIZE 0x10000 #define ELF_COMMONPAGESIZE 0x1000 #include "elf32-target.h" @@ -2395,15 +2392,15 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = { #undef TARGET_BIG_NAME #undef ELF_MAXPAGESIZE +#undef ELF_COMMONPAGESIZE #define TARGET_LITTLE_SYM bfd_elf32_ntradlittlemips_vec #define TARGET_LITTLE_NAME "elf32-ntradlittlemips" #define TARGET_BIG_SYM bfd_elf32_ntradbigmips_vec #define TARGET_BIG_NAME "elf32-ntradbigmips" -/* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses - page sizes of up to that limit, so we need to respect it. */ #define ELF_MAXPAGESIZE 0x10000 +#define ELF_COMMONPAGESIZE 0x1000 #define elf32_bed elf32_tradbed /* Include the target file again for this target. */ diff --git a/ld/ChangeLog b/ld/ChangeLog index 69d3db6..a288ca9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2006-06-12 Thiemo Seufer + + * emulparams/elf64bmip.sh, emulparams/elf64btsmip.sh (COMMONPAGESIZE): + Define. + 2006-06-09 Alan Modra * ldlang.h (lang_input_statement_type): Use bitfields for booleans. diff --git a/ld/emulparams/elf64bmip.sh b/ld/emulparams/elf64bmip.sh index a4ce6d4..3910bea 100755 --- a/ld/emulparams/elf64bmip.sh +++ b/ld/emulparams/elf64bmip.sh @@ -3,6 +3,7 @@ OUTPUT_FORMAT="elf64-bigmips" BIG_OUTPUT_FORMAT="elf64-bigmips" LITTLE_OUTPUT_FORMAT="elf64-littlemips" SHLIB_TEXT_START_ADDR=0x3ffffe0000 +COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" # IRIX6 defines these symbols. 0x40 is the size of the ELF header. EXECUTABLE_SYMBOLS=" diff --git a/ld/emulparams/elf64btsmip.sh b/ld/emulparams/elf64btsmip.sh index 23a20c7..f6e8dcf 100644 --- a/ld/emulparams/elf64btsmip.sh +++ b/ld/emulparams/elf64btsmip.sh @@ -5,6 +5,7 @@ OUTPUT_FORMAT="elf64-tradbigmips" BIG_OUTPUT_FORMAT="elf64-tradbigmips" LITTLE_OUTPUT_FORMAT="elf64-tradlittlemips" +COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" # Magic sections. OTHER_TEXT_SECTIONS='*(.mips16.fn.*) *(.mips16.call.*)' diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 5995a35..66a5dac 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-06-12 Thiemo Seufer + + * ld-mips-elf/multi-got-no-shared.d: Adjust for recent change of + ELF_MAXPAGESIZE. + 2006-06-11 Richard Sandiford * ld-mips-elf/stub-dynsym-1.s, diff --git a/ld/testsuite/ld-mips-elf/multi-got-no-shared.d b/ld/testsuite/ld-mips-elf/multi-got-no-shared.d index 927b304..bffc485 100644 --- a/ld/testsuite/ld-mips-elf/multi-got-no-shared.d +++ b/ld/testsuite/ld-mips-elf/multi-got-no-shared.d @@ -8,11 +8,11 @@ .*: +file format.* Disassembly of section \.text: -004000b0 <[^>]*> 3c1c0046 lui gp,0x46 +004000b0 <[^>]*> 3c1c0043 lui gp,0x43 004000b4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 004000b8 <[^>]*> afbc0008 sw gp,8\(sp\) #... -00408d60 <[^>]*> 3c1c0047 lui gp,0x47 +00408d60 <[^>]*> 3c1c0044 lui gp,0x44 00408d64 <[^>]*> 279cb960 addiu gp,gp,-18080 00408d68 <[^>]*> afbc0008 sw gp,8\(sp\) #pass -- 2.7.4