aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/configure.tgt2
-rw-r--r--ld/emulparams/armelf_haiku.sh4
3 files changed, 9 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index d607fae..2c5d660 100644
--- 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 2a4650c..c7acf3f 100644
--- 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 c42060f..413c06c 100644
--- 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