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
v class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/documentation.scm?id=9adb66dd11ba36b05d090fdc754e1cde0ff1c72f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-02-14 00:13:07 +0100'>2019-02-14</span></td><td><a href='/guix/commit/gnu/packages/documentation.scm?id=58c6a93d9d60660d8425d8c52d4b73a42d4a5b55'>gnu: doxygen: Update home page and source URI.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-08-22 18:01:09 +0200'>2018-08-22</span></td><td><a href='/guix/commit/gnu/packages/documentation.scm?id=fb76ef8477f189d35c1e91bf026236f5627f3a27'>gnu: Remove GCC ICE workarounds.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-06-29 22:51:23 +0200'>2018-06-29</span></td><td><a href='/guix/commit/gnu/packages/documentation.scm?id=f1728d43460e63b106dd446e70001d8e100eaf6d'>Merge branch 'master' into core-updates</a></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2018-06-22 23:34:04 +0200'>2018-06-22</span></td><td><a href='/guix/commit/gnu/packages/documentation.scm?id=dbe1bd5dd9ca7a8a52e679f573b409340a2632d6'>gnu: doxygen: Update to 1.8.14.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2018-06-08 15:23:39 +0200'>2018-06-08</span></td><td><a href='/guix/commit/gnu/packages/documentation.scm?id=849a1399ca46497ad6acc5b11903f345502c02de'>gnu: doxygen: Work around GCC ICE on armhf-linux.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-25 05:01:55 -0400'>2018-03-25</span></td><td><a href='/guix/commit/gnu/packages/documentation.scm?id=8a442e5db2989df6283b323fc8176df75972bab2'>gnu: asciidoc: Restore custom 'bootstrap' phase.</a><span class='msg-avail'>...</span></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-03-11 22:04:40 +0100'>2018-03-11</span></td><td><a href='/guix/commit/gnu/packages/documentation.scm?id=189be331acfda1c242a9c85fca8d2a0356742f48'>build-system/gnu: Add 'bootstrap' phase.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-02-09 01:46:34 -0500'>2018-02-09</span></td><td><a href='/guix/commit/gnu/packages/documentation.scm?id=efe2a2833c6d306d0c60127fdfebaff6dc415b4c'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>