Re: Patch for libstdc++-v3 cross build on hpux (Resubmit^2)

[Phil Edwards <phil at jaj dot com>]

On Wed, Jun 05, 2002 at 10:42:19AM -0700, Steve Ellcey wrote:
> I am submitting this patch for the third time because it wasn't accepted
> or rejected or commented on or checked in after the last submit
> (http://gcc.gnu.org/ml/gcc-patches/2002-03/msg01731.html).
> 
> I have a copyright assignment on file but no write permission.  This
> patch only affects cross builds of libstdc++ that target HP-UX.  If
> someone could check it in I would appreciate it.

Steve,

I'd said that I would check in this patch after I found a cleaner way
to express the growing cross-compile shell spaghetti in configure.in.
Well, I couldn't find an alternative that wasn't equally messy.  So no
real cleanup after all.  Sigh.

I had to apply your patch by hand, since the comments I /did/ add changed
the line numbers beyond gpatch's ability to cope.  What got checked in is
below, if you'll take a look at it and check that I didn't hork anything.

Should this patch also go onto the 3.1 branch?  It would make sense if cross
builds to HPUX on the branch are in the same state as they are on the trunk.


Thanks for waiting so long!

Phil


2002-06-19  Steve Ellcey  <sje@cup.hp.com>

	* configure.in (HAVE_FINITE*, HAVE_ISINF*, HAVE_ISNAN*):  Remove
	definitions in hpux11 cross-build because these functions do
	not exist on hpux11 (but some exist on hpux10); move defaults out
	into existing sections.
	* configure:  Regenerate.


Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.96
diff -u -3 -p -r1.96 configure.in
--- configure.in	18 Jun 2002 19:07:06 -0000	1.96
+++ configure.in	19 Jun 2002 20:24:38 -0000
@@ -116,13 +116,21 @@ if test -n "$with_cross_host" || test x"
       GLIBCPP_CHECK_WCHAR_T_SUPPORT
       AC_DEFINE(HAVE_COPYSIGN)
       AC_DEFINE(HAVE_COPYSIGNF)
+      AC_DEFINE(HAVE_FINITE)
       AC_DEFINE(HAVE_FINITEF)
       AC_DEFINE(HAVE_FREXPF)
       AC_DEFINE(HAVE_HYPOTF)
+      AC_DEFINE(HAVE_ISINF)
+      AC_DEFINE(HAVE_ISINFF)
+      AC_DEFINE(HAVE_ISNAN)
+      AC_DEFINE(HAVE_ISNANF)
       AC_DEFINE(HAVE_SINCOS)
       AC_DEFINE(HAVE_SINCOSF)
       if test x"long_double_math_on_this_cpu" = x"yes"; then
+        AC_DEFINE(HAVE_FINITEL)
         AC_DEFINE(HAVE_HYPOTL)
+        AC_DEFINE(HAVE_ISINFL)
+        AC_DEFINE(HAVE_ISNANL)
       fi
       ;;
     *-hpux*)
@@ -138,11 +146,19 @@ if test -n "$with_cross_host" || test x"
       os_include_dir="os/hpux"
       AC_DEFINE(HAVE_COPYSIGN)
       AC_DEFINE(HAVE_COPYSIGNF)
-      AC_DEFINE(HAVE_FINITEF)
       AC_DEFINE(HAVE_FREXPF)
       AC_DEFINE(HAVE_HYPOT)
-      AC_DEFINE(HAVE_SINCOS)
-      AC_DEFINE(HAVE_SINCOSF)
+      case "$target_alias" in
+        *-hpux10*)
+          AC_DEFINE(HAVE_FINITE)
+          AC_DEFINE(HAVE_FINITEF)
+          AC_DEFINE(HAVE_ISINF)
+          AC_DEFINE(HAVE_ISINFF)
+          AC_DEFINE(HAVE_ISNAN)
+          AC_DEFINE(HAVE_ISNANF)
+          ;;
+      esac
+
       ;;
     *-netbsd*)
       # Check for available headers.
@@ -158,8 +174,18 @@ if test -n "$with_cross_host" || test x"
       AC_DEFINE(HAVE_COPYSIGN)
       AC_DEFINE(HAVE_COPYSIGNF)
       AC_DEFINE(HAVE_FINITEF)
+      AC_DEFINE(HAVE_FINITE)
       AC_DEFINE(HAVE_FREXPF)
       AC_DEFINE(HAVE_HYPOTF)
+      AC_DEFINE(HAVE_ISINF)
+      AC_DEFINE(HAVE_ISINFF)
+      AC_DEFINE(HAVE_ISNAN)
+      AC_DEFINE(HAVE_ISNANF)
+      if test x"long_double_math_on_this_cpu" = x"yes"; then
+        AC_DEFINE(HAVE_FINITEL)
+        AC_DEFINE(HAVE_ISINFL)
+        AC_DEFINE(HAVE_ISNANL)
+      fi
       ;;
     *-mingw32*)
       AC_CHECK_HEADERS([sys/types.h locale.h float.h])
@@ -246,15 +272,9 @@ changequote([,])dnl
       AC_DEFINE(HAVE_COSHF)
       AC_DEFINE(HAVE_EXPF)
       AC_DEFINE(HAVE_FABSF)
-      AC_DEFINE(HAVE_FINITE)
-      AC_DEFINE(HAVE_FINITEF)
       AC_DEFINE(HAVE_FLOORF)
       AC_DEFINE(HAVE_FMODF)
       AC_DEFINE(HAVE_FREXPF)
-      AC_DEFINE(HAVE_ISINF)
-      AC_DEFINE(HAVE_ISINFF)
-      AC_DEFINE(HAVE_ISNAN)
-      AC_DEFINE(HAVE_ISNANF)
       AC_DEFINE(HAVE_LDEXPF)
       AC_DEFINE(HAVE_LOG10F)
       AC_DEFINE(HAVE_LOGF)
@@ -282,12 +302,9 @@ changequote([,])dnl
     AC_DEFINE(HAVE_COSHL)
     AC_DEFINE(HAVE_EXPL)
     AC_DEFINE(HAVE_FABSL)
-    AC_DEFINE(HAVE_FINITEL)
     AC_DEFINE(HAVE_FLOORL)
     AC_DEFINE(HAVE_FMODL)
     AC_DEFINE(HAVE_FREXPL)
-    AC_DEFINE(HAVE_ISINFL)
-    AC_DEFINE(HAVE_ISNANL)
     AC_DEFINE(HAVE_LDEXPL)
     AC_DEFINE(HAVE_LOG10L)
     AC_DEFINE(HAVE_LOGL)