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
tent'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/cross-toolchain.scm?id=9c1b8390ba36c0b9e3d5580b0f00206255f9b9a8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-02-12 20:35:43 +0100'>2020-02-12</span></td><td><a href='/guix/commit/gnu/build/cross-toolchain.scm?id=89da127035737bdf922bc566970c5506c2e01b00'>gnu: cross-base: Switch back to 'CROSS_C_INCLUDE_PATH' &amp; co.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-08-29 17:19:18 -0400'>2019-08-29</span></td><td><a href='/guix/commit/gnu/build/cross-toolchain.scm?id=0481289cbccba2646bf654f0ae49ac9c45602d5d'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2019-08-28 08:47:14 -0400'>2019-08-28</span></td><td><a href='/guix/commit/gnu/build/cross-toolchain.scm?id=07d7175406210434d1fb9c100dc33a7d095f1627'>gnu: mingw-w64: Update to 6.0.0.</a><span class='msg-avail'>...</span></td><td>David Thompson</td></tr>
<tr><td><span title='2019-08-22 15:53:27 -0400'>2019-08-22</span></td><td><a href='/guix/commit/gnu/build/cross-toolchain.scm?id=893c2df00daa4e6dd6a7ff3813d7df5329877f9e'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2019-08-14 21:29:53 +0200'>2019-08-14</span></td><td><a href='/guix/commit/gnu/build/cross-toolchain.scm?id=67dac6b8920755cb011047157bb7b4fae4760143'>gnu: mingw: Add x86_64 support.</a><span class='msg-avail'>...</span></td><td>Carl Dong</td></tr>
<tr><td><span title='2019-02-28 19:15:02 +0100'>2019-02-28</span></td><td><a href='/guix/commit/gnu/build/cross-toolchain.scm?id=b45a97ea84befd28b6191aa9ca320b8758ee8090'>gnu: GCC: Move cross-toolchain build fix to (gnu packages cross-base).</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-02-09 21:53:41 +0100'>2019-02-09</span></td><td><a href='/guix/commit/gnu/build/cross-toolchain.scm?id=01e8263febb9634564b4b73af49b81a36567a11b'>gnu: Use GCC 7 as the default compiler.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-23 04:41:53 -0400'>2018-03-23</span></td><td><a href='/guix/commit/gnu/build/cross-toolchain.scm?id=3e629738a3acd908acc510023c85db448e3553c3'>gnu: cross-base: Use invoke in (gnu build cross-toolchain).</a><span class='msg-avail'>...</span></td><td>Mark H Weaver</td></tr>