[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#11669: 24.1; Build failure on amd64 with x32 ABI
From: |
Ulrich Mueller |
Subject: |
bug#11669: 24.1; Build failure on amd64 with x32 ABI |
Date: |
Fri, 15 Jun 2012 08:21:56 +0200 |
> emacs-24 should get some form of band-aid "do not merge to trunk"
> fix for this, just in case.
I've now applied a somewhat different solution to the Gentoo package,
namely patching the m/amdx86-64.h file, see attached patch. (This
should also ensure that it isn't accidentally merged to trunk, because
the file doesn't exist there any more.)
--- 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