1 # Ensure we correctly identify a 64-bit build and

     2 # use "amd64" and "sparcv9" for the 64-bit cpu string.

     3 # Changes were developed in-house, are Solaris specific,

     4 # and are not suitable for upstream.

     5 

     6 --- ruby-2.3.1-orig/tool/config.guess	2016-04-25 11:09:28.000000000 -0700

     7 +++ ruby-2.3.1/tool/config.guess	2016-09-14 14:00:35.000000000 -0700

     8 @@ -369,25 +369,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

     9  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

    10  	exit ;;

    11      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)

    12 -	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

    13 +	# Check CFLAGS for the 64-bit compile option to set the arch

    14 +	SUN_ARCH="sparc"

    15 +	echo $CFLAGS | /usr/gnu/bin/grep -q -w '\-m64' && SUN_ARCH="sparcv9"

    16 +	echo ${SUN_ARCH}-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

    17  	exit ;;

    18      i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)

    19  	echo i386-pc-auroraux${UNAME_RELEASE}

    20  	exit ;;

    21      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

    22 -	eval $set_cc_for_build

    23  	SUN_ARCH="i386"

    24 -	# If there is a compiler, see if it is configured for 64-bit objects.

    25 -	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.

    26 -	# This test works for both compilers.

    27 -	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then

    28 -	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \

    29 -		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \

    30 -		grep IS_64BIT_ARCH >/dev/null

    31 -	    then

    32 -		SUN_ARCH="x86_64"

    33 -	    fi

    34 -	fi

    35 +	# Check CFLAGS for the 64-bit compile option to set the arch

    36 +	echo $CFLAGS | /usr/gnu/bin/grep -q -w '\-m64' && SUN_ARCH="amd64"

    37  	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

    38  	exit ;;

    39      sun4*:SunOS:6*:*)

    40 --- ruby-2.3.1-orig/tool/config.sub	2016-04-25 11:09:28.000000000 -0700

    41 +++ ruby-2.3.1/tool/config.sub	2016-09-14 14:00:35.000000000 -0700

    42 @@ -491,7 +491,7 @@ case $basic_machine in

    43  		basic_machine=x86_64-pc

    44  		;;

    45  	amd64-*)

    46 -		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`

    47 +		# don't change basic_machine

    48  		;;

    49  	amdahl)

    50  		basic_machine=580-amdahl