Merge from emacs-23 branch.

[gnu-emacs] / src / s / sol2-10.h

diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h
index 865e17525c4ed5667e7522a935a1c01ac22fb9ec..fd7f30021ea75ee70d94bfffc65c12db031005e6 100644 (file)
--- a/src/s/sol2-10.h
+++ b/src/s/sol2-10.h
@@ -2,25 +2,6 @@
 
 #include "sol2-6.h"
 
-#define SYSTEM_MALLOC
-
-/*
- * Use the Solaris dldump() function, called from unexsol.c, to dump
- * emacs, instead of the generic ELF dump code found in unexelf.c.
- * The resulting binary has a complete symbol table, and is better
- * for debugging and other observabilty tools (debuggers, pstack, etc).
- *
- * If you encounter a problem using dldump(), please consider sending
- * a message to the OpenSolaris tools-linking mailing list:
- *      http://mail.opensolaris.org/mailman/listinfo/tools-linking
- *
- * It is likely that dldump() works with older Solaris too,
- * but this has not been tested, and so, this change is for
- * Solaris 10 and newer only at this time.
- */
-#undef UNEXEC
-#define UNEXEC unexsol.o
-
 /* This is used in list_system_processes.  */
 #define HAVE_PROCFS 1