generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix configuration system to support different architectures on Cygwin.

Browse Source 
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@redhat.com>

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Corinna Vinschen 2016-01-17 16:42:38 +01:00 committed by Richard Levitte
parent 42b8f1427a
commit a717c110d2
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configurations/10-main.conf
View File

@ -1221,10 +1221,10 @@
}, },
#### Cygwin #### Cygwin
"Cygwin" => { "Cygwin-i686" => {
inherit_from => [ asm("x86_asm") ], inherit_from => [ asm("x86_asm") ],
cc => "gcc", cc => "gcc",
cflags => "-DTERMIOS -DL_ENDIAN -march=i486 -Wall", cflags => "-DTERMIOS -DL_ENDIAN -Wall",
debug_cflags => "-g -O0", debug_cflags => "-g -O0",
release_cflags => "-O3 -fomit-frame-pointer", release_cflags => "-O3 -fomit-frame-pointer",
sys_id => "CYGWIN", sys_id => "CYGWIN",

13
config
View File

@ -323,15 +323,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-whatever-mingw"; exit 0; echo "${MACHINE}-whatever-mingw"; exit 0;
;; ;;
CYGWIN*) CYGWIN*)
case "$RELEASE" in echo "${MACHINE}-pc-cygwin"; exit 0
[bB]*|1.0|1.[12].*)
echo "${MACHINE}-whatever-cygwin_pre1.3"
;;
*)
echo "${MACHINE}-whatever-cygwin"
;;
esac
exit 0
;; ;;
vxworks*) vxworks*)
@ -814,8 +806,7 @@ case "$GUESSOS" in
fi fi
;; ;;
# these are all covered by the catchall below # these are all covered by the catchall below
*-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;; *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;
*-*-cygwin) OUT="Cygwin" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;; x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;; *-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;; x86-*-android|i?86-*-android) OUT="android-x86" ;;