author | April Chin <april.chin@oracle.com> |
Thu, 20 Mar 2014 12:07:13 -0700 | |
branch | s11-update |
changeset 2994 | 3705b92dce6a |
permissions | -rw-r--r-- |
2994
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
Ensure we correctly identify a 64-bit build and |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
use "amd64" and "sparcv9" for the 64-bit cpu string. |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
Changes were developed in-house, are Solaris specific, |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
and are not suitable for upstream. |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
|
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
diff -ru ruby-1.9.3-p484-orig//tool/config.guess ruby-1.9.3-p484/tool/config.guess |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
--- ruby-1.9.3-p484-orig//tool/config.guess Sat Sep 25 18:25:34 2010 |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
+++ ruby-1.9.3-p484/tool/config.guess Tue Feb 25 15:36:05 2014 |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
@@ -331,25 +331,18 @@ |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
exit ;; |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
+ # Check CFLAGS for the 64-bit compile option to set the arch |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
+ SUN_ARCH="sparc" |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
+ echo $CFLAGS | /usr/gnu/bin/grep -q -w '\-m64' && SUN_ARCH="sparcv9" |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
+ echo ${SUN_ARCH}-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
exit ;; |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
echo i386-pc-auroraux${UNAME_RELEASE} |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
exit ;; |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
- eval $set_cc_for_build |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
SUN_ARCH="i386" |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
25 |
- # If there is a compiler, see if it is configured for 64-bit objects. |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
26 |
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
27 |
- # This test works for both compilers. |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
28 |
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
29 |
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
30 |
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
31 |
- grep IS_64BIT_ARCH >/dev/null |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
32 |
- then |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
33 |
- SUN_ARCH="x86_64" |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
34 |
- fi |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
35 |
- fi |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
36 |
+ # Check CFLAGS for the 64-bit compile option to set the arch |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
37 |
+ echo $CFLAGS | /usr/gnu/bin/grep -q -w '\-m64' && SUN_ARCH="amd64" |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
38 |
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
39 |
exit ;; |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
40 |
sun4*:SunOS:6*:*) |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
41 |
diff -ru ruby-1.9.3-p484-orig//tool/config.sub ruby-1.9.3-p484/tool/config.sub |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
42 |
--- ruby-1.9.3-p484-orig//tool/config.sub Sun Oct 3 08:06:23 2010 |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
43 |
+++ ruby-1.9.3-p484/tool/config.sub Tue Feb 25 15:54:21 2014 |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
44 |
@@ -431,7 +431,7 @@ |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
45 |
basic_machine=x86_64-pc |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
46 |
;; |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
47 |
amd64-*) |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
48 |
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
49 |
+ # don't change basic_machine |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
50 |
;; |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
51 |
amdahl) |
3705b92dce6a
17591620 ruby 1.9 should not have its *.rb text files under amd64/sparcv9 directories
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
52 |
basic_machine=580-amdahl |