--- emacs-18.59-orig/src/ChangeLog
+++ emacs-18.59/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-28  Ulrich Mueller  <ulm@gentoo.org>
+
+	Support x32 ABI on x86_64 architecture.
+	* m-x86-x32.h: New file.
+
 2011-12-24  Ulrich Mueller  <ulm@gentoo.org>
 
 	* process.c: Include sys/wait.h if available.
--- emacs-18.59-orig/src/m-x86-x32.h
+++ emacs-18.59/src/m-x86-x32.h
@@ -0,0 +1,9 @@
+/* m- file for x32 ABI on x86_64. */
+
+#include "m-intel386.h"
+
+#define NO_ARG_ARRAY
+
+#undef ULIMIT_BREAK_VALUE
+#undef DATA_SEG_BITS
+#undef SEGMENT_MASK
--- emacs-18.59-orig/etc/ChangeLog
+++ emacs-18.59/etc/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-28  Ulrich Mueller  <ulm@gentoo.org>
+
+	* fakemail.c (make_file_preface): time(2) returns a value of
+	type time_t. Declare variable accordingly.
+	* wakeup.c (main): Ditto.
+
 2011-12-19  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Makefile: Respect LDFLAGS.
--- emacs-18.59-orig/etc/fakemail.c
+++ emacs-18.59/etc/fakemail.c
@@ -272,7 +272,7 @@
 make_file_preface ()
 {
   char *the_string, *temp;
-  long idiotic_interface;
+  time_t idiotic_interface;
   long prefix_length;
   long user_length;
   long date_length;
--- emacs-18.59-orig/etc/wakeup.c
+++ emacs-18.59/etc/wakeup.c
@@ -11,7 +11,7 @@
      char **argv;
 {
   int period = 60;
-  long when;
+  time_t when;
   struct tm *tp;
 
   if (argc > 1)