[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Mon Jan 18 15:16:07 UTC 2016
The branch master has been updated
via b9ee2dacbc9309275c972bc4b863f72dcc67dec1 (commit)
via 3f54296955abe1c997e6a9ecdfebc74fe2b1ffed (commit)
via a717c110d25e3e3e197f6b8a9228f2601ca9c9af (commit)
via 42b8f1427a8cdf320e51374a5fbfefc74bec0519 (commit)
via 8d35ceb98f3dbd55cf55edc3d2a814d0dd6d520d (commit)
from 23d526eca9251618b3f0d81c4a2ad6d4f25d7563 (commit)
- Log -----------------------------------------------------------------
commit b9ee2dacbc9309275c972bc4b863f72dcc67dec1
Author: Richard Levitte <levitte at openssl.org>
Date: Sun Jan 17 18:03:04 2016 +0100
Add some extra Cygwin targets as aliases for Cygwin-x86
Cygwin was used for x86 before, so let's keep it around for those who
still use it (it make Configure reconf possible).
Cygwin-i[3456]86 for those that might generate and pass a target name
directly to Configure.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 3f54296955abe1c997e6a9ecdfebc74fe2b1ffed
Author: Richard Levitte <levitte at openssl.org>
Date: Sun Jan 17 17:48:53 2016 +0100
Adjust the configuration target name from Cygwin-i686 to Cygwin-x86
This is to reflect that it's not limited to just i686.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit a717c110d25e3e3e197f6b8a9228f2601ca9c9af
Author: Corinna Vinschen <vinschen at redhat.com>
Date: Sun Jan 17 16:42:38 2016 +0100
Fix configuration system to support different architectures on Cygwin.
This patch allows to recognize the architectures supported by Cygwin
and to choose the right configuration from there. Drop -march to
use default architecture on 32 bit x86.
Drop pre-Cygwin-1.3 recognition since it's long gone and there's no
valid configuration for this anymore.
Signed-off-by: Corinna Vinschen <vinschen at redhat.com>
Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
commit 42b8f1427a8cdf320e51374a5fbfefc74bec0519
Author: Corinna Vinschen <vinschen at redhat.com>
Date: Sat Jan 16 19:36:15 2016 +0100
Don't strip object files on Cygwin
Building for the Cygwin distro requires to be able to build debuginfo
files. This in turn requires to build object files without stripping.
The stripping is performed by the next step after building which creates
the debuginfo files.
Signed-off-by: Corinna Vinschen <vinschen at redhat.com>
Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
commit 8d35ceb98f3dbd55cf55edc3d2a814d0dd6d520d
Author: Corinna Vinschen <vinschen at redhat.com>
Date: Sat Jan 16 19:30:48 2016 +0100
Use POSIX functions on Cygwin, not Win32 function
Signed-off-by: Corinna Vinschen <vinschen at redhat.com>
Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 21 +++++++++++++++++++--
Makefile.shared | 4 ++--
apps/speed.c | 10 +---------
config | 14 +++-----------
crypto/async/arch/async_posix.h | 2 +-
crypto/async/arch/async_win.h | 2 +-
include/openssl/async.h | 2 +-
test/asynctest.c | 4 ++--
8 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 2f5313e..06911ac 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1221,10 +1221,10 @@
},
#### Cygwin
- "Cygwin" => {
+ "Cygwin-x86" => {
inherit_from => [ asm("x86_asm") ],
cc => "gcc",
- cflags => "-DTERMIOS -DL_ENDIAN -march=i486 -Wall",
+ cflags => "-DTERMIOS -DL_ENDIAN -Wall",
debug_cflags => "-g -O0",
release_cflags => "-O3 -fomit-frame-pointer",
sys_id => "CYGWIN",
@@ -1251,6 +1251,23 @@
shared_ldflag => "-shared",
shared_extension => ".dll.a",
},
+ # Backward compatibility for those using this target
+ "Cygwin" => {
+ inherit_from => [ "Cygwin-x86" ]
+ },
+ # In case someone constructs the Cygwin target name themself
+ "Cygwin-i386" => {
+ inherit_from => [ "Cygwin-x86" ]
+ },
+ "Cygwin-i486" => {
+ inherit_from => [ "Cygwin-x86" ]
+ },
+ "Cygwin-i586" => {
+ inherit_from => [ "Cygwin-x86" ]
+ },
+ "Cygwin-i686" => {
+ inherit_from => [ "Cygwin-x86" ]
+ },
#### NetWare from David Ward (dsward at novell.com)
# requires either MetroWerks NLM development tools, or gcc / nlmconv
diff --git a/Makefile.shared b/Makefile.shared
index 208382e..0ff1a76 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -272,7 +272,7 @@ link_o.cygwin:
SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base $$deffile -Wl,-s,-Bsymbolic"; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base $$deffile -Wl,-Bsymbolic"; \
$(LINK_SO_O)
#for mingw target if def-file is in use dll-name should match library-name
link_a.cygwin:
@@ -297,7 +297,7 @@ link_a.cygwin:
extras="$$extras rc.o"; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-s,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \
[ -f apps/$$dll_name ] && rm apps/$$dll_name; \
[ -f test/$$dll_name ] && rm test/$$dll_name; \
$(LINK_SO_A) || exit 1; \
diff --git a/apps/speed.c b/apps/speed.c
index d45a6f9..5bf1685 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -94,16 +94,8 @@
# include <signal.h>
#endif
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
# include <windows.h>
-# if defined(__CYGWIN__) && !defined(_WIN32)
- /*
- * <windows.h> should define _WIN32, which normally is mutually exclusive
- * with __CYGWIN__, but if it didn't...
- */
-# define _WIN32
- /* this is done because Cygwin alarm() fails sometimes. */
-# endif
#endif
#include <openssl/bn.h>
diff --git a/config b/config
index 1683f07..2b3b6d8 100755
--- a/config
+++ b/config
@@ -323,15 +323,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-whatever-mingw"; exit 0;
;;
CYGWIN*)
- case "$RELEASE" in
- [bB]*|1.0|1.[12].*)
- echo "${MACHINE}-whatever-cygwin_pre1.3"
- ;;
- *)
- echo "${MACHINE}-whatever-cygwin"
- ;;
- esac
- exit 0
+ echo "${MACHINE}-pc-cygwin"; exit 0
;;
vxworks*)
@@ -814,8 +806,8 @@ case "$GUESSOS" in
fi
;;
# these are all covered by the catchall below
- *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
- *-*-cygwin) OUT="Cygwin" ;;
+ i[3456]86-*-cygwin) OUT="Cygwin-x86" ;;
+ *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index c247888..475b56f 100644
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -54,7 +54,7 @@
#define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H
#include <openssl/e_os2.h>
-#if defined(OPENSSL_SYS_UNIX) && defined(OPENSSL_THREADS)
+#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS)
# include <unistd.h>
diff --git a/crypto/async/arch/async_win.h b/crypto/async/arch/async_win.h
index b247f59..31f2482 100644
--- a/crypto/async/arch/async_win.h
+++ b/crypto/async/arch/async_win.h
@@ -55,7 +55,7 @@
* This is the same detection used in cryptlib to set up the thread local
* storage that we depend on, so just copy that
*/
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
#include <openssl/async.h>
# define ASYNC_WIN
# define ASYNC_ARCH
diff --git a/include/openssl/async.h b/include/openssl/async.h
index de5ef89..d130a36 100644
--- a/include/openssl/async.h
+++ b/include/openssl/async.h
@@ -56,7 +56,7 @@
#include <stdlib.h>
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
#include <windows.h>
#define OSSL_ASYNC_FD HANDLE
#else
diff --git a/test/asynctest.c b/test/asynctest.c
index 3e68b1d..ace52b9 100644
--- a/test/asynctest.c
+++ b/test/asynctest.c
@@ -62,12 +62,12 @@
#include <openssl/crypto.h>
#include <../apps/apps.h>
-#if defined(OPENSSL_SYS_UNIX) && defined(OPENSSL_THREADS)
+#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS)
# include <unistd.h>
# if _POSIX_VERSION >= 200112L
# define ASYNC_POSIX
# endif
-#elif defined(_WIN32) || defined(__CYGWIN__)
+#elif defined(_WIN32)
# define ASYNC_WIN
#endif
More information about the openssl-commits
mailing list