* Merge in cygwin-64bit-branch.

5 files changed, 38 insertions, 7 deletions

diff --git a/winsup/lsaauth/ChangeLog b/winsup/lsaauth/ChangeLog
index 0632a8a17..bd0ecbd1c 100644
--- a/winsup/lsaauth/ChangeLog
+++ b/winsup/lsaauth/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Merge in cygwin-64bit-branch.  See ChangeLog.64bit for details.
+
 2012-11-26  Christopher Faylor  <me.cygwin2012@cgf.cx>
 
 	* configure.ac: Rename from configure.in.
diff --git a/winsup/lsaauth/ChangeLog.64bit b/winsup/lsaauth/ChangeLog.64bit
new file mode 100644
index 000000000..32ef85710
--- /dev/null
+++ b/winsup/lsaauth/ChangeLog.64bit
@@ -0,0 +1,13 @@
+2013-02-22  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+	* configure.ac: Skip check for i686-w64-mingw32-g++ on x86_64.
+	* configure: Regenerate.
+
+2013-02-21  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.in (target_cpu): Define.  Check for target_cpu rather than
+	target_alias for conditional compilation issues.
+
+2013-02-15  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+	* Makefile.in: Do not build or install 32bit DLL for 64bit target.
diff --git a/winsup/lsaauth/Makefile.in b/winsup/lsaauth/Makefile.in
index 8fbb2a45a..162e5aa0c 100644
--- a/winsup/lsaauth/Makefile.in
+++ b/winsup/lsaauth/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2008, 2009, 2011, 2012 Red Hat, Inc.
+# Copyright (c) 2006, 2008, 2009, 2011, 2012, 2013 Red Hat, Inc.
 #
 #     This program is free software; you can redistribute it and/or modify
 #     it under the terms of the GNU General Public License as published by
@@ -36,6 +36,8 @@ CFLAGS          := @CFLAGS@
 
 include $(srcdir)/../Makefile.common
 
+target_cpu:=@target_cpu@
+
 WIN32_INCLUDES  := -I. -I$(srcdir)
 WIN32_CFLAGS    := $(CFLAGS) $(WIN32_INCLUDES)
 WIN32_LDFLAGS	:= $(CFLAGS) -nostdlib -Wl,-shared
@@ -46,9 +48,11 @@ WIN32_LDFLAGS	:= $(CFLAGS) -nostdlib -Wl,-shared
 # not recognized by LSA.
 LIBS		:= -ladvapi32 -lkernel32 -lntdll
 
+ifneq ($(target_cpu),x86_64)
 DLL32	:=	cyglsa.dll
 DEF32	:=	cyglsa.def
 OBJ32	:=	cyglsa.o
+endif
 
 DLL64	:=	cyglsa64.dll
 DEF64	:=	cyglsa64.def
@@ -84,6 +88,8 @@ clean:
 
 install: all
 	/bin/mkdir -p $(DESTDIR)$(bindir)
+ifneq ($(target_cpu),x86_64)
 	$(INSTALL_PROGRAM) $(DLL32) $(DESTDIR)$(bindir)/$(DLL32)
+endif
 	$(INSTALL_PROGRAM) $(DLL64) $(DESTDIR)$(bindir)/$(DLL64)
 	$(INSTALL_PROGRAM) $(srcdir)/cyglsa-config $(DESTDIR)$(bindir)/cyglsa-config
diff --git a/winsup/lsaauth/configure b/winsup/lsaauth/configure
index 240d14448..51e28587b 100755
--- a/winsup/lsaauth/configure
+++ b/winsup/lsaauth/configure
@@ -2838,7 +2838,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 test -z "$CC" && as_fn_error $? "no acceptable cc found in \$PATH" "$LINENO" 5
 
 
-for ac_prog in i686-w64-mingw32-gcc
+case "$target_cpu" in
+i?86)
+  for ac_prog in i686-w64-mingw32-gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -2880,6 +2882,10 @@ fi
   test -n "$MINGW32_CC" && break
 done
 
+  test -z "$MINGW32_CC" && as_fn_error $? "no acceptable mingw32 cc found in \$PATH" "$LINENO" 5
+  ;;
+esac
+
 for ac_prog in x86_64-w64-mingw32-gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2922,8 +2928,6 @@ fi
   test -n "$MINGW64_CC" && break
 done
 
-
-test -z "$MINGW32_CC" && as_fn_error $? "no acceptable mingw32 cc found in \$PATH" "$LINENO" 5
 test -z "$MINGW64_CC" && as_fn_error $? "no acceptable mingw64 cc found in \$PATH" "$LINENO" 5
 
 test "$program_prefix" != NONE &&
diff --git a/winsup/lsaauth/configure.ac b/winsup/lsaauth/configure.ac
index edc81e809..fe2e30bf0 100644
--- a/winsup/lsaauth/configure.ac
+++ b/winsup/lsaauth/configure.ac
@@ -25,10 +25,14 @@ AC_CANONICAL_SYSTEM
 
 LIB_AC_PROG_CC
 
-AC_CHECK_PROGS(MINGW32_CC, i686-w64-mingw32-gcc)
-AC_CHECK_PROGS(MINGW64_CC, x86_64-w64-mingw32-gcc)
+case "$target_cpu" in
+i?86)
+  AC_CHECK_PROGS(MINGW32_CC, i686-w64-mingw32-gcc)
+  test -z "$MINGW32_CC" && AC_MSG_ERROR([no acceptable mingw32 cc found in \$PATH])
+  ;;
+esac
 
-test -z "$MINGW32_CC" && AC_MSG_ERROR([no acceptable mingw32 cc found in \$PATH])
+AC_CHECK_PROGS(MINGW64_CC, x86_64-w64-mingw32-gcc)
 test -z "$MINGW64_CC" && AC_MSG_ERROR([no acceptable mingw64 cc found in \$PATH])
 
 AC_ARG_PROGRAM