--- emacs-18.59-orig/src/ChangeLog
+++ emacs-18.59/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-20  Ulrich Mueller  <ulm@gentoo.org>
+
+	* s-linux.h (SYSTEM_MALLOC): Define. Fixes hanging at runtime
+	when compiled with GCC 5.3.
+
 2015-12-19  Ulrich Mueller  <ulm@gentoo.org>
 
 	Fix a couple of compiler warnings.
--- emacs-18.59-orig/src/s-linux.h
+++ emacs-18.59/src/s-linux.h
@@ -218,13 +218,7 @@
    performed in x11term.c (x_init_1). */
 #define SYSV_STREAMS
 
-/* note: system malloc does not work with shared libs
-   This was reported with earlier versions of linux (libc 4).
-   Still true?
- */
-#if 0				/* choose for yourself */
 #define SYSTEM_MALLOC		/* produces smaller binary */
-#endif
 
 /* misc. kludges for linux */
 #if !(defined (__GLIBC__) && (__GLIBC__ >= 2))