🚀 go-pugleaf

hi,

i recently got emacs-19.25 working on solaris 2.4 on a 486 box.  i had
to muck with configure so it would distinguish between the old
roadrunner (sun 386i) running 4.x and the current solaris 2.4 on x86.

also, there is one header file which has a stray "volatile" that has
not been #ifdef'd with __STDC__.  since emacs gets compiled with
"gcc -traditional", i #define volatile to nothing much like const gets
defined to nothing in some other places.  i had to shuffle config.h
around in a few files so that the "volatile" definition happened
before the offending .h file got included.

what follows are 3 attachments.  a changelog entry, sol2-4.h for the
src/s directory, and finally, a bunch of diffs.

-- ChangeLog --
Wed Aug  3 21:53:58 PDT 1994  Caveh Jalali  (caveh@eng.sun.com)

	* Added support for Solaris 2.4 on Intel hardware:
	* fixed configure to distinguish between sunos 4.x on 386
	  (ancient sun 386i) and solaris 2.4 on x86.
	* added sol2-4.h to get around ANSI-only .h file in
	  /usr/include.
-- sol2-4.h --
/*
 * this is for sol2.4
 *	- tested on x86
 */

#ifdef __GNUC__
#ifdef i386
/*
 * since we use gcc -traditional, we have to work around a bogus "volatile" in
 * <sys/machlock.h>.  must do this before #include "sol2-3.h".
 */
#define volatile
#endif /* i386 */
#endif /* __GNUC__ */

#include "sol2-3.h"
--
-- patches --
diff -r -c emacs-19.25-dist/configure emacs-19.25/configure
*** emacs-19.25-dist/configure	Sat May 28 03:55:03 1994
--- emacs-19.25/configure	Fri Jul 22 16:11:40 1994
***************
*** 922,927 ****
--- 922,929 ----
        m68*-sunos1* )	machine=sun1 ;;
        m68*-sunos2* )	machine=sun2 ;;
        m68* )		machine=sun3 ;;
+       i[34]86*-sunos5* | i[34]86*-solaris2* )
+ 			machine=intel386 ;;
        i[34]86* )	machine=sun386 ;;
        sparc* )		machine=sparc ;;
        * )		unported=true ;;
***************
*** 941,946 ****
--- 943,952 ----
  		;;
        *-sunos5.3* | *-solaris2.3* )
  		opsys=sol2-3
+ 		NON_GNU_CPP=/usr/ccs/lib/cpp
+ 		;;
+       *-sunos5.4* | *-solaris2.4* )
+ 		opsys=sol2-4
  		NON_GNU_CPP=/usr/ccs/lib/cpp
  		;;
        *-sunos5* | *-solaris* )
diff -r -c emacs-19.25-dist/configure.in emacs-19.25/configure.in
*** emacs-19.25-dist/configure.in	Thu May 26 23:57:54 1994
--- emacs-19.25/configure.in	Fri Jul 22 16:11:32 1994
***************
*** 926,931 ****
--- 926,933 ----
        m68*-sunos1* )	machine=sun1 ;;
        m68*-sunos2* )	machine=sun2 ;;
        m68* )		machine=sun3 ;;
+       i[34]86*-sunos5* | i[34]86*-solaris2* )
+ 			machine=intel386 ;;
        i[34]86* )	machine=sun386 ;;
        sparc* )		machine=sparc ;;
        * )		unported=true ;;
***************
*** 945,950 ****
--- 947,956 ----
  		;;
        *-sunos5.3* | *-solaris2.3* )
  		opsys=sol2-3
+ 		NON_GNU_CPP=/usr/ccs/lib/cpp
+ 		;;
+       *-sunos5.4* | *-solaris2.4* )
+ 		opsys=sol2-4
  		NON_GNU_CPP=/usr/ccs/lib/cpp
  		;;
        *-sunos5* | *-solaris* )
diff -r -c emacs-19.25-dist/lib-src/movemail.c emacs-19.25/lib-src/movemail.c
*** emacs-19.25-dist/lib-src/movemail.c	Wed Apr 13 15:18:44 1994
--- emacs-19.25/lib-src/movemail.c	Fri Jul 22 18:04:46 1994
***************
*** 48,59 ****
   *
   */
  
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/file.h>
  #include <errno.h>
- #define NO_SHORTNAMES   /* Tell config not to load remap.h */
- #include <../src/config.h>
  #include <../src/syswait.h>
  
  #ifdef MSDOS
--- 48,59 ----
   *
   */
  
+ #define NO_SHORTNAMES   /* Tell config not to load remap.h */
+ #include <../src/config.h>
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/file.h>
  #include <errno.h>
  #include <../src/syswait.h>
  
  #ifdef MSDOS
diff -r -c emacs-19.25-dist/src/lread.c emacs-19.25/src/lread.c
*** emacs-19.25-dist/src/lread.c	Sat May 28 07:33:47 1994
--- emacs-19.25/src/lread.c	Fri Jul 22 17:55:12 1994
***************
*** 19,30 ****
  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
  
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/file.h>
  #include <ctype.h>
- #include <config.h>
  #include "lisp.h"
  
  #ifndef standalone
--- 19,30 ----
  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
  
+ #include <config.h>
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/file.h>
  #include <ctype.h>
  #include "lisp.h"
  
  #ifndef standalone
diff -r -c emacs-19.25-dist/src/m/intel386.h emacs-19.25/src/m/intel386.h
*** emacs-19.25-dist/src/m/intel386.h	Sat Jun 12 14:56:52 1993
--- emacs-19.25/src/m/intel386.h	Sat Jul 23 13:00:04 1994
***************
*** 117,123 ****
--- 117,125 ----
  /* This is totally uncalibrated. */
  
  #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
+ #ifndef sun
  #define FSCALE 256.0
+ #endif /* sun */
  #endif
  
  /* Define CANNOT_DUMP on machines where unexec does not work.
***************
*** 134,139 ****
--- 136,146 ----
     numerically.  */
  
  /* #define VIRT_ADDR_VARIES */
+ 
+ #ifdef sun
+ #define VALBITS 26
+ #define GCTYPEBITS 5
+ #endif
  
  #ifdef XENIX
  #define VALBITS 26
--

--
00c