From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 12 Feb 2011 10:08:19 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~794^2~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64640ce2d31c153698c501e9385e3d5397181de9;p=emacs.git

Merge from mainline.
---

64640ce2d31c153698c501e9385e3d5397181de9
diff --cc src/ChangeLog
index 617bd23ab78,735f73b3544..43ca62aedfc
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,31 -1,9 +1,35 @@@
 +2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Remove no-longer needed getloadavg symbols.
 +	* m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +	* m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +	* m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +	* m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +	* m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +	* m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +	* m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +	* m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +	* s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
 +	* s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef.
 +	* s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT):
 +	(LDAV_SYMBOL): Remove.
 +	* s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove.
 +	* s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
 +
 +	Import getloadavg module from gnulib.
 +	* deps.mk (getloadavg.o): Remove; gnulib now does this.
 +	* lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
 +	now does this.
 +	* src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
 +	* src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
 +	* config.in: Regenerate.
 +
  2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
  
+ 	Port to Sun C 5.11, which has __attribute__ ((__aligned (N))).
+ 	* md5.h (ATTRIBUTE_ALIGNED): New macro.
+ 	(struct md5_ctx): Use it.
+ 
  	Port to Solaris 10, which doesn't support FC_HINT_STYLE.
  	* xftfont.c (FC_HINT_STYLE): #define to "hintstyle" if not
  	defined.