Commit a17e906d authored by Martin Storsjö's avatar Martin Storsjö Committed by Niels Möller

From Martin Storsjö:

* configure.ac (W64_ABI): New variable, set when compiling for
64-bit M$ windows.
* config.m4.in (W64_ABI): Define, from configure substitution.

Rev: nettle/ChangeLog:1.240
Rev: nettle/config.m4.in:1.3
Rev: nettle/configure.ac:1.52
parent a57cdb68
2011-11-25 Niels Mller <nisse@lysator.liu.se>
From Martin Storsj:
* configure.ac (W64_ABI): New variable, set when compiling for
64-bit M$ windows.
* config.m4.in (W64_ABI): Define, from configure substitution.
2011-11-24 Niels Mller <nisse@lysator.liu.se> 2011-11-24 Niels Mller <nisse@lysator.liu.se>
From Martin Storsj: From Martin Storsj:
......
...@@ -4,6 +4,7 @@ define(<ELF_STYLE>, <@ASM_ELF_STYLE@>)dnl ...@@ -4,6 +4,7 @@ define(<ELF_STYLE>, <@ASM_ELF_STYLE@>)dnl
define(<TYPE_FUNCTION>, <@ASM_TYPE_FUNCTION@>)dnl define(<TYPE_FUNCTION>, <@ASM_TYPE_FUNCTION@>)dnl
define(<ALIGN_LOG>, <@ASM_ALIGN_LOG@>)dnl define(<ALIGN_LOG>, <@ASM_ALIGN_LOG@>)dnl
define(<ALIGNOF_UINT64_T>, <@ALIGNOF_UINT64_T@>)dnl define(<ALIGNOF_UINT64_T>, <@ALIGNOF_UINT64_T@>)dnl
define(<W64_ABI>, <@W64_ABI@>)dnl
divert(1) divert(1)
@ASM_MARK_NOEXEC_STACK@ @ASM_MARK_NOEXEC_STACK@
divert divert
...@@ -256,6 +256,7 @@ IF_DLL='#' ...@@ -256,6 +256,7 @@ IF_DLL='#'
LIBNETTLE_FILE_SRC='$(LIBNETTLE_FORLINK)' LIBNETTLE_FILE_SRC='$(LIBNETTLE_FORLINK)'
LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FORLINK)' LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FORLINK)'
EMULATOR='' EMULATOR=''
W64_ABI=no
case "$host_os" in case "$host_os" in
mingw32*|cygwin*) mingw32*|cygwin*)
...@@ -283,6 +284,9 @@ case "$host_os" in ...@@ -283,6 +284,9 @@ case "$host_os" in
;; ;;
esac esac
fi fi
if test "x$ABI" = x64 ; then
W64_ABI=yes
fi
LIBNETTLE_SONAME='' LIBNETTLE_SONAME=''
LIBNETTLE_FILE='libnettle.dll.a' LIBNETTLE_FILE='libnettle.dll.a'
LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)' LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)'
...@@ -456,6 +460,7 @@ AC_SUBST(ASM_ELF_STYLE) ...@@ -456,6 +460,7 @@ AC_SUBST(ASM_ELF_STYLE)
AC_SUBST(ASM_TYPE_FUNCTION) AC_SUBST(ASM_TYPE_FUNCTION)
AC_SUBST(ASM_MARK_NOEXEC_STACK) AC_SUBST(ASM_MARK_NOEXEC_STACK)
AC_SUBST(ASM_ALIGN_LOG) AC_SUBST(ASM_ALIGN_LOG)
AC_SUBST(W64_ABI)
AC_SUBST(EMULATOR) AC_SUBST(EMULATOR)
AC_SUBST(SHLIBCFLAGS) AC_SUBST(SHLIBCFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment