diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-06-13 11:58:36 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-06-13 11:58:36 +0000 |
| commit | 8a5d2d7e9d0d6918a1b818326f0aaef53df1424c (patch) | |
| tree | 2169a62fef49c2d23e01426eb862db485ff550ea | |
| parent | Fix compilation with libXaw3d-1.6. (diff) | |
| download | emacs-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
| -rw-r--r-- | emacs/23.4/11_all_x32.patch | 38 | ||||
| -rw-r--r-- | emacs/24.1/03_all_x32.patch | 21 |
2 files changed, 59 insertions, 0 deletions
diff --git a/emacs/23.4/11_all_x32.patch b/emacs/23.4/11_all_x32.patch new file mode 100644 index 0000000..fc05980 --- /dev/null +++ b/emacs/23.4/11_all_x32.patch @@ -0,0 +1,38 @@ +Fix compilation with ABI=x32. +https://bugs.gentoo.org/420257 + +--- emacs-23.4-orig/lib-src/fakemail.c ++++ emacs-23.4/lib-src/fakemail.c +@@ -363,7 +363,7 @@ + make_file_preface () + { + char *the_string, *temp; +- long idiotic_interface; ++ time_t idiotic_interface; + struct tm *tm; + long prefix_length; + long user_length; +--- emacs-23.4-orig/src/m/amdx86-64.h ++++ emacs-23.4/src/m/amdx86-64.h +@@ -30,8 +30,10 @@ + operating system this machine is likely to run. + USUAL-OPSYS="linux" */ + ++#ifndef __ILP32__ /* Don't define for x32 ABI. */ + #define BITS_PER_LONG 64 + #define BITS_PER_EMACS_INT 64 ++#endif + + /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word + is the most significant byte. */ +@@ -50,8 +52,10 @@ + /* __x86_64 defined automatically. */ + + /* Define the type to use. */ ++#ifndef __ILP32__ + #define EMACS_INT long + #define EMACS_UINT unsigned long ++#endif + + /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend + the 24-bit bit field into an int. In other words, if bit fields 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 |