[Patch] build cvs emacs for x86_64-sun-solaris10

[NAKAJI Hiroyuki]

I successfully built cvs emacs on my Opteron box for the target
x86_64-sun-solaris10.

o I added the target {amd64,x86_64}-sun-solaris* in configure.in.
o src/fns.c also need change to avoid prototype error by Sun Studio.
o src/m/amdx86-64.h is also modified to fit sun.

o I tested compile with both gcc-3.4.3 and Sun Studio 11 with this shell
  script.

--->8------>8------>8------>8------>8---
#!/usr/bin/env bash

cd ~/emacs || exit 1

case "$1" in
gcc)
        export CC="gcc -m64"
        cfgopt="--with-gcc"
        ;;
cc)
        export CC="cc -xarch=amd64"
        cfgopt="--without-gcc"
        ;;
*)
        exit 0
        ;;
esac

export LANG=C

test -f Makefile && gmake distclean
cvs -q update -dP
./configure ${cfgopt} --with-gtk amd64-sun-solaris10 || exit 2
gmake bootstrap && sudo gmake install
--->8------>8------>8------>8------>8---

o I tested run and exit only.

Thanks.
-- 
NAKAJI Hiroyuki

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.419
diff -u -r1.419 configure.in
--- configure.in        26 Nov 2006 22:16:17 -0000      1.419
+++ configure.in        8 Dec 2006 04:14:20 -0000
@@ -951,6 +951,7 @@
       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 ;;
@@ -998,7 +999,14 @@
                ;;
       *-sunos5* | *-solaris* )
                opsys=sol2-6
-               NON_GNU_CPP=/usr/ccs/lib/cpp
+               case "${canonical}" in
+               amd64-*-*|x86_64-*-*)
+                       NON_GNU_CPP="/usr/ccs/lib/cpp -D__x86_64"
+                       ;;
+               *)
+                       NON_GNU_CPP=/usr/ccs/lib/cpp
+                       ;;
+               esac
                ;;
       *                          ) opsys=bsd4-2   ;;
     esac
Index: src/fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fns.c,v
retrieving revision 1.422
diff -u -r1.422 fns.c
--- src/fns.c   24 Nov 2006 19:53:56 -0000      1.422
+++ src/fns.c   8 Dec 2006 04:14:20 -0000
@@ -89,6 +89,8 @@
 #ifndef HAVE_UNISTD_H
 extern long time ();
 #endif
+
+static Lisp_Object concat (int, Lisp_Object *, enum Lisp_Type, int);
 
 DEFUN ("identity", Fidentity, Sidentity, 1, 1, 0,
        doc: /* Return the argument unchanged.  */)
Index: src/m/amdx86-64.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/m/amdx86-64.h,v
retrieving revision 1.12
diff -u -r1.12 amdx86-64.h
--- src/m/amdx86-64.h   26 Nov 2006 22:16:49 -0000      1.12
+++ src/m/amdx86-64.h   8 Dec 2006 04:14:20 -0000
@@ -125,7 +125,11 @@
 #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