5 files changed, 43 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 831c8e3ffe4..9fbaeb8d803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-23  Ali Bahrami <ali_gnu@emvision.com>  (tiny change)
+
+        * configure (*-sunos5*, *-solaris* ): Use the new file sol2-10.h.
+        Use sol2-6.h for Solaris 7-9.
+
 2008-10-18  Ulrich Mueller  <ulm@gentoo.org>
 
         * configure.in: Add support for GNU/Linux on SuperH.
diff --git a/configure b/configure
index c78ee2cf5dc..cc57896cb7e 100755
--- a/configure
+++ b/configure
@@ -2581,10 +2581,15 @@ _ACEOF
                 NON_GNU_CPP=/usr/ccs/lib/cpp
                 RANLIB="ar -ts"
                 ;;
-      *-sunos5* | *-solaris* )
+      *-sunos5.[7-9]* | *-solaris[7-9]* )
                 opsys=sol2-6
                 emacs_check_sunpro_c=yes
                 NON_GNU_CPP=/usr/ccs/lib/cpp
+
+      *-sunos5* | *-solaris* )
+                opsys=sol2-10
+                emacs_check_sunpro_c=yes
+                NON_GNU_CPP=/usr/ccs/lib/cpp
                 ;;
     esac
     ## Watch out for a compiler that we know will not work.
diff --git a/configure.in b/configure.in
index 326830dc056..6fd1581b787 100644
--- a/configure.in
+++ b/configure.in
@@ -471,10 +471,15 @@ dnl see the `changequote' comment above.
                 NON_GNU_CPP=/usr/ccs/lib/cpp
                 RANLIB="ar -ts"
                 ;;
-      *-sunos5* | *-solaris* )
+      *-sunos5.[7-9]* | *-solaris[7-9]* )
                 opsys=sol2-6
                 emacs_check_sunpro_c=yes
                 NON_GNU_CPP=/usr/ccs/lib/cpp
+
+      *-sunos5* | *-solaris* )
+                opsys=sol2-10
+                emacs_check_sunpro_c=yes
+                NON_GNU_CPP=/usr/ccs/lib/cpp
                 ;;
     esac
     ## Watch out for a compiler that we know will not work.
diff --git a/src/ChangeLog b/src/ChangeLog
index de11b21c9e9..eaa5d8299c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-23  Ali Bahrami <ali_gnu@emvision.com>  (tiny change)
+
+        * s/sol2-10.h: New file.
+
 2008-10-23  Juanma Barranquero  <lekktu@gmail.com>
 
         * xdisp.c (fill_glyph_string): Fix typo in source (though the
diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h
new file mode 100644
index 00000000000..7e158e89ccf
--- /dev/null
+++ b/src/s/sol2-10.h
@@ -0,0 +1,22 @@
+/* Handle Solaris 2.10.  */
+
+#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