Commit b3ef742c authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Add support for Cygwin-x86_64. 

PR: 3110
Submitted by Corinna Vinschen.
parent 612f4e23

Configure

+1 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ my %table=( 
# Cygwin

"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",

"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",

"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",

"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",



# NetWare from David Ward (dsward@novell.com)

Makefile.org

+4 −4
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ clean-shared: 
			done; \

		fi; \

		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \

		if [ "$(PLATFORM)" = "Cygwin" ]; then \

		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \

		fi; \

	done
@@ -666,7 +666,7 @@ install_sw: 
		do \

			if [ -f "$$i" -o -f "$$i.a" ]; then \

			(       echo installing $$i; \

				if [ "$(PLATFORM)" != "Cygwin" ]; then \

				if ! expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
@@ -738,9 +738,9 @@ install_docs: 
	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \

	here="`pwd`"; \

	filecase=; \

	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \

	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \

		filecase=-i; \

	fi; \

	esac; \

	set -e; for i in doc/apps/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \

TABLE

+99 −0
Original line number Diff line number Diff line
@@ -396,6 +396,39 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** Cygwin-x86_64

$cc           = gcc

$cflags       = -DTERMIOS -DL_ENDIAN -O3 -Wall

$unistd       = 

$thread_cflag = 

$sys_id       = CYGWIN32

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o

$des_obj      = 

$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$cast_obj     = 

$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = e_padlock-x86_64.o

$perlasm_scheme = mingw64

$dso_scheme   = dlfcn

$shared_target= cygwin-shared

$shared_cflag = -D_WINDLL

$shared_ldflag = -shared

$shared_extension = .dll.a

$ranlib       = 

$arflags      = 

$multilib     = 



*** DJGPP

$cc           = gcc

$cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall
@@ -1848,6 +1881,39 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** debug-ben-debug-64-noopt

$cc           = gcc

$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe

$unistd       = 

$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT

$sys_id       = 

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o

$des_obj      = 

$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$cast_obj     = 

$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = e_padlock-x86_64.o

$perlasm_scheme = elf

$dso_scheme   = dlfcn

$shared_target= bsd-gcc-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 

$multilib     = 



*** debug-ben-macos

$cc           = cc

$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe
@@ -2112,6 +2178,39 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** debug-darwin64-x86_64-cc

$cc           = cc

$cflags       = -arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = MACOSX

$lflags       = -Wl,-search_paths_first%

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o

$des_obj      = 

$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$cast_obj     = 

$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = e_padlock-x86_64.o

$perlasm_scheme = macosx

$dso_scheme   = dlfcn

$shared_target= darwin-shared

$shared_cflag = -fPIC -fno-common

$shared_ldflag = -arch x86_64 -dynamiclib

$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib

$ranlib       = 

$arflags      = 

$multilib     = 



*** debug-geoff32

$cc           = gcc

$cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long

engines/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ install: 
		for l in $(LIBNAMES); do \

			( echo installing $$l; \

			  pfx=lib; \

			  if [ "$(PLATFORM)" != "Cygwin" ]; then \

			  if ! expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

				case "$(CFLAGS)" in \

				*DSO_BEOS*)	sfx=".so";;	\

				*DSO_DLFCN*)	sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;;	\

engines/ccgost/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ install: 
		set -e; \

		echo installing $(LIBNAME); \

		pfx=lib; \

		if [ "$(PLATFORM)" != "Cygwin" ]; then \

		if ! expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

			case "$(CFLAGS)" in \

			*DSO_BEOS*) sfx=".so";; \

			*DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \