Commit a717c110 authored by Corinna Vinschen's avatar Corinna Vinschen Committed by Richard Levitte
Browse files

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: default avatarCorinna Vinschen <vinschen@redhat.com>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 42b8f142

Configurations/10-main.conf

+2 −2
Original line number Diff line number Diff line
@@ -1221,10 +1221,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",

config

+2 −11
Original line number Diff line number Diff line
@@ -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,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" ;;