Merge from trunk, resolve conflicts.

diff --cc configure.ac
index 3eaf1821b4756d035bb297f8c91eaaf3fad4618b,c95072423b5c98c387ba6a2712187e4a06034be9..ff7c2ece0bbb78a1f071d376567553943f79608e
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -544,13 -549,7 +549,12 @@@ case "${canonical}" i
    ## Intel 386 machines where we don't care about the manufacturer.
    i[3456]86-*-* )
      case "${canonical}" in
-       *-cygwin )                opsys=cygwin ;;
        *-darwin* )               opsys=darwin ;;
 +      *-mingw32 )             
 +              opsys=mingw32
 +              # MinGW overrides and adds some system headers in nt/inc.
 +              GCC_TEST_OPTIONS="-I $srcdir/nt/inc"
 +              ;;
        *-sysv4.2uw* )          opsys=unixware ;;
        *-sysv5uw* )            opsys=unixware ;;
        *-sysv5OpenUNIX* )      opsys=unixware ;;
@@@ -1586,33 -1526,12 +1590,33 @@@ if test "${HAVE_W32}" = "yes"; the
                  [AC_MSG_ERROR([No resource compiler found.])])
    W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
    W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
 -  W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
 -  W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
 -  W32_RES="emacs.res"
 -  # Tell the linker that emacs.res is an object (which we compile from
 -  # the rc file), not a linker script.
 -  W32_RES_LINK="-Wl,emacs.res"
 +  EMACSRES="emacs.res"
 +  case "$canonical" in
 +    x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
 +    *) EMACS_MANIFEST="emacs-x86.manifest" ;;
 +  esac
 +  if test "${opsys}" = "cygwin"; then
 +    W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
 +    W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
 +    # Tell the linker that emacs.res is an object (which we compile from
 +    # the rc file), not a linker script.
-     W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res"
++    W32_RES_LINK="-Wl,emacs.res"
 +  else
 +    W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
 +    W32_OBJ="$W32_OBJ w32notify.o"
 +    W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
 +    W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10"
 +    W32_RES_LINK="\$(EMACSRES)"
 +    CLIENTRES="emacsclient.res"
 +    CLIENTW="emacsclientw\$(EXEEXT)"
 +    FIRSTFILE_OBJ=firstfile.o
 +    NTDIR=nt
 +    CM_OBJ=
 +    LIBS_ECLIENT="-lcomctl32"
 +    LIB_WSOCK32="-lwsock32"
 +    NTLIB="ntlib.$ac_objext"
 +    XARGS_LIMIT="-s 10000"
 +  fi
  fi
  AC_SUBST(W32_OBJ)
  AC_SUBST(W32_LIBS)
@@@ -4450,26 -4189,15 +4454,33 @@@ case "$opsys" i
    *) LD_SWITCH_SYSTEM_TEMACS= ;;
  esac
  
+ if test x$ac_enable_profiling != x ; then
+   case $opsys in
+     *freebsd | gnu-linux) ;;
+     *) LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS -pg" ;;
+   esac
+ fi
+ 
  AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
  
 +## MinGW-specific post-link processing of temacs.
 +TEMACS_POST_LINK=":"
 +ADDSECTION=
 +EMACS_HEAPSIZE=
 +if test "${opsys}" = "mingw32"; then
 +  TEMACS_POST_LINK="\$(MINGW_TEMACS_POST_LINK)"
 +  ADDSECTION="../nt/addsection\$(EXEEXT)"
 +  ## Preload heap size of temacs.exe in MB.
 +  case "$canonical" in
 +    x86_64-*-*) EMACS_HEAPSIZE=42 ;;
 +    *) EMACS_HEAPSIZE=27 ;;
 +  esac
 +fi
 +
 +AC_SUBST(ADDSECTION)
 +AC_SUBST(TEMACS_POST_LINK)
 +AC_SUBST(EMACS_HEAPSIZE)
 +
  ## Common for all window systems
  if test "$window_system" != "none"; then
    AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.])

diff --cc lib/Makefile.am
index 2893dd42d9d79db4a2f74e35419d46b2924ab92d,d8979a1cf744b61300b354ecdfef77a0bb302bea..2ba63f3152adbb186ea429bff08dcd9b763c5915
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -4,12 -4,9 +4,12 @@@ MOSTLYCLEANDIRS 
  MOSTLYCLEANFILES =
  noinst_LIBRARIES =
  
- AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
+ AM_CFLAGS = $(PROFILING_CFLAGS) $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
  DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
  
 +if BUILDING_FOR_WINDOWSNT
 +include ../nt/gnulib.mk
 +else
  include gnulib.mk
  
  libgnu_a_SOURCES += openat-die.c save-cwd.c

diff --cc src/Makefile.in
index 2e56f8f2fe12c77623a8ee4a2cccdcac3db3461b,c6a067a1ade8bf8004bc12374dd7f6ec15899a3c..ee4e771dc9a291ec514df6f92335570a0db84a62
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -260,13 -260,10 +260,13 @@@ W32_OBJ=@W32_OBJ
  W32_LIBS=@W32_LIBS@
  
  ## emacs.res if HAVE_W32
 -W32_RES=@W32_RES@
 +EMACSRES = @EMACSRES@
 +## emacs-*.manifest if HAVE_W32
 +EMACS_MANIFEST = @EMACS_MANIFEST@
  ## If HAVE_W32, compiler arguments for including
  ## the resource file in the binary.
- ## Cygwin: -Wl,-b -Wl,pe-i386 -Wl,emacs.res
 -## XXX -Wl,-b -Wl,pe-i386 -Wl,emacs.res
++## Cygwin: -Wl,emacs.res
 +## MinGW: emacs.res
  W32_RES_LINK=@W32_RES_LINK@
  
  ## Empty if !HAVE_X_WINDOWS