From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 8 Dec 2006 15:45:59 +0000 (+0000)
Subject: Add support for Solaris 10 on x86-64.
X-Git-Tag: emacs-pretest-22.0.92~240
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a15fc3c3c2c20b14e8f27e1f15db107ea87ad3bf;p=emacs.git

Add support for Solaris 10 on x86-64.
---

diff --git a/configure.in b/configure.in
index 0589d7ee19c..427201491f4 100644
--- a/configure.in
+++ b/configure.in
@@ -951,6 +951,7 @@ dnl see the `changequote' comment above.
       m68* )		machine=sun3 ;;
       i[3456]86-sun-sunos[34]* )	machine=sun386 ;;
       i[3456]86-*-* )     machine=intel386 ;;
+      amd64-*-*|x86_64-*-*)	machine=amdx86-64 ;;
       powerpcle* )      machine=powerpcle ;;
       powerpc* | rs6000* )  machine=ibmrs6000 ;;
       sparc* )		machine=sparc ;;
diff --git a/src/ChangeLog b/src/ChangeLog
index d74331f8885..bae86f83fc2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-08  NAKAJI Hiroyuki  <nakaji@jp.freebsd.org> (tiny change)
+
+	* m/amdx86-64.h: Add support for Solaris 10 on x86-64.
+
 2006-12-08  Kenichi Handa  <handa@m17n.org>
 
 	* xterm.c (x_query_font): Use xstricmp instead off strcasecmp.
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 940ff70dbda..670360336a8 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -125,7 +125,12 @@ Boston, MA 02110-1301, USA.  */
 #undef LIB_STANDARD
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
 
-#else /* !__OpenBSD__ && !__FreeBSD__ */
+#elif defined(sun)
+
+#undef START_FILES
+#undef LIB_STANDARD
+
+#else /* !__OpenBSD__ && !__FreeBSD__ && !sun */
 
 #undef START_FILES
 #ifdef HAVE_X86_64_LIB64_DIR