Improve the determination of pageSize in patchelf.cc.

Patch by Mark H Weaver <mhw@netris.org>.

--- patchelf/src/patchelf.cc.orig	1969-12-31 19:00:01.000000000 -0500
+++ patchelf/src/patchelf.cc	2014-02-16 20:15:06.283203125 -0500
@@ -21,11 +21,19 @@
 using namespace std;
 
 
-#ifdef MIPSEL
-/* The lemote fuloong 2f kernel defconfig sets a page size of 16KB */
-const unsigned int pageSize = 4096*4;
-#else
+/* Note that some platforms support multiple page sizes.  Therefore,
+   it is not enough to query the current page size.  'pageSize' must
+   be the maximum architectural page size for the platform, which is
+   typically defined in the corresponding ABI document.
+
+   XXX FIXME: This won't work when we're cross-compiling.  */
+
+#if defined __MIPSEL__ || defined __MIPSEB__ || defined __aarch64__
+const unsigned int pageSize = 65536;
+#elif defined __x86_64__ || defined __i386__ || defined __arm__
 const unsigned int pageSize = 4096;
+#else
+# error maximum architectural page size unknown for this platform
 #endif
 
 
--- patchelf/tests/no-rpath.sh.orig	2014-01-14 08:17:47.000000000 -0500
+++ patchelf/tests/no-rpath.sh	2015-01-06 18:31:53.418172797 -0500
@@ -1,23 +1,23 @@
 #! /bin/sh -e
 SCRATCH=scratch/$(basename $0 .sh)
 
-rm -rf ${SCRATCH}
-mkdir -p ${SCRATCH}
+if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then
+    rm -rf ${SCRATCH}
+    mkdir -p ${SCRATCH}
 
-cp ${srcdir}/no-rpath ${SCRATCH}/
+    cp ${srcdir}/no-rpath ${SCRATCH}/
 
-oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
-if test -n "$oldRPath"; then exit 1; fi
-../src/patchelf \
-  --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \
-  --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath
+    oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
+    if test -n "$oldRPath"; then exit 1; fi
+    ../src/patchelf \
+      --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \
+      --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath
 
-newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
-if ! echo "$newRPath" | grep -q '/foo:/bar'; then
-    echo "incomplete RPATH"
-    exit 1
-fi
+    newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
+    if ! echo "$newRPath" | grep -q '/foo:/bar'; then
+        echo "incomplete RPATH"
+        exit 1
+    fi
 
-if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then
     cd ${SCRATCH} && ./no-rpath
 fi
ohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/linux-boot.scm?id=bb4674b43fa413a6d41694b2093c3b00d11eea47&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-03-02 23:24:47 -0500'>2020-03-02</span></td><td><a href='/guix/commit/gnu/build/linux-boot.scm?id=cc9b889e8f285719645b5a86f2583d7f1b2aef01'>linux-boot: Ensure volatile root is mounted read-only.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-12-12 17:56:33 +0100'>2019-12-12</span></td><td><a href='/guix/commit/gnu/build/linux-boot.scm?id=55e21617d68073077fdc9f35307e94859ec7a6c4'>linux-boot: Don't ignore flags when mounting root file system.</a><span class='msg-avail'>...</span></td><td>Guillaume Le Vaillant</td></tr>
<tr><td><span title='2019-11-18 12:18:42 +0100'>2019-11-18</span></td><td><a href='/guix/commit/gnu/build/linux-boot.scm?id=900ef20b1da66ad71145082c883dc12f31fafa54'>linux-boot: Don't ignore options when mounting root file system.</a><span class='msg-avail'>...</span></td><td>Guillaume Le Vaillant</td></tr>
<tr><td><span title='2019-11-18 13:22:16 +0900'>2019-11-18</span></td><td><a href='/guix/commit/gnu/build/linux-boot.scm?id=c09903acae89983931f7c9bc2b60653228288f05'>linux-boot: Fix indentation.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-09-25 12:18:25 +0900'>2019-09-25</span></td><td><a href='/guix/commit/gnu/build/linux-boot.scm?id=41e03c4beefb4d14ca1f8f9d8739a582c9430893'>linux-boot: Fix typo.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-08-16 23:00:27 +0200'>2019-08-16</span></td><td><a href='/guix/commit/gnu/build/linux-boot.scm?id=e1a9a7f2755dc23e1f4635c8aee45e1467c01619'>linux-modules: Add 'load-linux-modules-from-directory'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-03 18:08:56 +0200'>2019-06-03</span></td><td><a href='/guix/commit/gnu/build/linux-boot.scm?id=aa901521e4e5625dd8a63e67a64be2f562ca61c7'>linux-boot: Fix e2fsck warning.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-03-24 23:06:12 +0100'>2019-03-24</span></td><td><a href='/guix/commit/gnu/build/linux-boot.scm?id=ae7a316b9da0d1a50c5abdc531c68c8e98e561c9'>system: Initialize console keyboard layout in the initrd.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>