| commit | author | age | ||
| 554801 | 1 | # Ensure we correctly identify a 64-bit build and |
| AP | 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 | ||
| 1780eb | 6 | --- ruby-2.6.5/tool/config.guess 2019-10-01 13:01:01.000000000 +0000 |
| MN | 7 | +++ ruby-2.6.5/tool/config.guess 2020-01-01 11:23:43.822850111 +0000 |
| 8 | @@ -388,25 +388,18 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM | |
| 554801 | 9 | echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
| AP | 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.*:*) | |
| 1780eb | 22 | - set_cc_for_build |
| 554801 | 23 | - SUN_ARCH=i386 |
| AP | 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 | + SUN_ARCH="i386" | |
| 36 | + # Check CFLAGS for the 64-bit compile option to set the arch | |
| 37 | + echo $CFLAGS | /usr/gnu/bin/grep -q -w '\-m64' && SUN_ARCH="amd64" | |
| 38 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" | |
| 39 | exit ;; | |
| 40 | sun4*:SunOS:6*:*) | |
| 1780eb | 41 | --- ruby-2.6.5/tool/config.sub 2019-10-01 13:01:01.000000000 +0000 |
| MN | 42 | +++ ruby-2.6.5/tool/config.sub 2020-01-01 12:22:58.818201859 +0000 |
| 43 | @@ -1008,7 +1008,7 @@ case $cpu-$vendor in | |
| 44 | ||
| 45 | # Here we normalize CPU types irrespective of the vendor | |
| 554801 | 46 | amd64-*) |
| 1780eb | 47 | - cpu=x86_64 |
| MN | 48 | + # don't change cpu |
| 554801 | 49 | ;; |
| 1780eb | 50 | blackfin-*) |
| MN | 51 | cpu=bfin |
