Bugzilla Bug 303169: worked around a link error with gcc on Solaris SPARC
authorwtchang%redhat.com
Thu, 04 Aug 2005 02:04:39 +0000
changeset 3425 634d9890f9616343c0c24a3aedf52a5c2c9c4f28
parent 3423 6329fead4be42a58b754330e292052b1ecd23070
child 3426 84f0079e5240096b928c10d73f8d5435b835d8de
push idunknown
push userunknown
push dateunknown
bugs303169
Bugzilla Bug 303169: worked around a link error with gcc on Solaris SPARC in debug builds. os_SunOS.s is only used by the _PR_GLOBAL_THREADS_ONLY configuration, so we don't use it in the default (pthreads) configuration. r=jpierre.
configure
configure.in
--- a/configure
+++ b/configure
@@ -5632,19 +5632,21 @@ EOF
 
         if test "$OS_TEST" = "i86pc"; then
             if test -n "$USE_64"; then
                PR_MD_ASFILES=os_SunOS_x86_64.s
             else
                PR_MD_ASFILES=os_SunOS_x86.s
             fi
         else
-            PR_MD_ASFILES=os_SunOS.s
             if test -n "$USE_64"; then
-                PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS_sparcv9.s"
+                PR_MD_ASFILES=os_SunOS_sparcv9.s
+            fi
+            if test -n "$USE_NATIVE_THREADS"; then
+                PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS.s"
             fi
         fi
     fi
     ;;
 *-nto*)
     if test -n "$USE_PTHREADS"; then
         cat >> confdefs.h <<\EOF
 #define _PR_HAVE_GETHOST_R 1
--- a/configure.in
+++ b/configure.in
@@ -2488,19 +2488,21 @@ case "$target" in
         AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
         if test "$OS_TEST" = "i86pc"; then
             if test -n "$USE_64"; then
                PR_MD_ASFILES=os_SunOS_x86_64.s
             else
                PR_MD_ASFILES=os_SunOS_x86.s
             fi
         else
-            PR_MD_ASFILES=os_SunOS.s
             if test -n "$USE_64"; then
-                PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS_sparcv9.s"
+                PR_MD_ASFILES=os_SunOS_sparcv9.s
+            fi
+            if test -n "$USE_NATIVE_THREADS"; then
+                PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS.s"
             fi
         fi
     fi
     ;;
 *-nto*)
     if test -n "$USE_PTHREADS"; then
         AC_DEFINE(_PR_HAVE_GETHOST_R)
         AC_DEFINE(_PR_HAVE_GETHOST_R_POINTER)