Mercurial > emacs

changeset 108512:e6be93721f96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 12 May 2010 08:11:03 +0000
parents a3051d2aefe7 (current diff) f8e62c2bf3e9 (diff)
children 4e5c3f6510c7
files
diffstat 41 files changed, 373 insertions(+), 558 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 12 02:09:58 2010 +0000
+++ b/ChangeLog	Wed May 12 08:11:03 2010 +0000
@@ -1,3 +1,9 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused.
+
+	* configure.in (LIB_GCC): New output variable.
+
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* make-dist (msdos): No more mainmake.
--- a/configure	Wed May 12 02:09:58 2010 +0000
+++ b/configure	Wed May 12 08:11:03 2010 +0000
@@ -800,7 +800,6 @@
 GNUSTEP_SYSTEM_HEADERS
 GNUSTEP_SYSTEM_LIBRARIES
 GNU_OBJC_CFLAGS
-LIB_SRC_EXTRA_INSTALLABLES
 OTHER_FILES
 XMENU_OBJ
 XOBJ
@@ -815,6 +814,7 @@
 POST_ALLOC_OBJ
 LD_SWITCH_SYSTEM_TEMACS
 LD_SWITCH_SYSTEM_EXTRA
+LIB_GCC
 LTLIBOBJS'
 ac_subst_files=''
 ac_user_opts='
@@ -26354,7 +26354,6 @@
 
 
 
-
 cat >>confdefs.h <<_ACEOF
 #define EMACS_CONFIGURATION "${canonical}"
 _ACEOF
@@ -26568,6 +26567,34 @@
 
 
 
+LIB_GCC=
+if test "x$GCC" = "xyes"; then
+
+  case "$opsys" in
+    ## cygwin: don't link against static libgcc.
+    cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;;
+
+    gnu-*)
+      ## armin76@gentoo.org reported that the lgcc_s flag is necessary to
+      ## build on ARM EABI under GNU/Linux.  (Bug#5518)
+      ## Note that m/arm.h never bothered to undefine LIB_GCC first.
+      if test "$machine" = "arm"; then
+        LIB_GCC="-lgcc_s"
+      else
+        ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then
+        ## immediately undefine it again and redefine it to empty.
+        ## Was the C_SWITCH_X_SITE part really necessary?
+##      LIB_GCC=`$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
+        LIB_GCC=
+      fi
+      ;;
+
+    ## Ask GCC where to find libgcc.a.
+    *) LIB_GCC=`$(CC) -print-libgcc-file-name 2> /dev/null` ;;
+  esac
+fi
+
+
 
 
 
--- a/configure.in	Wed May 12 02:09:58 2010 +0000
+++ b/configure.in	Wed May 12 08:11:03 2010 +0000
@@ -3050,7 +3050,6 @@
 AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
 AC_SUBST(GNU_OBJC_CFLAGS)
-AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
 AC_SUBST(OTHER_FILES)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
@@ -3234,6 +3233,35 @@
 AC_SUBST(LD_SWITCH_SYSTEM_EXTRA)
 
 
+LIB_GCC=
+if test "x$GCC" = "xyes"; then
+
+  case "$opsys" in
+    ## cygwin: don't link against static libgcc.
+    cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;;
+
+    gnu-*)
+      ## armin76@gentoo.org reported that the lgcc_s flag is necessary to
+      ## build on ARM EABI under GNU/Linux.  (Bug#5518)
+      ## Note that m/arm.h never bothered to undefine LIB_GCC first.
+      if test "$machine" = "arm"; then
+        LIB_GCC="-lgcc_s"
+      else
+        ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then
+        ## immediately undefine it again and redefine it to empty.
+        ## Was the C_SWITCH_X_SITE part really necessary?
+##      LIB_GCC=`$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
+        LIB_GCC=
+      fi
+      ;;
+
+    ## Ask GCC where to find libgcc.a.
+    *) LIB_GCC=`$(CC) -print-libgcc-file-name 2> /dev/null` ;;
+  esac
+fi                              dnl if $GCC
+AC_SUBST(LIB_GCC)
+
+
 AH_TOP([/* GNU Emacs site configuration template file.
    Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,
      2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
--- a/lib-src/ChangeLog	Wed May 12 02:09:58 2010 +0000
+++ b/lib-src/ChangeLog	Wed May 12 08:11:03 2010 +0000
@@ -1,3 +1,7 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@.
+
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (.m.o): Remove, there are no .m files.
--- a/lib-src/Makefile.in	Wed May 12 02:09:58 2010 +0000
+++ b/lib-src/Makefile.in	Wed May 12 08:11:03 2010 +0000
@@ -108,7 +108,7 @@
 
 # Things that a user might actually run,
 # which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@
+INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
--- a/msdos/ChangeLog	Wed May 12 02:09:58 2010 +0000
+++ b/msdos/ChangeLog	Wed May 12 08:11:03 2010 +0000
@@ -1,3 +1,9 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@.
+
+	* sed1v2.inp (LIB_GCC): Edit to -Lgcc.
+
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
--- a/msdos/sed1v2.inp	Wed May 12 02:09:58 2010 +0000
+++ b/msdos/sed1v2.inp	Wed May 12 08:11:03 2010 +0000
@@ -51,6 +51,7 @@
 /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
 /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@//
 /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
+/^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/
 /^LIBTIFF *=/s/@LIBTIFF@//
 /^LIBJPEG *=/s/@LIBJPEG@//
 /^LIBPNG *=/s/@LIBPNG@//
--- a/msdos/sed3v2.inp	Wed May 12 02:09:58 2010 +0000
+++ b/msdos/sed3v2.inp	Wed May 12 08:11:03 2010 +0000
@@ -45,7 +45,6 @@
 /^GETOPT_H *=/s!@GETOPT_H@!getopt.h!
 /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o!
 /^INSTALLABLES/s/emacsclient *//
-/^INSTALLABLES/s/ @LIB_SRC_EXTRA_INSTALLABLES@//
 s!^	\./!	!
 /^UTILITIES=/s/ wakeup//
 /^UTILITIES=/s/ movemail//
--- a/src/ChangeLog	Wed May 12 02:09:58 2010 +0000
+++ b/src/ChangeLog	Wed May 12 08:11:03 2010 +0000
@@ -1,3 +1,18 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic.
+	(LINKER_WAS_SPECIFIED): Remove.
+
+	* Makefile.in (LIB_GCC): Set using configure, not cpp.
+	(GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC.
+	* m/arm.h (LIB_GCC) [GNU_LINUX]:
+	* s/cygwin.h (LIB_GCC):
+	* s/freebsd.h (LIB_GCC):
+	* s/gnu-linux.h (LIB_GCC):
+	* s/msdos.h (LIB_GCC):
+	* s/netbsd.h (LIB_GCC):
+	Move to configure.
+
 2010-05-11  Karel Klic  <kklic@redhat.com>
 
 	* ftfont.c: Fix incorrect parentheses of #if condition for
--- a/src/Makefile.in	Wed May 12 02:09:58 2010 +0000
+++ b/src/Makefile.in	Wed May 12 08:11:03 2010 +0000
@@ -1,7 +1,7 @@
 # Makefile for GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
-#               2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#               Free Software Foundation, Inc.
+#   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -91,6 +91,9 @@
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM=@LIBS_SYSTEM@
 
+## Where to find libgcc.a, if using gcc and necessary.
+LIB_GCC=@LIB_GCC@
+
 LIBTIFF=@LIBTIFF@
 LIBJPEG=@LIBJPEG@
 LIBPNG=@LIBPNG@
@@ -257,14 +260,22 @@
 LIBX_OTHER=@LIBX_OTHER@
 #endif /* not HAVE_X_WINDOWS */
 
-#ifndef ORDINARY_LINK
-/* Fix linking if compiled with GCC.  */
-#ifdef __GNUC__
+
+/* A macro which other sections of Makefile can redefine to munge the
+   flags before they are passed to LD.  This is helpful if you have
+   redefined LD to something odd, like "gcc".
+   (The YMF prefix is a holdover from the old name "ymakefile".)  */
+#define YMF_PASS_LDFLAGS(flags) flags
+
 
-#ifdef LINKER
-#define LINKER_WAS_SPECIFIED
-#endif
+#ifdef ORDINARY_LINK
+LD = $(CC)
 
+#else /* not ORDINARY_LINK */
+GNULIB_VAR = $(LIB_GCC)
+
+/* Fix linking if compiled with GCC.  */
+#if defined (__GNUC__) && ! defined (LINKER)
 /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
    places that are difficult to figure out at make time.  Fortunately,
    these same versions allow you to pass arbitrary flags on to the
@@ -273,53 +284,23 @@
    Well, it is not quite perfect.  The "-nostdlib" keeps GCC from
    searching for libraries in its internal directories, so we have to
    ask GCC explicitly where to find libgcc.a.  */
-
-#ifndef LINKER
 #define LINKER $(CC) -nostdlib
-#endif
-
-#ifndef LIB_GCC
-/* Ask GCC where to find libgcc.a.  */
-#define LIB_GCC `$(CC) -print-libgcc-file-name`
-#endif /* not LIB_GCC */
-
-GNULIB_VAR = LIB_GCC
+/* GCC passes any argument prefixed with -Xlinker directly to the linker.
+   See prefix-args.c for an explanation of why we do not do this with the
+   shell''s ``for'' construct.  Note that sane people do not have '.' in
+   their paths, so we must use ./prefix-args.  */
+#undef YMF_PASS_LDFLAGS
+#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
+#endif /* defined (__GNUC__) && ! defined (LINKER) */
 
-#ifndef LINKER_WAS_SPECIFIED
-/* GCC passes any argument prefixed with -Xlinker directly to the
-   linker.  See prefix-args.c for an explanation of why we do not do
-   this with the shell''s ``for'' construct.
-   Note that some people do not have '.'  in their paths, so we must
-   use ./prefix-args.  */
-#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
-#else
-#define YMF_PASS_LDFLAGS(flags) flags
-#endif
-
-#else /* not __GNUC__ */
-GNULIB_VAR =
-
-#endif /* not __GNUC__ */
-#endif /* not ORDINARY_LINK */
-
-#ifdef ORDINARY_LINK
-LD = $(CC)
-#else
 #ifdef LINKER
 LD=LINKER
 #else /* not LINKER */
 LD=ld
 #endif /* not LINKER */
+
 #endif /* not ORDINARY_LINK */
 
-/* A macro which other sections of Makefile can redefine to munge the
-   flags before they are passed to LD.  This is helpful if you have
-   redefined LD to something odd, like "gcc".
-   (The YMF prefix is a holdover from the old name "ymakefile".)
-  */
-#ifndef YMF_PASS_LDFLAGS
-#define YMF_PASS_LDFLAGS(flags) flags
-#endif
 
 #ifdef MSDOS
 #ifdef HAVE_X_WINDOWS
--- a/src/m/alpha.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/alpha.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* Machine description file for the alpha chip.
-   Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 Author: Rainer Schoepf
 (according to authors.el)
@@ -30,7 +31,6 @@
 
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 /* __alpha defined automatically */
 
 
@@ -75,12 +75,10 @@
 #else  /* not __ELF__ */
 
 /* Describe layout of the address space in an executing process.  */
-
 #define TEXT_START    0x120000000
 #define DATA_START    0x140000000
 
 /* The program to be used for unexec. */
-
 #define UNEXEC unexalpha.o
 
 #endif /* __ELF__ */
--- a/src/m/amdx86-64.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/amdx86-64.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file for AMD x86-64.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-     Free Software Foundation, Inc.
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,16 +18,11 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="linux"  */
-
 #define BITS_PER_LONG           64
 #define BITS_PER_EMACS_INT      64
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
@@ -44,15 +40,12 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
--- a/src/m/arm.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/arm.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* Machine description file for ARM-based non-RISCiX machines.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,20 +18,11 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
 #define NO_REMAP
 
-/* armin76@gentoo.org reported that the lgcc_s flag is necessary to
-   build on ARM EABI under GNU/Linux (Bug#5518).  */
-#ifdef GNU_LINUX
-#define LIB_GCC -lgcc_s
-#endif
-
 /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
    (do not change this comment) */
--- a/src/m/hp800.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/hp800.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file for hp9000 series 800 machines.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,14 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
@@ -32,7 +27,6 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Systems with GCC don't need to lose. */
--- a/src/m/ia64.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/ia64.h	Wed May 12 08:11:03 2010 +0000
@@ -1,7 +1,9 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
-     Contributed by David Mosberger <davidm@hpl.hp.com>
+
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
+
+Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of GNU Emacs.
 
@@ -23,15 +25,12 @@
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 /* __ia64__ defined automatically */
 
-
 /* Define the type to use.  */
 #define EMACS_INT		long
 #define EMACS_UINT		unsigned long
@@ -41,15 +40,12 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE		long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 #ifdef __ELF__
--- a/src/m/ibmrs6000.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/ibmrs6000.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -21,7 +22,6 @@
 /* The data segment in this machine always starts at address 0x20000000.
    An address of data cannot be stored correctly in a Lisp object;
    we always lose the high bits.  We must tell XPNTR to add them back.  */
-
 #define TEXT_START 0x10000000
 #define DATA_START 0x20000000
 #define WORDS_BIG_ENDIAN
--- a/src/m/ibms390.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/ibms390.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file template.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ibms390x.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/ibms390x.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file for IBM S390 in 64-bit mode
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-     Free Software Foundation, Inc.
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,7 +21,6 @@
 /* This file was made by copying the significant parts of amdx86-64.h
    into ibms390.h.  */
 
-
 /* Used for machine IBM s390 64 bits with opsys gnu-linux.  */
 #define BITS_PER_LONG 64
 #define BITS_PER_EMACS_INT 64
--- a/src/m/intel386.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/intel386.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* Machine description file for intel 386.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/iris4d.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/iris4d.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,7 +21,6 @@
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
@@ -28,17 +28,13 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 #define TEXT_START 0x400000
 
-/*
- * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
- * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
- * the value field of a LISP_OBJECT).
- */
-
+/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
+   were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
+   the value field of a LISP_OBJECT).  */
 #define DATA_START 0x10000000
 #define DATA_SEG_BITS	0x10000000
 
@@ -48,7 +44,6 @@
 
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short.  */
-
 #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
 
 #define XSET(var, type, ptr) \
--- a/src/m/m68k.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/m68k.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* Machine description file for generic Motorola 68k.
-   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,12 +20,10 @@
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 #ifndef m68k
 #define m68k
 #endif
@@ -34,7 +33,6 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 #ifdef GNU_LINUX
--- a/src/m/macppc.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/macppc.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file For the powerpc Macintosh.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,15 +20,12 @@
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 #if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
@@ -36,7 +34,6 @@
 
 /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed
    For MkLinux/LinuxPPC.  */
-
 #ifdef GNU_LINUX
 #define LINKER $(CC) -nostdlib
 #endif
--- a/src/m/mips.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/mips.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,18 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-This is used on GNU/Linux and netbsd.
-NOTE-END  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #if ! (defined (__MIPSEL__) || defined (MIPSEL) || defined (_MIPSEL))
 #define WORDS_BIG_ENDIAN
 #endif
@@ -38,13 +29,10 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Describe layout of the address space in an executing process.  */
-
 #define TEXT_START      0x00400000
 
 /* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
    (do not change this comment) */
-
--- a/src/m/sparc.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/sparc.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file for Sun 4 SPARC.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/template.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/template.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file template.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,14 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
@@ -36,21 +31,17 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Define CANNOT_DUMP on machines where unexec does not work.
    Then the function dump-emacs will not be defined
    and temacs will do (load "loadup") automatically unless told otherwise.  */
-
 #define CANNOT_DUMP
 
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
@@ -59,31 +50,25 @@
 
    Otherwise Emacs assumes that text space precedes data space,
    numerically.  */
-
 #define VIRT_ADDR_VARIES
 
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section
    when Emacs is dumped.  If you define this, the preloaded Lisp
    code will not be sharable; but that's better than failing completely.  */
-
 #define NO_REMAP
 
 /* Some really obscure 4.2-based systems (like Sequent DYNIX)
- * do not support asynchronous I/O (using SIGIO) on sockets,
- * even though it works fine on tty's.  If you have one of
- * these systems, define the following, and then use it in
- * config.h (or elsewhere) to decide when (not) to use SIGIO.
- *
- * You'd think this would go in an operating-system description file,
- * but since it only occurs on some, but not all, BSD systems, the
- * reasonable place to select for it is in the machine description
- * file.
- */
+   do not support asynchronous I/O (using SIGIO) on sockets,
+   even though it works fine on tty's.  If you have one of
+   these systems, define the following, and then use it in
+   config.h (or elsewhere) to decide when (not) to use SIGIO.
 
+   You'd think this would go in an operating-system description file,
+   but since it only occurs on some, but not all, BSD systems, the
+   reasonable place to select for it is in the machine description file.  */
 #define NO_SOCK_SIGIO
 
-
 /* After adding support for a new system, modify the large case
    statement in the `configure' script to recognize reasonable
    configuration names, and add a description of the system to
--- a/src/m/vax.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/m/vax.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* machine description file for vax.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/aix4-2.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/aix4-2.h	Wed May 12 08:11:03 2010 +0000
@@ -17,68 +17,48 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/*
- *	Define symbols to identify the version of Unix this is.
- *	Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #define USG				/* System III, System V, etc */
 #define USG5
 
-/*      This symbol should be defined on AIX Version 3  ??????? */
+/* This symbol should be defined on AIX Version 3  ??????? */
 #ifndef _AIX
 #define _AIX
 #endif
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
-
 #define SYSTEM_TYPE "aix"
 
 /* In AIX, you allocate a pty by opening /dev/ptc to get the master side.
    To get the name of the slave side, you just ttyname() the master side.  */
-
 #define PTY_ITERATION for (c = 0; !c ; c++)
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc");
 #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd));
 
-/*
- *	Define HAVE_TERMIO if the system provides sysV-style ioctls
- *	for terminal control.
- */
-
+/* Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.  */
 #define HAVE_TERMIOS
 
-/*
- *	Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-
 #define HAVE_SOCKETS
 
 
-/*
- * 	Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
- *	library functions.  Almost, but not quite the same as
- *	the 4.2 functions
- */
-
+/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library
+   functions.  Almost, but not quite the same as the 4.2 functions.  */
 #define SYSV_SYSTEM_DIR
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 
 /* The file containing the kernel's symbol table is called /unix.  */
-
 #define KERNEL_FILE "/unix"
 
-/* The symbol in the kernel where the load average is found
-   is named avenrun.  */
-
+/* The kernel symbol where the load average is found is named avenrun.  */
 #define LDAV_SYMBOL "avenrun"
 
 /* Special itemss needed to make Emacs run on this system.  */
@@ -125,8 +105,7 @@
    that shared library.
 
    Emacs currently calls xrealloc on the results of get_current_dir name,
-   to avoid a crash just use the Emacs implementation for that function.
-*/
+   to avoid a crash just use the Emacs implementation for that function.  */
 #define BROKEN_GET_CURRENT_DIR_NAME 1
 
 #define UNEXEC unexaix.o
--- a/src/s/bsd-common.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/bsd-common.h	Wed May 12 08:11:03 2010 +0000
@@ -19,8 +19,8 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/*      Define symbols to identify the version of Unix this is.
- *	Define all the symbols that apply correctly.   */
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.   */
 
 /* We give these symbols the numeric values found in <sys/param.h> to
    avoid warnings about redefined macros.  */
@@ -84,8 +84,7 @@
 /* The file containing the kernel's symbol table is called /vmunix.  */
 #define KERNEL_FILE "/vmunix"
 
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  */
+/* The kernel symbol where the load average is found is named _avenrun.  */
 #define LDAV_SYMBOL "_avenrun"
 
 /* Send signals to subprocesses by "typing" special chars at them.  */
--- a/src/s/cygwin.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/cygwin.h	Wed May 12 08:11:03 2010 +0000
@@ -1,6 +1,7 @@
 /* System description header file for Cygwin.
-   Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,7 +20,6 @@
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
-
 #define SYSTEM_TYPE "cygwin"
 
 /* Emacs can read input using SIGIO and buffering characters itself,
@@ -43,26 +43,19 @@
    It would have Emacs fork off a separate process
    to read the input and send it to the true Emacs process
    through a pipe. */
-
 #undef INTERRUPT_INPUT
 
-/*
- *	Define HAVE_TERMIOS if the system provides POSIX-style
- *	functions and macros for terminal control.
- *
- *	Define HAVE_TERMIO if the system provides sysV-style ioctls
- *	for terminal control.
- *
- *	Do not define both.  HAVE_TERMIOS is preferred, if it is
- *	supported on your system.
- */
+/* Define HAVE_TERMIOS if the system provides POSIX-style
+   functions and macros for terminal control.
 
+   Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.
+
+   Do not define both.  HAVE_TERMIOS is preferred, if it is
+   supported on your system.  */
 #define HAVE_TERMIOS
 
-/*
- *	Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 #define PTY_ITERATION		for (i = 0; i < 1; i++) /* ick */
 #define PTY_NAME_SPRINTF	/* none */
@@ -81,13 +74,11 @@
   while (0)
 
 /* Define this symbol if your system has the functions bcopy, etc. */
-
 #define BSTRING
 
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* If the system's imake configuration file defines `NeedWidePrototypes'
@@ -95,10 +86,9 @@
    generated in the Makefile generated by `xmkmf'.  If we don't
    define NARROWPROTO, we will see the wrong function prototypes
    for X functions taking float or double parameters.  */
-
 #define NARROWPROTO 1
 
-/* used in various places to enable cygwin-specific code changes */
+/* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
@@ -127,10 +117,5 @@
    returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
 #define G_SLICE_ALWAYS_MALLOC
 
-/* Don't link against static libgcc */
-#define LIB_GCC
-
-/* the end */
-
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
    (do not change this comment) */
--- a/src/s/darwin.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/darwin.h	Wed May 12 08:11:03 2010 +0000
@@ -19,9 +19,8 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/*	Define symbols to identify the version of Unix this is.
- *	Define all the symbols that apply correctly.  */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #define BSD4_2
 /* BSD4_3 and BSD4_4 are already defined in sys/param.h */
 #define BSD_SYSTEM
@@ -29,12 +28,12 @@
 /* More specific than the above two.  We cannot use __APPLE__ as this
    may not be defined on non-OSX Darwin, and we cannot define DARWIN
    here because Panther and lower CoreFoundation.h uses DARWIN to
-   distinguish OS X from pure Darwin. */
+   distinguish OS X from pure Darwin.  */
 #define DARWIN_OS
 
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "darwin"
 
 /* Emacs can read input using SIGIO and buffering characters itself,
@@ -64,26 +63,21 @@
   if system supports pty's.  'a' means it is /dev/ptya0  */
 #define FIRST_PTY_LETTER 'p'
 
-/*
- *	Define HAVE_TERMIOS if the system provides POSIX-style
- *	functions and macros for terminal control.
- *
- *	Define HAVE_TERMIO if the system provides sysV-style ioctls
- *	for terminal control.
- *
- *	Do not define both.  HAVE_TERMIOS is preferred, if it is
- *	supported on your system.
- */
+/* Define HAVE_TERMIOS if the system provides POSIX-style
+   functions and macros for terminal control.
+
+   Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.
+
+   Do not define both.  HAVE_TERMIOS is preferred, if it is supported
+   on your system. */
 #define HAVE_TERMIOS
 #define NO_TERMIO
 
-/*
- *	Define HAVE_PTYS if the system supports pty devices.
- *      Note: PTYs are broken on darwin <6.  Use at your own risk.
- */
+/* Define HAVE_PTYS if the system supports pty devices.
+   Note: PTYs are broken on darwin <6.  Use at your own risk.  */
 #define HAVE_PTYS
-/* Run only once.  We need a `for'-loop because the code uses
-   `continue'.  */
+/* Run only once.  We need a `for'-loop because the code uses `continue'.  */
 #define PTY_ITERATION	for (i = 0; i < 1; i++)
 #define PTY_NAME_SPRINTF	/* none */
 #define PTY_TTY_NAME_SPRINTF	/* none */
@@ -101,11 +95,8 @@
     }								\
   while (0)
 
-/**
- * PTYs only work correctly on Darwin 7 or higher.  So make the
- * default for process-connection-type dependent on the kernel
- * version.
- */
+/* PTYs only work correctly on Darwin 7 or higher.  So make the default
+   for process-connection-type dependent on the kernel version.  */
 #define MIN_PTY_KERNEL_VERSION '7'
 
 /* Define this symbol if your system has the functions bcopy, etc. */
@@ -123,12 +114,10 @@
 /* Used in dispnew.c.  Copied from freebsd.h. */
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-/* System uses OXTABS instead of the expected TAB3.  (Copied from
-   bsd386.h.)  */
+/* System uses OXTABS instead of the expected TAB3.  (Copied from bsd386.h.)  */
 #define TAB3 OXTABS
 
-/* Darwin ld insists on the use of malloc routines in the System
-   framework.  */
+/* Darwin ld insists on the use of malloc routines in the System framework.  */
 #define SYSTEM_MALLOC
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
@@ -154,8 +143,7 @@
 #define malloc unexec_malloc
 #define realloc unexec_realloc
 #define free unexec_free
-/* Don't use posix_memalign because it is not compatible with
-   unexmacosx.c.  */
+/* Don't use posix_memalign because it is not compatible with unexmacosx.c.  */
 #undef HAVE_POSIX_MEMALIGN
 #endif
 
@@ -183,8 +171,7 @@
    ioctl TIOCSCTTY.  */
 #define DONT_REOPEN_PTY
 
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
-   stack.  */
+/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
 /* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41
--- a/src/s/freebsd.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/freebsd.h	Wed May 12 08:11:03 2010 +0000
@@ -30,13 +30,10 @@
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-#undef LIB_GCC
-#define LIB_GCC
-
 #define HAVE_GETLOADAVG 1
 #define DECLARE_GETPWUID_WITH_UID_T
 
-/* this silences a few compilation warnings */
+/* This silences a few compilation warnings.  */
 #undef BSD_SYSTEM
 #if __FreeBSD__ == 1
 #define BSD_SYSTEM 199103
@@ -64,23 +61,17 @@
    successfully after processing (for example with CRs added if the
    terminal is set up that way which it is here).  The same bytes will
    be seen again in a later read(2), without the CRs.  */
-
 #define BROKEN_PTY_READ_AFTER_EAGAIN 1
 
 /* Tell that garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
-
+   registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
 
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
-   stack.  */
-
+/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
 #define GC_MARK_STACK 	GC_MAKE_GCPROS_NOOPS
 
 /* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate
    buffer text.  This overrides REL_ALLOC.  */
-
 #define USE_MMAP_FOR_BUFFERS	1
 
 /* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb
--- a/src/s/gnu-linux.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/gnu-linux.h	Wed May 12 08:11:03 2010 +0000
@@ -3,6 +3,8 @@
 Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
+This file was put together by Michael K. Johnson and Rik Faith.
+
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
@@ -18,20 +20,13 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* This file was put together by Michael K. Johnson and Rik Faith.  */
-
-
-/*
- *	Define symbols to identify the version of Unix this is.
- *	Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #define USG
 #define GNU_LINUX
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "gnu/linux"		/* All the best software is free. */
 
 #ifndef NOT_C_CODE
@@ -50,9 +45,7 @@
 #if defined HAVE_GRANTPT
 #define UNIX98_PTYS
 
-/* Run only once.  We need a `for'-loop because the code uses
-   `continue'.  */
-
+/* Run only once.  We need a `for'-loop because the code uses `continue'.  */
 #define PTY_ITERATION	for (i = 0; i < 1; i++)
 
 #ifdef HAVE_GETPT
@@ -64,7 +57,6 @@
 
 /* Note that grantpt and unlockpt may fork.  We must block SIGCHLD to
    prevent sigchld_handler from intercepting the child's death.  */
-
 #define PTY_TTY_NAME_SPRINTF				\
   {							\
     char *ptyname;					\
@@ -86,23 +78,20 @@
 
 /* Letter to use in finding device name of first pty,
    if system supports pty's.  'p' means it is /dev/ptyp0  */
-
 #define FIRST_PTY_LETTER 'p'
 
 #endif  /* not HAVE_GRANTPT */
 
 /*  Define HAVE_TERMIOS if the system provides POSIX-style
     functions and macros for terminal control.  */
-
 #define HAVE_TERMIOS
 
-/* Define HAVE_PTYS if the system supports pty devices. */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
 #define HAVE_SOCKETS
 
-/* Define this symbol if your system has the functions bcopy, etc. */
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 
 /* This is used in list_system_processes.  */
@@ -121,28 +110,24 @@
    your system and must be used only through an encapsulation
    (Which you should place, by convention, in sysdep.c).  */
 
-/* This is needed for dispnew.c:update_frame */
-
+/* This is needed for dispnew.c:update_frame.  */
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
 #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
-/* new C libio names */
+/* New C libio names.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
 #elif defined (__UCLIBC__)
-/* using the uClibc library */
+/* Using the uClibc library.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->__bufpos - (FILE)->__bufstart)
 #else /* !_IO_STDIO_H && ! __UCLIBC__ */
-/* old C++ iostream names */
+/* Old C++ iostream names.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_pptr - (FILE)->_pbase)
 #endif /* !_IO_STDIO_H && ! __UCLIBC__ */
 #endif /* emacs */
 
-/* Ask GCC where to find libgcc.a.  */
-#define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
-
 #ifdef emacs
 #define INTERRUPT_INPUT
 #endif
@@ -151,9 +136,6 @@
 
 #define POSIX                 /* affects getpagesize.h and systty.h */
 
-#undef LIB_GCC
-#define LIB_GCC
-
 #define UNEXEC unexelf.o
 
 /* This is to work around mysterious gcc failures in some system versions.
@@ -171,8 +153,7 @@
 #endif
 
 /* Tell that garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
+   registers relevant for conservative garbage collection in the jmp_buf.  */
 /* Not all the architectures are tested, but there are Debian packages
    for SCM and/or Guile on them, so the technique must work.  See also
    comments in alloc.c concerning setjmp and gcc.  Fixme:  it's
@@ -180,7 +161,6 @@
    register window-flushing.  */
 /* Don't use #cpu here since in newest development versions of GCC,
    we must call cpp with -traditional, and that disables #cpu.  */
-
 #if defined __i386__ || defined __sparc__ || defined __mc68000__ \
     || defined __alpha__ || defined __mips__ || defined __s390__ \
     || defined __arm__ || defined __powerpc__ || defined __amd64__ \
--- a/src/s/hpux10-20.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/hpux10-20.h	Wed May 12 08:11:03 2010 +0000
@@ -21,56 +21,39 @@
 
 #define RUN_TIME_REMAP
 
-/*
- *	Define symbols to identify the version of Unix this is.
- *	Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #define USG				/* System III, System V, etc */
-
 #define USG5
-
 #define HPUX
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "hpux"
 
 /* Letter to use in finding device name of first pty,
-  if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
-
+   if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
 #define FIRST_PTY_LETTER 'p'
 
-/*
- *	Define HAVE_TERMIO if the system provides sysV-style ioctls
- *	for terminal control.
- */
-
+/* Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.  */
 #define HAVE_TERMIO
 
-/*
- *	Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-
 #define HAVE_SOCKETS
 
 /* Define this symbol if your system has the functions bcopy, etc.
- * s800 and later versions of s300 (s200) kernels have equivalents
- * of the BSTRING functions of BSD.  If your s200 kernel doesn't have
- * em comment out this section.
- */
-
+   s800 and later versions of s300 (s200) kernels have equivalents
+   of the BSTRING functions of BSD.  If your s200 kernel doesn't have
+   em comment out this section.  */
 #define BSTRING
 
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* The symbol in the kernel where the load average is found
@@ -80,11 +63,9 @@
 
 /* In hpux, the symbol SIGIO is defined, but the feature
    doesn't work in the way Emacs needs it to.  */
-
 #define BROKEN_SIGIO
 
 /* Some additional system facilities exist.  */
-
 #define HAVE_PERROR  /* Delete this line for version 6.  */
 
 #define UNEXEC unexhp9k800.o
@@ -112,7 +93,7 @@
    version number A.09.05.
 
    You can fix the math library by installing patch number PHSS_4630.
-   But we can fix it more reliably for Emacs like this. */
+   But we can fix it more reliably for Emacs like this.  */
 #undef HAVE_RINT
 
 /* We have to go this route, rather than hpux9's approach of renaming the
@@ -129,8 +110,7 @@
 
 
 /* Rainer Malzbender <rainer@displaytech.com> says definining
-   HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20
-   using GCC.  */
+   HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC.  */
 #ifndef HAVE_XRMSETDATABASE
 #define HAVE_XRMSETDATABASE
 #endif
@@ -145,7 +125,6 @@
    to change the boundary between the text section and data section
    when Emacs is dumped.  If you define this, the preloaded Lisp
    code will not be sharable; but that's better than failing completely.  */
-
 #define NO_REMAP
 
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
@@ -154,35 +133,29 @@
 
    Otherwise Emacs assumes that text space precedes data space,
    numerically.  */
-
 #define VIRT_ADDR_VARIES
 
-/* the data segment on this machine always starts at address 0x40000000. */
-
+/* The data segment on this machine always starts at address 0x40000000.  */
 #define DATA_SEG_BITS 0x40000000
 
 #define DATA_START    0x40000000
 #define TEXT_START    0x00000000
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE double
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) ((int) (x * 100.0))
 
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
+/* The kernel symbol where the load average is found is named _avenrun.
+   At this time there are two major flavors of hp-ux (there is the s800
+   and s300 (s200) flavors).  The differences are thusly moved to the
+   corresponding machine description file.  */
 
-/* no underscore please */
+/* No underscore please.  */
 #define LDAV_SYMBOL "avenrun"
 
-/* On USG systems these have different names. */
-
+/* On USG systems these have different names.  */
 #define index strchr
 #define rindex strrchr
 
--- a/src/s/irix6-5.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/irix6-5.h	Wed May 12 08:11:03 2010 +0000
@@ -41,7 +41,7 @@
 #define SIGNALS_VIA_CHARACTERS
 
 /* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
+   if system supports pty's.  'a' means it is /dev/ptya0  */
 #undef FIRST_PTY_LETTER
 #define FIRST_PTY_LETTER 'q'
 
--- a/src/s/ms-w32.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/ms-w32.h	Wed May 12 08:11:03 2010 +0000
@@ -18,10 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 
 #ifndef WINDOWSNT
 #define WINDOWSNT
@@ -31,63 +29,53 @@
 #endif
 
 /* If you are compiling with a non-C calling convention but need to
-   declare vararg routines differently, put it here */
+   declare vararg routines differently, put it here.  */
 #define _VARARGS_ __cdecl
 
 /* If you are providing a function to something that will call the
    function back (like a signal handler and signal, or main) its calling
-   convention must be whatever standard the libraries expect */
+   convention must be whatever standard the libraries expect.  */
 #define _CALLBACK_ __cdecl
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "windows-nt"
 #define SYMS_SYSTEM syms_of_ntterm ()
 
 #define NO_MATHERR 1
 
 /* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
-
+   if system supports pty's.  'a' means it is /dev/ptya0  */
 #define FIRST_PTY_LETTER 'a'
 
-/*
- *      Define HAVE_TIMEVAL if the system supports the BSD style clock values.
- *      Look in <sys/time.h> for a timeval structure.
- */
-
+/* Define HAVE_TIMEVAL if the system supports the BSD style clock values.
+   Look in <sys/time.h> for a timeval structure.  */
 #define HAVE_TIMEVAL 1
 
-/* NT supports Winsock which is close enough (with some hacks) */
-
+/* NT supports Winsock which is close enough (with some hacks).  */
 #define HAVE_SOCKETS 1
 
 /* But our select implementation doesn't allow us to make non-blocking
    connects.  So until that is fixed, this is necessary:  */
-
 #define BROKEN_NON_BLOCKING_CONNECT 1
 
 /* And the select implementation does 1-byte read-ahead waiting
    for received packets, so datagrams are broken too.  */
-
 #define BROKEN_DATAGRAM_SOCKETS 1
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 #define bzero(b, l) memset(b, 0, l)
 #define bcopy(s, d, l) memmove(d, s, l)
 #define bcmp(a, b, l) memcmp(a, b, l)
 
-/* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe */
+/* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe.  */
 #define GAP_USE_BCOPY 1
 #define BCOPY_UPWARD_SAFE 1
 #define BCOPY_DOWNWARD_SAFE 1
 
 /* If your system uses COFF (Common Object File Format) then define the
-   preprocessor symbol "COFF". */
-
+   preprocessor symbol "COFF".  */
 #define COFF 1
 
 #define MAIL_USE_POP 1
@@ -101,17 +89,16 @@
 
 /* ============================================================ */
 
-/* Here, add any special hacks needed
-   to make Emacs work on this system.  For example,
-   you might define certain system call names that don't
-   exist on your system, or that do different things on
-   your system and must be used only through an encapsulation
-   (Which you should place, by convention, in sysdep.c).  */
+/* Here, add any special hacks needed to make Emacs work on this
+   system.  For example, you might define certain system call names
+   that don't exist on your system, or that do different things on
+   your system and must be used only through an encapsulation (which
+   you should place, by convention, in sysdep.c).  */
 
-/* Define this to be the separator between path elements */
+/* Define this to be the separator between path elements.  */
 #define DIRECTORY_SEP XINT (Vdirectory_sep_char)
 
-/* Define this to be the separator between devices and paths */
+/* Define this to be the separator between devices and paths.  */
 #define DEVICE_SEP ':'
 
 /* We'll support either convention on NT.  */
@@ -128,7 +115,7 @@
 #define SIG_SETMASK     2
 #define SIG_UNBLOCK     3
 
-/* The null device on Windows NT. */
+/* The null device on Windows NT.  */
 #define NULL_DEVICE     "NUL:"
 
 #ifndef MAXPATHLEN
@@ -218,11 +205,11 @@
 
 #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B")
 
-/* get some redefinitions in place */
+/* Get some redefinitions in place.  */
 
 #ifdef emacs
 
-/* calls that are emulated or shadowed */
+/* Calls that are emulated or shadowed.  */
 #undef access
 #define access  sys_access
 #undef chdir
@@ -259,17 +246,17 @@
 #undef write
 #define write   sys_write
 
-/* subprocess calls that are emulated */
+/* Subprocess calls that are emulated.  */
 #define spawnve sys_spawnve
 #define wait    sys_wait
 #define kill    sys_kill
 #define signal  sys_signal
 
-/* termcap.c calls that are emulated */
+/* termcap.c calls that are emulated.  */
 #define tputs   sys_tputs
 #define tgetstr sys_tgetstr
 
-/* cm.c calls that are emulated */
+/* cm.c calls that are emulated.  */
 #define chcheckmagic sys_chcheckmagic
 #define cmcostinit   sys_cmcostinit
 #define cmgoto       sys_cmgoto
@@ -278,7 +265,7 @@
 
 #endif /* emacs */
 
-/* map to MSVC names */
+/* Map to MSVC names.  */
 #define execlp    _execlp
 #define execvp    _execvp
 #define fdopen	  _fdopen
@@ -312,8 +299,8 @@
 #define utime	  _utime
 #endif
 
-/* this is hacky, but is necessary to avoid warnings about macro
-   redefinitions using the SDK compilers */
+/* This is hacky, but is necessary to avoid warnings about macro
+   redefinitions using the SDK compilers.  */
 #ifndef __STDC__
 #define __STDC__ 1
 #define MUST_UNDEF__STDC__
@@ -326,7 +313,7 @@
 #undef MUST_UNDEF__STDC__
 #endif
 
-/* Defines that we need that aren't in the standard signal.h  */
+/* Defines that we need that aren't in the standard signal.h.  */
 #define SIGHUP  1               /* Hang up */
 #define SIGQUIT 3               /* Quit process */
 #define SIGTRAP 5               /* Trace trap */
@@ -369,8 +356,7 @@
 
 #include <sys/stat.h>
 
-/* Define for those source files that do not include enough NT
-   system files.  */
+/* Define for those source files that do not include enough NT system files.  */
 #ifndef NULL
 #ifdef __cplusplus
 #define NULL	0
@@ -405,7 +391,7 @@
    removed.  Also, obviously, all files that define initialized data
    must include config.h to pick up this pragma.  */
 
-/* Names must be < 8 bytes */
+/* Names must be < 8 bytes.  */
 #ifdef _MSC_VER
 #pragma data_seg("EMDATA")
 #pragma bss_seg("EMBSS")
--- a/src/s/msdos.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/msdos.h	Wed May 12 08:11:03 2010 +0000
@@ -21,11 +21,8 @@
 /* Note: lots of stuff here was taken from s-msdos.h in demacs. */
 
 
-/*
- *	Define symbols to identify the version of Unix this is.
- *	Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #ifndef MSDOS
 #define MSDOS
 #endif
@@ -38,40 +35,34 @@
 #undef BSD_SYSTEM
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "ms-dos"
 
 #define SYMS_SYSTEM syms_of_dosfns();syms_of_msdos();syms_of_win16select()
 
 #define SYSV_SYSTEM_DIR
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 
 /* Define this is the compiler understands `volatile'.  */
 #define HAVE_VOLATILE
 
 
-/* subprocesses should be defined if you want to
-   have code for asynchronous subprocesses
-   (as used in M-x compile and M-x shell).
+/* subprocesses should be defined if you want to have code for
+   asynchronous subprocesses (as used in M-x compile and M-x shell).
    This is the only system that needs this.  */
-
 #undef subprocesses
 
 /* If your system uses COFF (Common Object File Format) then define the
-   preprocessor symbol "COFF". */
-
+   preprocessor symbol "COFF".  */
 #define COFF
 
-/* Here, on a separate page, add any special hacks needed
-   to make Emacs work on this system.  For example,
-   you might define certain system call names that don't
-   exist on your system, or that do different things on
-   your system and must be used only through an encapsulation
-   (Which you should place, by convention, in sysdep.c).  */
+/* Here, on a separate page, add any special hacks needed to make
+   Emacs work on this system.  For example, you might define certain
+   system call names that don't exist on your system, or that do
+   different things on your system and must be used only through an
+   encapsulation (which you should place, by convention, in sysdep.c).  */
 
 /* Avoid incompatibilities between gmalloc.c and system header files
    in how to declare valloc.  */
@@ -83,7 +74,6 @@
 
 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
    but they will run slower.  */
-
 #define _setjmp setjmp
 #define _longjmp longjmp
 
@@ -95,7 +85,6 @@
 #define ORDINARY_LINK
 
 /* command.com does not understand `...` so we define this.  */
-#define LIB_GCC -Lgcc
 #define SEPCHAR ';'
 
 #define NULL_DEVICE "nul"
@@ -110,17 +99,17 @@
 :AB=<BG %d>:AF=<FG %d>:op=<DefC>:"
 
 /* Define this to a function (Fdowncase, Fupcase) if your file system
-   likes that */
+   likes that.  */
 #define FILE_SYSTEM_CASE Fmsdos_downcase_filename
 
-/* Define this to be the separator between devices and paths */
+/* Define this to be the separator between devices and paths.  */
 #define DEVICE_SEP ':'
 
 /* We'll support either convention on MSDOG.  */
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\')
 #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))
 
-/* bcopy under djgpp is quite safe */
+/* bcopy under djgpp is quite safe.  */
 #define GAP_USE_BCOPY
 #define BCOPY_UPWARD_SAFE 1
 #define BCOPY_DOWNWARD_SAFE 1
@@ -154,9 +143,7 @@
 #endif
 
 /* Tell the garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
-
+   registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
--- a/src/s/netbsd.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/netbsd.h	Wed May 12 08:11:03 2010 +0000
@@ -19,23 +19,19 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* Get most of the stuff from bsd-common */
+/* Get most of the stuff from bsd-common.  */
 #include "bsd-common.h"
 
 #define HAVE_GETLOADAVG 1
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-#undef LIB_GCC
-#define LIB_GCC
-
 #define AMPERSAND_FULL_NAME
 
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
    the library search parth, i.e. it won't search /usr/lib
-   for libc and friends. Using -nostartfiles instead avoids
-   this problem, and will also work on earlier NetBSD releases */
-
+   for libc and friends.  Using -nostartfiles instead avoids
+   this problem, and will also work on earlier NetBSD releases.  */
 #define LINKER $(CC) -nostartfiles
 
 #define DEFAULT_SOUND_DEVICE "/dev/audio"
@@ -43,7 +39,6 @@
 /* Greg A. Woods <woods@weird.com> says we must include signal.h
    before syssignal.h is included, to work around interface conflicts
    that are handled with CPP __RENAME() macro in signal.h.  */
-
 #ifndef NOT_C_CODE
 #include <signal.h>
 #endif
@@ -51,17 +46,13 @@
 /* Don't close pty in process.c to make it as controlling terminal.
    It is already a controlling terminal of subprocess, because we did
    ioctl TIOCSCTTY.  */
-
 #define DONT_REOPEN_PTY
 
 /* Tell that garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
-
+   registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
 
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method.  */
-
 #define GC_MARK_STACK	GC_MAKE_GCPROS_NOOPS
 
 /* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
--- a/src/s/sol2-10.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/sol2-10.h	Wed May 12 08:11:03 2010 +0000
@@ -4,20 +4,18 @@
 
 #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.
- */
+/* 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
 
--- a/src/s/template.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/template.h	Wed May 12 08:11:03 2010 +0000
@@ -21,10 +21,8 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/*
- *	Define symbols to identify the version of Unix this is.
- *	Define all the symbols that apply correctly.
- */
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 
 /* #define USG5 */
 /* #define USG */
@@ -34,7 +32,7 @@
 /* #define BSD_SYSTEM */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
+   It sets the Lisp variable system-type.  */
 
 #define SYSTEM_TYPE "berkeley-unix"
 
@@ -58,55 +56,46 @@
    Another method of doing input is planned but not implemented.
    It would have Emacs fork off a separate process
    to read the input and send it to the true Emacs process
-   through a pipe. */
-
+   through a pipe.  */
 #define INTERRUPT_INPUT
 
 /* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
-
+   if system supports pty's.  'a' means it is /dev/ptya0.  */
 #define FIRST_PTY_LETTER 'a'
 
-/*
- *	Define HAVE_TERMIOS if the system provides POSIX-style
- *	functions and macros for terminal control.
- *
- *	Define HAVE_TERMIO if the system provides sysV-style ioctls
- *	for terminal control.
- *
- *	Do not define both.  HAVE_TERMIOS is preferred, if it is
- *	supported on your system.
- */
+/* Define HAVE_TERMIOS if the system provides POSIX-style
+   functions and macros for terminal control.
+
+   Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.
+
+   Do not define both.  HAVE_TERMIOS is preferred, if it is
+   supported on your system.  */
 
 #define HAVE_TERMIOS
 /* #define HAVE_TERMIO */
 
-/*
- *	Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 
 /* subprocesses should be undefined if you do NOT want to
    have code for asynchronous subprocesses
    (as used in M-x compile and M-x shell).
-   Currently only MSDOS does not support this. */
+   Currently only MSDOS does not support this.  */
 
 /* #undef subprocesses */
 
 /* If your system uses COFF (Common Object File Format) then define the
-   preprocessor symbol "COFF". */
+   preprocessor symbol "COFF".  */
 
 /* #define COFF */
 
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* Define this if your operating system declares signal handlers to
@@ -127,12 +116,11 @@
 
 /* ============================================================ */
 
-/* Here, add any special hacks needed
-   to make Emacs work on this system.  For example,
-   you might define certain system call names that don't
-   exist on your system, or that do different things on
-   your system and must be used only through an encapsulation
-   (Which you should place, by convention, in sysdep.c).  */
+/* Here, add any special hacks needed to make Emacs work on this
+   system.  For example, you might define certain system call names
+   that don't exist on your system, or that do different things on
+   your system and must be used only through an encapsulation (which
+   you should place, by convention, in sysdep.c).  */
 
 /* If the system's imake configuration file defines `NeedWidePrototypes'
    as `NO', we must define NARROWPROTO manually.  Such a define is
--- a/src/s/unixware.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/unixware.h	Wed May 12 08:11:03 2010 +0000
@@ -35,8 +35,7 @@
 /* This sets the name of the slave side of the PTY.  On SysVr4,
    grantpt(3) forks a subprocess, so keep sigchld_handler() from
    intercepting that death.  If any child but grantpt's should die
-   within, it should be caught after sigrelse(2). */
-
+   within, it should be caught after sigrelse(2).  */
 #define PTY_TTY_NAME_SPRINTF			\
   {						\
     char *ptsname(), *ptyname;			\
@@ -54,12 +53,10 @@
   }
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
 /* This is totally uncalibrated. */
-
 #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
 #define FSCALE 256.0
 
--- a/src/s/usg5-4.h	Wed May 12 02:09:58 2010 +0000
+++ b/src/s/usg5-4.h	Wed May 12 08:11:03 2010 +0000
@@ -3,6 +3,9 @@
 Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
+Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org.
+Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>.
+
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
@@ -18,57 +21,36 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* This file written by James Van Artsdalen of Dell Computer Corporation.
- * james@bigtex.cactus.org.  Subsequently improved for Dell 2.2 by Eric
- * S. Raymond <esr@snark.thyrsus.com>.
- */
-
-/* Use the SysVr3 file for at least base configuration. */
-
+/* Use the SysVr3 file for at least base configuration.  */
 #define USG				/* System III, System V, etc */
 
 #define USG5
 #define USG5_4
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "usg-unix-v"
 
-/*
- *	Define HAVE_TERMIO if the system provides sysV-style ioctls
- *	for terminal control.
- */
-
+/* Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.  */
 #define HAVE_TERMIO
 
-/*
- *	Define HAVE_PTYS if the system supports pty devices.
- */
-
-/*
- * 	Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
- *	library functions.  Almost, but not quite the same as
- *	the 4.2 functions
- */
+/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library
+   functions. Almost, but not quite the same as the 4.2 functions.  */
 #define SYSV_SYSTEM_DIR
 
 /* The file containing the kernel's symbol table is called /unix.  */
-
 #define KERNEL_FILE "/unix"
 
-/* The symbol in the kernel where the load average is found
-   is named avenrun.  */
-
+/* The kernel symbol where the load average is found is named avenrun.  */
 #define LDAV_SYMBOL "avenrun"
 
 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
    but they will run slower.  */
-
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems these have different names */
+/* On USG systems these have different names.  */
 #ifndef HAVE_INDEX
 #define index strchr
 #endif /* ! defined (HAVE_INDEX) */
@@ -76,35 +58,27 @@
 #define rindex strrchr
 #endif /* ! defined (HAVE_RINDEX) */
 
-
-/* The docs for system V/386 suggest v.3 has sigpause,
-   so let's give it a try.  */
+/* The docs for system V/386 suggest v.3 has sigpause, so let's try it.  */
 #define HAVE_SYSV_SIGPAUSE
 
-
-/* If we're using the System V X port, BSD bstring functions will be handy */
-
+/* If we're using the System V X port, BSD bstring functions will be handy.  */
 #ifdef HAVE_X_WINDOWS
 #define BSTRING
 #endif /* HAVE_X_WINDOWS */
 
-/* On USG systems signal handlers return void */
-
+/* On USG systems signal handlers return void.  */
 #define SIGTYPE void
 
 #define ORDINARY_LINK
 
-/* Undump with ELF */
-
+/* Undump with ELF.  */
 #undef COFF
 
 #define UNEXEC unexelf.o
 
-/* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct
- * tchars. But get <termio.h> first to make sure ttold.h doesn't
- * interfere.  And don't try to use SIGIO yet.
- */
-
+/* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct tchars.
+   But get <termio.h> first to make sure ttold.h doesn't interfere.
+   And don't try to use SIGIO yet.  */
 #ifndef NOT_C_CODE
 #include <sys/wait.h>
 #endif
@@ -121,15 +95,14 @@
 #endif
 
 /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
- * instead, there's a system variable _sys_nsig.  Unfortunately, we need the
- * constant to dimension an array.  So wire in the appropriate value here.
- */
+   instead, there's a system variable _sys_nsig.  Unfortunately, we need the
+   constant to dimension an array.  So wire in the appropriate value here.  */
 #define NSIG_MINIMUM 32
 
-/* We can support this */
-
+/* We can support this.  */
 #define CLASH_DETECTION
 
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 #define HAVE_TERMIOS
 
@@ -137,7 +110,6 @@
    waiting, because a previous waitsys(2) cleaned up the carcass of child
    without clearing the SIGCHLD pending info.  So, use a non-blocking
    wait3 instead, which maps to waitpid(2) in SysVr4. */
-
 #define wait3(status, options, rusage) \
   waitpid ((pid_t) -1, (status), (options))
 #define WRETCODE(w) (w >> 8)
@@ -145,20 +117,16 @@
 /* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY
    subprocesses the usual way.  But TIOCSIGNAL does work for PTYs, and
    this is all we need.  */
-
 #define TIOCSIGSEND TIOCSIGNAL
 
 /* This change means that we don't loop through allocate_pty too many
-   times in the (rare) event of a failure. */
-
+   times in the (rare) event of a failure.  */
 #define FIRST_PTY_LETTER 'z'
 
-/* This sets the name of the master side of the PTY. */
-
+/* This sets the name of the master side of the PTY.  */
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");
 
-/* Push various streams modules onto a PTY channel. */
-
+/* Push various streams modules onto a PTY channel.  */
 #define SETUP_SLAVE_PTY \
   if (ioctl (xforkin, I_PUSH, "ptem") == -1)	\
     fatal ("ioctl I_PUSH ptem", errno);		\
@@ -167,8 +135,7 @@
   if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
     fatal ("ioctl I_PUSH ttcompat", errno);
 
-/* This definition was suggested for next release.
-   So give it a try.  */
+/* This definition was suggested for next release.  So give it a try.  */
 #define HAVE_SOCKETS
 
 /* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6