On Jan 17 01:04, Richard Levitte wrote: > In message <20160116164653.gh12...@calimero.vinschen.de> on Sat, 16 Jan 2016 > 17:46:53 +0100, Corinna Vinschen <vinsc...@redhat.com> said: > > vinschen> > ./config --unified > vinschen> > vinschen> I tried that and it doesn't work correctly for Cygwin on x86_64. > vinschen> Rather than choosing the "Cygwin-x86_64" configuration, it chooses > vinschen> the "Cygwin" configuration which is for the i686 based 32 bit > vinschen> version of Cygwin. > vinschen> > vinschen> Can this be recified easily. > vinschen> > vinschen> Btw., for the new unified configuration it might make sense to > vinschen> rename "Cygwin" to "Cygwin-i686". -march could then be set for > vinschen> i686 as well since 32 bit Cygwin won't run on older CPUs anyway. > > Hey Corinna, > > This particular issue has nothing at all to do with with my build > system changes, and everything to do with the "config" script. Its > responsability is to figure out what the platform target should be and > then call Configure with it. > > If you have a look in "config", it doesn't generate "Cygwin-x86_64" at > all. Would you be willing to have a look at that script and modernise > it regarding Cygwin?
Like the attached? Corinna -- Corinna Vinschen Cygwin Maintainer Red Hat
From d8b509832d9e8cab2cb8e8fd3cf4d34ada792818 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <vinsc...@redhat.com>
Date: Sun, 17 Jan 2016 16:42:38 +0100
Subject: [PATCH] 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 <vinsc...@redhat.com>
---
Configurations/10-main.conf | 4 ++--
config | 13 ++-----------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 4085e10..6315b2c 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1232,10 +1232,10 @@
},
#### Cygwin
- "Cygwin" => {
+ "Cygwin-i686" => {
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",
diff --git a/config b/config
index e805a84..a888fd8 100755
--- a/config
+++ b/config
@@ -324,15 +324,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*)
@@ -815,8 +807,7 @@ case "$GUESSOS" in
fi
;;
# these are all covered by the catchall below
- *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
- *-*-cygwin) OUT="Cygwin" ;;
+ *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;
--
2.5.0
signature.asc
Description: PGP signature
_______________________________________________ openssl-dev mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-dev
