Newer Sun C compilers are not 'SUNwspro', but 'solstudio'.

[perl5.git] / hints / solaris_2.sh

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 7ffc53c..8dd2ce0 100644 (file)
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -32,11 +32,27 @@ mistrustnm=${mistrustnm:-run}
 #     http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2001-01/msg00465.html
 usemymalloc=${usemymalloc:-false}
 
 #     http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2001-01/msg00465.html
 usemymalloc=${usemymalloc:-false}
 

+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac
+

 # Avoid all libraries in /usr/ucblib.
 # /lib is just a symlink to /usr/lib
 set `echo $glibpth | sed -e 's@/usr/ucblib@@' -e 's@ /lib @ @'`
 glibpth="$*"
 
 # Avoid all libraries in /usr/ucblib.
 # /lib is just a symlink to /usr/lib
 set `echo $glibpth | sed -e 's@/usr/ucblib@@' -e 's@ /lib @ @'`
 glibpth="$*"
 

+# Starting with Solaris 10, we don't want versioned shared libraries because
+# those often indicate a private use only library.  Especially badly that would
+# break things with SUNWbdb (Berkeley DB) being installed, which brings in
+# /usr/lib/libdb.so.1, but that is not really meant for public consumption.
+#  XXX Revisit after perl 5.10 -- should we apply this to older Solaris
+# versions too?  (A.D. 11/2007).
+case "`$run uname -r`" in
+5.[0-9]) ;;
+*) ignore_versioned_solibs=y ;;
+esac
+

 # Remove unwanted libraries.  -lucb contains incompatible routines.
 # -lld and -lsec don't do anything useful. -lcrypt does not
 # really provide anything we need over -lc, so we drop it, too.
 # Remove unwanted libraries.  -lucb contains incompatible routines.
 # -lld and -lsec don't do anything useful. -lcrypt does not
 # really provide anything we need over -lc, so we drop it, too.


@@ -51,11 +67,11 @@ libswanted="$*"
 case "$archname" in
 '')
     if test -f /usr/bin/arch; then
 case "$archname" in
 '')
     if test -f /usr/bin/arch; then

-        archname=`/usr/bin/arch`
-       archname="${archname}-${osname}"
+       archname=`/usr/bin/arch`
+       archname="${archname}-${osname}"

     elif test -f /usr/ucb/arch; then
     elif test -f /usr/ucb/arch; then

-        archname=`/usr/ucb/arch`
-       archname="${archname}-${osname}"
+       archname=`/usr/ucb/arch`
+       archname="${archname}-${osname}"

     fi
     ;;
 esac
     fi
     ;;
 esac


@@ -74,9 +90,11 @@ END
 `
 
 case "$cc" in
 `
 
 case "$cc" in

-'')    if test -f /opt/SUNWspro/bin/cc; then
-               cc=/opt/SUNWspro/bin/cc
-               cat <<EOF >&4   
+'')    for i in `ls -r /opt/solstudio*/bin/cc` /opt/SUNWspro/bin/cc
+       do
+              if test -f "$i"; then
+                      cc=$i
+                      cat <<EOF >&4

 
 You specified no cc but you seem to have the Workshop compiler
 ($cc) installed, using that.
 
 You specified no cc but you seem to have the Workshop compiler
 ($cc) installed, using that.


@@ -84,7 +102,9 @@ If you want something else, specify that in the command line,
 e.g. Configure -Dcc=gcc
 
 EOF
 e.g. Configure -Dcc=gcc
 
 EOF

-       fi
+                       break
+               fi
+       done

        ;;
 esac
 
        ;;
 esac
 


@@ -113,7 +133,7 @@ esac
 
 # Check that /dev/fd is mounted.  If it is not mounted, let the
 # user know that suid scripts may not work.
 
 # Check that /dev/fd is mounted.  If it is not mounted, let the
 # user know that suid scripts may not work.

-mount | grep '^/dev/fd ' 2>&1 > /dev/null
+$run mount | grep '^/dev/fd ' 2>&1 > /dev/null

 case $? in
 0) ;;
 *)
 case $? in
 0) ;;
 *)


@@ -130,8 +150,17 @@ esac
 
 # See if libucb can be found in /usr/lib.  If it is, warn the user
 # that this may cause problems while building Perl extensions.
 
 # See if libucb can be found in /usr/lib.  If it is, warn the user
 # that this may cause problems while building Perl extensions.

-/usr/bin/ls /usr/lib/libucb* >/dev/null 2>&1
-case $? in
+found_libucb=''
+case "$run" in
+'') /usr/bin/ls /usr/lib/libucb* >/dev/null 2>&1
+    found_libucb=$?
+    ;;
+*)  $run /usr/bin/ls '/usr/lib/libucb*' >/dev/null 2>&1
+    found_libucb=$?
+    ;;
+esac
+
+case $found_libucb in

 0)
        cat <<END >&4
 
 0)
        cat <<END >&4
 


@@ -148,7 +177,7 @@ esac
 # The path name is the last field in the output, but the type command
 # has an annoying array of possible outputs, e.g.:
 #      make is hashed (/opt/gnu/bin/make)
 # The path name is the last field in the output, but the type command
 # has an annoying array of possible outputs, e.g.:
 #      make is hashed (/opt/gnu/bin/make)

-#      cc is /usr/ucb/cc
+#      cc is /usr/ucb/cc

 #      foo not found
 # use a command like type make | awk '{print $NF}' | sed 's/[()]//g'
 
 #      foo not found
 # use a command like type make | awk '{print $NF}' | sed 's/[()]//g'
 


@@ -157,7 +186,7 @@ esac
 make -v > make.vers 2>&1
 if grep GNU make.vers > /dev/null 2>&1; then
     tmp=`type make | awk '{print $NF}' | sed 's/[()]//g'`
 make -v > make.vers 2>&1
 if grep GNU make.vers > /dev/null 2>&1; then
     tmp=`type make | awk '{print $NF}' | sed 's/[()]//g'`

-    case "`/usr/bin/ls -lL $tmp`" in
+    case "`${ls:-'/usr/bin/ls'} -lL $tmp`" in

     ??????s*)
            cat <<END >&2
 
     ??????s*)
            cat <<END >&2
 


@@ -192,7 +221,7 @@ cat > UU/cc.cbu <<'EOCBU'
 # be able to perform dynamic loading of extensions.  If you have a
 # problem with dynamic loading, be sure that you are using the Solaris
 # /usr/ccs/bin/as and /usr/ccs/bin/ld.  You can do that with
 # be able to perform dynamic loading of extensions.  If you have a
 # problem with dynamic loading, be sure that you are using the Solaris
 # /usr/ccs/bin/as and /usr/ccs/bin/ld.  You can do that with

-#              sh Configure -Dcc='gcc -B/usr/ccs/bin/'
+#      sh Configure -Dcc='gcc -B/usr/ccs/bin/'

 # (note the trailing slash is required).
 # Combinations that are known to work with the following hints:
 #
 # (note the trailing slash is required).
 # Combinations that are known to work with the following hints:
 #


@@ -204,9 +233,12 @@ cat > UU/cc.cbu <<'EOCBU'
 # Get gcc to share its secrets.
 echo 'int main() { return 0; }' > try.c
        # Indent to avoid propagation to config.sh
 # Get gcc to share its secrets.
 echo 'int main() { return 0; }' > try.c
        # Indent to avoid propagation to config.sh

-       verbose=`${cc:-cc} -v -o try try.c 2>&1`
+       verbose=`${cc:-cc} $ccflags -v -o try try.c 2>&1`

 
 

-if echo "$verbose" | grep '^Reading specs from' >/dev/null 2>&1; then
+# XXX TODO:  'specs' output changed from 'Reading specs from' in gcc-[23] to 'Using
+# built-in specs' in gcc-4.  Perhaps we should just use the same gcc test as
+# in Configure to see if we're using gcc.
+if echo "$verbose" | egrep '(Reading specs from)|(Using built-in specs)' >/dev/null 2>&1; then

        #
        # Using gcc.
        #
        #
        # Using gcc.
        #


@@ -224,12 +256,12 @@ in your ${cc:-cc} command.  (Note that the trailing "/" is required.)
 
 END
            # Apparently not needed, at least for as 2.7 and later.
 
 END
            # Apparently not needed, at least for as 2.7 and later.

-           # cc="${cc:-cc} -B/usr/ccs/bin/"
+           # cc="${cc:-cc} $ccflags -B/usr/ccs/bin/"

        fi
 
        # See if ld(1) is GNU ld(1).  GNU ld(1) might not work for this job.
        # Recompute $verbose since we may have just changed $cc.
        fi
 
        # See if ld(1) is GNU ld(1).  GNU ld(1) might not work for this job.
        # Recompute $verbose since we may have just changed $cc.

-       verbose=`${cc:-cc} -v -o try try.c 2>&1 | grep ld 2>&1`
+       verbose=`${cc:-cc} $ccflags -v -o try try.c 2>&1 | grep ld 2>&1`

 
        if echo "$verbose" | grep ' /usr/ccs/bin/ld ' >/dev/null 2>&1; then
            # Ok, gcc directly calls the Solaris /usr/ccs/bin/ld.
 
        if echo "$verbose" | grep ' /usr/ccs/bin/ld ' >/dev/null 2>&1; then
            # Ok, gcc directly calls the Solaris /usr/ccs/bin/ld.


@@ -238,9 +270,13 @@ END
            # Hmm.  gcc doesn't call /usr/ccs/bin/ld directly, but it
            # does appear to be using it eventually.  egcs-1.0.3's ld
            # wrapper does this.
            # Hmm.  gcc doesn't call /usr/ccs/bin/ld directly, but it
            # does appear to be using it eventually.  egcs-1.0.3's ld
            # wrapper does this.

-           # All Solaris versions of ld I've seen contain the magic
+           # Most Solaris versions of ld I've seen contain the magic

            # string used in the grep.
            :
            # string used in the grep.
            :

+       elif echo "$verbose" | grep "Solaris Link Editors" >/dev/null 2>&1; then
+           # However some Solaris 8 versions prior to ld 5.8-1.286 contain
+           # this string instead.
+           :

        else
            # No evidence yet of /usr/ccs/bin/ld.  Some versions
            # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but
        else
            # No evidence yet of /usr/ccs/bin/ld.  Some versions
            # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but


@@ -248,18 +284,22 @@ END
            # (This may all depend on local configurations too.)
 
            # Recompute verbose with -Wl,-v to find GNU ld if present
            # (This may all depend on local configurations too.)
 
            # Recompute verbose with -Wl,-v to find GNU ld if present

-           verbose=`${cc:-cc} -v -Wl,-v -o try try.c 2>&1 | grep ld 2>&1`
+           verbose=`${cc:-cc} $ccflags -Wl,-v -o try try.c 2>&1 | grep /ld 2>&1`

 
 

-           myld=`echo $verbose| grep ld | awk '/\/ld/ {print $1}'`
+           myld=`echo $verbose | awk '/\/ld/ {print $1}'`

            # This assumes that gcc's output will not change, and that
            # /full/path/to/ld will be the first word of the output.
            # Thus myld is something like /opt/gnu/sparc-sun-solaris2.5/bin/ld
 
            # This assumes that gcc's output will not change, and that
            # /full/path/to/ld will be the first word of the output.
            # Thus myld is something like /opt/gnu/sparc-sun-solaris2.5/bin/ld
 

-           # Allow that $myld may be '', due to changes in gcc's output 
+           # Allow that $myld may be '', due to changes in gcc's output

            if ${myld:-ld} -V 2>&1 |
                grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
                # Ok, /usr/ccs/bin/ld eventually does get called.
                :
            if ${myld:-ld} -V 2>&1 |
                grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
                # Ok, /usr/ccs/bin/ld eventually does get called.
                :

+           elif ${myld:-ld} -V 2>&1 |
+               grep "Solaris Link Editors" >/dev/null 2>&1; then
+               # Ok, /usr/ccs/bin/ld eventually does get called.
+               :

            else
                echo "Found GNU ld='$myld'" >&4
                cat <<END >&2
            else
                echo "Found GNU ld='$myld'" >&4
                cat <<END >&2


@@ -273,7 +313,7 @@ doesn't work, you should use -B/usr/ccs/bin/ instead.
 
 END
                ccdlflags="$ccdlflags -Wl,-E"
 
 END
                ccdlflags="$ccdlflags -Wl,-E"

-               lddlflags="$lddlflags -Wl,-E -G"
+               lddlflags="$lddlflags -Wl,-E -shared"

            fi
        fi
 
            fi
        fi
 


@@ -284,23 +324,43 @@ else
        cat > try.c << 'EOM'
 #include <stdio.h>
 int main() {
        cat > try.c << 'EOM'
 #include <stdio.h>
 int main() {

-#ifdef __SUNPRO_C
+#if defined(__SUNPRO_C)

        printf("workshop\n");
 #else
        printf("workshop\n");
 #else

+#if defined(__SUNPRO_CC)
+       printf("workshop CC\n");
+#else

        printf("\n");
 #endif
        printf("\n");
 #endif

+#endif

 return(0);
 }
 EOM
 return(0);
 }
 EOM

-       tryworkshopcc="${cc:-cc} try.c -o try"
+       tryworkshopcc="${cc:-cc} $ccflags try.c -o try"

        if $tryworkshopcc >/dev/null 2>&1; then
        if $tryworkshopcc >/dev/null 2>&1; then

-               cc_name=`./try`
+               cc_name=`$run ./try`

                if test "$cc_name" = "workshop"; then
                if test "$cc_name" = "workshop"; then

-                       ccversion="`${cc:-cc} -V 2>&1|sed -n -e '1s/^cc: //p'`"
+                       ccversion="`${cc:-cc} -V 2>&1|sed -n -e '1s/^[Cc][Cc]: //p'`"
+               fi
+               if test "$cc_name" = "workshop CC"; then
+                       ccversion="`${cc:-CC} -V 2>&1|sed -n -e '1s/^[Cc][C]: //p'`"
+               fi
+               case "$cc_name" in
+               workshop*)
+                       # Settings for either cc or CC

                        if test ! "$use64bitall_done"; then
                                loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth"
                        fi
                        if test ! "$use64bitall_done"; then
                                loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth"
                        fi

-               fi
+                       # Sun CC/cc don't support gcc attributes
+                       d_attribute_format='undef'
+                       d_attribute_malloc='undef'
+                       d_attribute_nonnull='undef'
+                       d_attribute_noreturn='undef'
+                       d_attribute_pure='undef'
+                       d_attribute_unused='undef'
+                       d_attribute_warn_unused_result='undef'
+                       ;;
+               esac

        fi
 
        # See if as(1) is GNU as(1).  GNU might not work for this job.
        fi
 
        # See if as(1) is GNU as(1).  GNU might not work for this job.


@@ -343,21 +403,35 @@ cat > UU/usethreads.cbu <<'EOCBU'
 # after it has prompted the user for whether to use threads.
 case "$usethreads" in
 $define|true|[yY]*)
 # after it has prompted the user for whether to use threads.
 case "$usethreads" in
 $define|true|[yY]*)

-        ccflags="-D_REENTRANT $ccflags"
-
-       sched_yield='yield'
-        set `echo X "$libswanted "| sed -e "s/ c / pthread c /"`
-        shift
-        libswanted="$*"
-
-        # On Solaris 2.6 x86 there is a bug with sigsetjmp() and siglongjmp()
-        # when linked with the threads library, such that whatever positive
-        # value you pass to siglongjmp(), sigsetjmp() returns 1.
-        # Thanks to Simon Parsons <S.Parsons@ftel.co.uk> for this report.
-        # Sun BugID is 4117946, "sigsetjmp always returns 1 when called by
-        # siglongjmp in a MT program". As of 19980622, there is no patch
-        # available.
-        cat >try.c <<'EOM'
+       ccflags="-D_REENTRANT $ccflags"
+
+       # -lpthread overrides some lib C functions, so put it before c.
+       set `echo X "$libswanted "| sed -e "s/ c / pthread c /"`
+       shift
+       libswanted="$*"
+
+       # sched_yield is available in the -lrt library.  However,
+       # we can also pick up the equivalent yield() function in the
+       # normal C library.  To avoid pulling in unnecessary
+       # libraries, we'll normally avoid sched_yield()/-lrt and
+       # just use yield().  However, we'll honor a command-line
+       # override : "-Dsched_yield=sched_yield".
+       # If we end up using sched_yield, we're going to need -lrt.
+       sched_yield=${sched_yield:-yield}
+       if test "$sched_yield" = "sched_yield"; then
+           set `echo X "$libswanted "| sed -e "s/ pthread / rt pthread /"`
+           shift
+           libswanted="$*"
+       fi
+
+       # On Solaris 2.6 x86 there is a bug with sigsetjmp() and siglongjmp()
+       # when linked with the threads library, such that whatever positive
+       # value you pass to siglongjmp(), sigsetjmp() returns 1.
+       # Thanks to Simon Parsons <S.Parsons@ftel.co.uk> for this report.
+       # Sun BugID is 4117946, "sigsetjmp always returns 1 when called by
+       # siglongjmp in a MT program". As of 19980622, there is no patch
+       # available.
+       cat >try.c <<'EOM'

        /* Test for sig(set|long)jmp bug. */
        #include <setjmp.h>
 
        /* Test for sig(set|long)jmp bug. */
        #include <setjmp.h>
 


@@ -371,17 +445,10 @@ $define|true|[yY]*)
            siglongjmp(env, 2);
        }
 EOM
            siglongjmp(env, 2);
        }
 EOM

-        if test "`arch`" = i86pc -a `uname -r` = 5.6 && \
-           ${cc:-cc} try.c -lpthread >/dev/null 2>&1 && ./a.out; then
-           d_sigsetjmp=$undef
-           cat << 'EOM' >&2
-
-You will see a *** WHOA THERE!!! ***  message from Configure for
-d_sigsetjmp.  Keep the recommended value.  See hints/solaris_2.sh
-for more information.
-
-EOM
-        fi
+       if test "`arch`" = i86pc -a `uname -r` = 5.6 && \
+          ${cc:-cc} try.c -lpthread >/dev/null 2>&1 && ./a.out; then
+           d_sigsetjmp=$undef
+       fi

 
        # These prototypes should be visible since we using
        # -D_REENTRANT, but that does not seem to work.
 
        # These prototypes should be visible since we using
        # -D_REENTRANT, but that does not seem to work.


@@ -414,9 +481,9 @@ case "$uselargefiles" in
 ''|$define|true|[yY]*)
 
 # Keep these in the left margin.
 ''|$define|true|[yY]*)
 
 # Keep these in the left margin.

-ccflags_uselargefiles="`getconf LFS_CFLAGS 2>/dev/null`"
-ldflags_uselargefiles="`getconf LFS_LDFLAGS 2>/dev/null`"
-libswanted_uselargefiles="`getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+ccflags_uselargefiles="`$run getconf LFS_CFLAGS 2>/dev/null`"
+ldflags_uselargefiles="`$run getconf LFS_LDFLAGS 2>/dev/null`"
+libswanted_uselargefiles="`$run getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`"

 
     ccflags="$ccflags $ccflags_uselargefiles"
     ldflags="$ldflags $ldflags_uselargefiles"
 
     ccflags="$ccflags $ccflags_uselargefiles"
     ldflags="$ldflags $ldflags_uselargefiles"


@@ -433,13 +500,21 @@ case "$usemorebits" in
        ;;
 esac
 
        ;;
 esac
 

-if test `uname -p` = "sparc"; then
+if test `$run uname -p` = i386; then
+    case "$use64bitint" in
+    "$define"|true|[yY]*)
+            ccflags="$ccflags -DPTR_IS_LONG"
+            ;;
+    esac
+fi
+
+if test `$run uname -p` = sparc -o `$run uname -p` = i386; then

     cat > UU/use64bitint.cbu <<'EOCBU'
 # This script UU/use64bitint.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use 64 bit integers.
 case "$use64bitint" in
 "$define"|true|[yY]*)
     cat > UU/use64bitint.cbu <<'EOCBU'
 # This script UU/use64bitint.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use 64 bit integers.
 case "$use64bitint" in
 "$define"|true|[yY]*)

-           case "`uname -r`" in
+           case "`$run uname -r`" in

            5.[0-4])
                cat >&4 <<EOM
 Solaris `uname -r|sed -e 's/^5\./2./'` does not support 64-bit integers.
            5.[0-4])
                cat >&4 <<EOM
 Solaris `uname -r|sed -e 's/^5\./2./'` does not support 64-bit integers.


@@ -451,7 +526,7 @@ EOM
 
 # gcc-2.8.1 on Solaris 8 with -Duse64bitint fails op/pat.t test 822
 # if we compile regexec.c with -O.  Turn off optimization for that one
 
 # gcc-2.8.1 on Solaris 8 with -Duse64bitint fails op/pat.t test 822
 # if we compile regexec.c with -O.  Turn off optimization for that one

-# file.  See hints/README.hints , especially 
+# file.  See hints/README.hints , especially

 # =head2 Propagating variables to config.sh, method 3.
 #  A. Dougherty  May 24, 2002
     case "${gccversion}-${optimize}" in
 # =head2 Propagating variables to config.sh, method 3.
 #  A. Dougherty  May 24, 2002
     case "${gccversion}-${optimize}" in


@@ -460,7 +535,7 @@ EOM
        case "$regexec_cflags" in
        '') echo "Disabling optimization on regexec.c for gcc $gccversion" >&4
            regexec_cflags='optimize='
        case "$regexec_cflags" in
        '') echo "Disabling optimization on regexec.c for gcc $gccversion" >&4
            regexec_cflags='optimize='

-           echo "regexec_cflags='optimize=\"\"'" >> config.sh 
+           echo "regexec_cflags='optimize=\"\"'" >> config.sh

            ;;
        esac
        ;;
            ;;
        esac
        ;;


@@ -474,7 +549,7 @@ EOCBU
 # after it has prompted the user for whether to be maximally 64 bitty.
 case "$use64bitall-$use64bitall_done" in
 "$define-"|true-|[yY]*-)
 # after it has prompted the user for whether to be maximally 64 bitty.
 case "$use64bitall-$use64bitall_done" in
 "$define-"|true-|[yY]*-)

-           case "`uname -r`" in
+           case "`$run uname -r`" in

            5.[0-6])
                cat >&4 <<EOM
 Solaris `uname -r|sed -e 's/^5\./2./'` does not support 64-bit pointers.
            5.[0-6])
                cat >&4 <<EOM
 Solaris `uname -r|sed -e 's/^5\./2./'` does not support 64-bit pointers.


@@ -483,20 +558,23 @@ EOM
                exit 1
                ;;
            esac
                exit 1
                ;;
            esac

-           libc='/usr/lib/sparcv9/libc.so'
-           if test ! -f $libc; then
-               cat >&4 <<EOM
+           processor=`$run uname -p`;
+           if test "$processor" = sparc; then
+               libc='/usr/lib/sparcv9/libc.so'
+               if test ! -f $libc; then
+                   cat >&4 <<EOM

 
 I do not see the 64-bit libc, $libc.
 Cannot continue, aborting.
 
 EOM
 
 I do not see the 64-bit libc, $libc.
 Cannot continue, aborting.
 
 EOM

-               exit 1
+                   exit 1
+               fi

            fi
            case "${cc:-cc} -v 2>/dev/null" in
            *gcc*)
                echo 'int main() { return 0; }' > try.c
            fi
            case "${cc:-cc} -v 2>/dev/null" in
            *gcc*)
                echo 'int main() { return 0; }' > try.c

-               case "`${cc:-cc} -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in
+               case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in

                *"m64 is not supported"*)
                    cat >&4 <<EOM
 
                *"m64 is not supported"*)
                    cat >&4 <<EOM
 


@@ -510,27 +588,56 @@ EOM
                    exit 1
                    ;;
                esac
                    exit 1
                    ;;
                esac

-               loclibpth="/usr/lib/sparcv9 $loclibpth"
-               ccflags="$ccflags -mcpu=v9 -m64"
-               if test X`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then
-                   # This adds in -Wa,-xarch=v9.  I suspect that's superfluous,
-                   # since the -m64 above should do that already.  Someone
-                   # with gcc-3.x.x, please test with gcc -v.   A.D. 20-Nov-2003
-                   ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+               if test "$processor" = sparc; then
+                   loclibpth="/usr/lib/sparcv9 $loclibpth"
+                   ccflags="$ccflags -mcpu=v9"

                fi
                fi

+               ccflags="$ccflags -m64"
+
+               # This adds in -Wa,-xarch=v9.  I suspect that's superfluous,
+               # since the -m64 above should do that already.  Someone
+               # with gcc-3.x.x, please test with gcc -v.   A.D. 20-Nov-2003
+#              if test $processor = sparc -a X`$run getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then
+#                  ccflags="$ccflags -Wa,`$run getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+#              fi

                ldflags="$ldflags -m64"
                ldflags="$ldflags -m64"

-               lddlflags="$lddlflags -G -m64"
+
+               # See [perl #66604]:  On Solaris 11, gcc -m64 on amd64
+               # appears not to understand -G.  (gcc -G has not caused
+               # problems on other platforms in the past.)  gcc versions
+               # at least as old as 3.4.3 support -shared, so just
+               # use that with Solaris 11 and later, but keep
+               # the old behavior for older Solaris versions.
+               case "$osvers" in
+                       2.?|2.10) lddlflags="$lddlflags -G -m64" ;;
+                       *) lddlflags="$lddlflags -shared -m64" ;;
+               esac

                ;;
            *)
                ;;
            *)

-               ccflags="$ccflags `getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
-               ldflags="$ldflags `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
-               lddlflags="$lddlflags -G `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
+               getconfccflags="`$run getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+               getconfldflags="`$run getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
+               getconflddlflags="`$run getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
+               echo "int main() { return(0); } " > try.c
+               case "`${cc:-cc} $getconfccflags try.c 2>&1 | grep 'deprecated'`" in
+               *" -xarch=generic64 is deprecated, use -m64 "*)
+                   getconfccflags=`echo $getconfccflags | sed -e 's/xarch=generic64/m64/'`
+                   getconfldflags=`echo $getconfldflags | sed -e 's/xarch=generic64/m64/'`
+                   getconflddlflags=`echo $getconflddlflags | sed -e 's/xarch=generic64/m64/'`
+                   ;;
+               esac
+               ccflags="$ccflags $getconfccflags"
+               ldflags="$ldflags $getconfldflags"
+               lddlflags="$lddlflags -G $getconflddlflags"
+

                echo "int main() { return(0); } " > try.c
                tryworkshopcc="${cc:-cc} try.c -o try $ccflags"
                echo "int main() { return(0); } " > try.c
                tryworkshopcc="${cc:-cc} try.c -o try $ccflags"

-               loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 `$getworkshoplibs` $loclibpth"
+               if test "$processor" = sparc; then
+                   loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 $loclibpth"
+               fi
+               loclibpth="`$getworkshoplibs` $loclibpth"

                ;;
            esac
                ;;
            esac

-
+           unset processor

            use64bitall_done=yes
            archname64=64
            ;;
            use64bitall_done=yes
            archname64=64
            ;;


@@ -573,4 +680,33 @@ EOM
 esac
 EOCBU
 
 esac
 EOCBU
 

+#
+# If unsetenv is available, use it in conjunction with PERL_USE_SAFE_PUTENV to
+# work around Sun bugid 6333830.  Both unsetenv and 6333830 only appear in
+# Solaris 10, so we don't need to probe explicitly for an OS version.  We have
+# to append this test to the end of config.over as it needs to run after
+# Configure has probed for unsetenv, and this hints file is processed before
+# that has happened.
+#
+cat >> config.over <<'EOOVER'
+if test "$d_unsetenv" = "$define" -a \
+    `expr "$ccflags" : '.*-DPERL_USE_SAFE_PUTENV'` -eq 0; then
+        ccflags="$ccflags -DPERL_USE_SAFE_PUTENV"
+fi
+EOOVER
+

 rm -f try.c try.o try a.out
 rm -f try.c try.o try a.out

+
+# If using C++, the Configure scan for dlopen() will fail in Solaris
+# because one of the two (1) an extern "C" linkage definition is needed
+# (2) #include <dlfcn.h> is needed, *and* a cast to (void*(*)())
+# is needed for the &dlopen.  Adding any of these would require changing
+# a delicate spot in Configure, so easier just to force our guess here
+# for Solaris.  Much the same goes for dlerror().
+case "$cc" in
+*g++*|*CC*)
+  d_dlopen='define'
+  d_dlerror='define'
+  ;;
+esac
+