diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 47001a5bdb91dc3e7341f1cf4068e74b12ff0df6..73ffdad33bc8d5bf9cf2e2d84a606e8d183695f7 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -4797,7 +4797,7 @@ exponent (uint64_t len)
 #undef CAP_MAX_EXPONENT
 }
 
-#define ONES(x)         ((1ULL << ((x) + 1)) - 1)
+#define ONES(x)         ((1ULL << (x)) - 1)
 #define ALIGN_UP(x, a)  (((x) + ONES (a)) & (~ONES (a)))
 
 static bfd_boolean
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index e9cb95d5e17b43b5ed4fc25e782a9d668c9d785c..228cfe224c57efc1cac6c694d304d8186e8749d6 100644
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -244,6 +244,8 @@ run_dump_test_lp64 "emit-relocs-morello-2"
 run_dump_test_lp64 "emit-relocs-morello-2-a64c"
 run_dump_test_lp64 "emit-relocs-morello-3"
 run_dump_test_lp64 "emit-relocs-morello-3-a64c"
+run_dump_test_lp64 "emit-relocs-morello-4"
+run_dump_test_lp64 "emit-relocs-morello-5"
 
 run_dump_test_lp64 "morello-capinit"
 run_dump_test_lp64 "morello-stubs"
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-morello-4.d b/ld/testsuite/ld-aarch64/emit-relocs-morello-4.d
new file mode 100644
index 0000000000000000000000000000000000000000..04cfa79a042a40be2dc3e745437c0ae344b53cc3
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-morello-4.d
@@ -0,0 +1,14 @@
+#source: emit-relocs-morello-4.s
+#as: -march=morello+c64
+#ld: -static
+#readelf: --relocs --syms
+
+
+#...
+Relocation section[^\n]*contains 1 entry:
+#...
+Symbol table[^\n]*contains[^\n]*:
+   Num:    Value          Size.*
+#...
+    [0-9]+: [0-9a-f]+0 64016 [^\n]* bigarray
+#pass
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-morello-4.s b/ld/testsuite/ld-aarch64/emit-relocs-morello-4.s
new file mode 100644
index 0000000000000000000000000000000000000000..d91d85ab5eb9080b70e3e70ddc36f2b8e85a2157
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-morello-4.s
@@ -0,0 +1,17 @@
+// Checking that having a relocation against very large arrays that are not
+// problematic w.r.t. capability bounds representation do not error.
+// The below is somthing that requires being padded
+.bss
+.globl bigarray
+.p2align 4
+bigarray:
+	.zero 64004
+	.zero 12                 // Tail padding to ensure precise bounds.
+	.size bigarray, 64016
+
+.text
+.globl _start
+.type _start STT_FUNC
+_start:
+	adrp	c0, :got:bigarray
+	ldr	c0, [c0, #:got_lo12:bigarray]
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-morello-5.d b/ld/testsuite/ld-aarch64/emit-relocs-morello-5.d
new file mode 100644
index 0000000000000000000000000000000000000000..05bbef145e03786dbb489b40441e78fbff69ddb5
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-morello-5.d
@@ -0,0 +1,6 @@
+#source: emit-relocs-morello-5.s
+#as: -march=morello+c64
+#ld: -static
+#error: .*: capability range may exceed object bounds
+#error: .*: in function `_start':.*
+#error: .*: dangerous relocation: unsupported relocation
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-morello-5.s b/ld/testsuite/ld-aarch64/emit-relocs-morello-5.s
new file mode 100644
index 0000000000000000000000000000000000000000..0493c26065ced0d117a7ab9ab3969a00ff2045b0
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-morello-5.s
@@ -0,0 +1,15 @@
+// Checking that having a relocation against very large arrays whose size can
+// not be represented gives the corresponding error.
+.bss
+.globl bigarray
+.p2align 4
+bigarray:
+	.zero 64004
+	.size bigarray, 64004
+
+.text
+.globl _start
+.type _start STT_FUNC
+_start:
+	adrp	c0, :got:bigarray
+	ldr	c0, [c0, #:got_lo12:bigarray]
diff --git a/ld/testsuite/ld-aarch64/morello-sec-round.d b/ld/testsuite/ld-aarch64/morello-sec-round.d
index 00eceb0386a3f8890c2876a4a6bac9569f146e33..b553a604acd92a2b0c5e151546e2c19a04101f70 100644
--- a/ld/testsuite/ld-aarch64/morello-sec-round.d
+++ b/ld/testsuite/ld-aarch64/morello-sec-round.d
@@ -7,5 +7,5 @@ Idx Name          Size      VMA               LMA               File off  Algn
 #...
   1 .text_sec     00020004  ...........20000  [0-9a-f]+  [0-9a-f]+  2\*\*17
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  2 \..*       [0-9a-f]+  ...........40080  [0-9a-f]+  [0-9a-f]+  .*
+  2 \..*       [0-9a-f]+  ...........40040  [0-9a-f]+  [0-9a-f]+  .*
 #pass