From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 15 Apr 2012 23:55:52 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~359
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=20a14f94f6581d5c483a7df775cd129bdc9e20d5;p=emacs.git

Merge from trunk.
---

20a14f94f6581d5c483a7df775cd129bdc9e20d5
diff --cc src/ChangeLog
index cfcb22b5e41,c602b25bdd9..dfe694c71a3
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,16 +1,29 @@@
+ 2012-04-15  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+ 	* lisp.h (struct Lisp_Symbol): Remove explicit padding.
+ 	(struct Lisp_Misc_Any): Likewise.
+ 	(struct Lisp_Free): Likewise.
+ 	* alloc.c (union aligned_Lisp_Symbol): Define.
+ 	(SYMBOL_BLOCK_SIZE, struct symbol_block): Use union
+ 	aligned_Lisp_Symbol instead of struct Lisp_Symbol.
+ 	(union aligned_Lisp_Misc): Define.
+ 	(MARKER_BLOCK_SIZE, struct marker_block): Use union
+ 	aligned_Lisp_Misc instead of union Lisp_Misc.
+ 	(Fmake_symbol, allocate_misc, gc_sweep): Adjust
+ 
 +2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	configure: new option --enable-gcc-warnings (Bug#11207)
 +	* Makefile.in (C_WARNINGS_SWITCH): Remove.
 +	(WARN_CFLAGS, WERROR_CFLAGS): New macros.
 +	(ALL_CFLAGS): Use new macros rather than old.
 +	* process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
 +	* regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
 +	-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
 +	-Wunused-result, -Wunused-variable.  This should go away once
 +	the Emacs and Gnulib regex code is merged.
 +	(xmalloc, xrealloc): Now static.
 +
  2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
  
  	Make GC_MAKE_GCPROS_NOOPS the default (Bug#9926).