Adjust default page sizes for haiku arm.

	* configure.tgt (arm-haiku): Fix typo.
	* emulparams/armelf_haiku.su (MAXPAGESIZE): Use the default value.
	(COMMONPAGESIZE): Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d607faeca4f847f47487807fd0823ef2eacd44fd..2c5d6603eb9461dbe35d07514fe2155c06491cf7 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-22  Alexander von Gluck IV  <kallisti5@unixzen.com>
+
+       * configure.tgt (arm-haiku): Fix typo.
+       * emulparams/armelf_haiku.su (MAXPAGESIZE): Use the default value.
+       (COMMONPAGESIZE): Likewise.
+
 2022-01-22  Nick Clifton  <nickc@redhat.com>
 
        * configure: Regenerate.

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 2a4650c34093ac29db463045d95ae2aa0025c313..c7acf3f11ff17f101d116df48f91a5eba786259e 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -202,7 +202,7 @@ arm*-*-conix*)              targ_emul=armelf
 arm*-*-fuchsia*)       targ_emul=armelf_fuchsia
                        targ_extra_emuls="armelfb_fuchsia armelf armelfb"
                        ;;
-arm*-*-haiku*)         arg_emul=armelf_haiku
+arm*-*-haiku*)         targ_emul=armelf_haiku
                        targ_extra_emuls=armelf
                        ;;
 avr-*-*)               targ_emul=avr2

diff --git a/ld/emulparams/armelf_haiku.sh b/ld/emulparams/armelf_haiku.sh
index c42060f6b0cc0b2def6ba770844732c13f237c96..413c06c9d15656e0e346984c02cc15997ba48fd2 100644 (file)
--- a/ld/emulparams/armelf_haiku.sh
+++ b/ld/emulparams/armelf_haiku.sh
@@ -3,8 +3,8 @@ SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-littlearm"
 BIG_OUTPUT_FORMAT="elf32-bigarm"
 LITTLE_OUTPUT_FORMAT="elf32-littlearm"
-MAXPAGESIZE=0x8000
-COMMONPAGESIZE=0x1000
+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 TEMPLATE_NAME=elf
 EXTRA_EM_FILE=armelf
 GENERATE_SHLIB_SCRIPT=yes