aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-06-13 11:58:36 +0000
committerUlrich Müller <ulm@gentoo.org>2012-06-13 11:58:36 +0000
commit8a5d2d7e9d0d6918a1b818326f0aaef53df1424c (patch)
tree2169a62fef49c2d23e01426eb862db485ff550ea /emacs/24.1
parentFix compilation with libXaw3d-1.6. (diff)
downloademacs-patches-8a5d2d7e9d0d6918a1b818326f0aaef53df1424c.tar.gz
emacs-patches-8a5d2d7e9d0d6918a1b818326f0aaef53df1424c.tar.bz2
emacs-patches-8a5d2d7e9d0d6918a1b818326f0aaef53df1424c.zip
Fix compilation with ABI=x32, bug 420257emacs-24.1-patches-2emacs-23.4-patches-4
Diffstat (limited to 'emacs/24.1')
-rw-r--r--emacs/24.1/03_all_x32.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/emacs/24.1/03_all_x32.patch b/emacs/24.1/03_all_x32.patch
new file mode 100644
index 0000000..c3d68a4
--- /dev/null
+++ b/emacs/24.1/03_all_x32.patch
@@ -0,0 +1,21 @@
+Fix compilation with ABI=x32.
+https://bugs.gentoo.org/420257
+
+--- emacs-24.1-orig/src/m/amdx86-64.h
++++ emacs-24.1/src/m/amdx86-64.h
+@@ -17,6 +17,7 @@
+ You should have received a copy of the GNU General Public License
+ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
++#ifndef __ILP32__ /* Don't define for x32 ABI. */
+ #define BITS_PER_LONG 64
+ #define BITS_PER_EMACS_INT 64
+
+@@ -30,6 +31,7 @@
+ #define EMACS_INT long
+ #define pI "l"
+ #define EMACS_UINT unsigned long
++#endif /* __ILP32__ */
+
+ /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
+ #undef DATA_SEG_BITS