From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 22 Jan 2022 14:18:34 +0000 (+0000)
Subject: Adjust default page sizes for haiku arm.
X-Git-Tag: gdb-12.1-release~534
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fbinutils-gdb.git;a=commitdiff_plain;h=cc5e40736d994e53df7d550b7d705f6dcc15169d

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 d607faeca4f..2c5d6603eb9 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 2a4650c3409..c7acf3f11ff 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 c42060f6b0c..413c06c9d15 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