FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[multiple changes]

Browse source 
Fri May 28 22:20:03 1999  Anthony Green  <green@cygnus.com>
	* java/lang/fdlibm.h: Don't use __uint32_t.  Include mprec.h.
	* java/lang/e_log.c: Don't use __uint32_t.
1999-05-27  Eric Christopher <echristo@cygnus.com>
	* configure: Rebuilt
	* configure.in: Fixed ISO C9X and namespace collision with __uint32_t
	* acconfig.h: Rebuilt
	* include/config.h.in: Rebuilt
	* java/lang/mprec.h, java/lang/e_acos.c, java/lang/e_asin.c,
 	java/lang/e_atan2.c, java/lang/e_exp.c, java/lang/e_fmod.c,
 	e_log.c, java/lang/e_pow.c, java/lang/e_rem_pio2.c,
 	java/lang/e_remainder.c, java/lang/e_sqrt.c, java/lang/fdlibm.h,
 	k_tan.c, java/lang/mprec.h, java/lang/s_atan.c,
 	java/lang/s_ceil.c, java/lang/s_copysign.c, java/lang/s_fabs.c,
 	s_floor.c, java/lang/s_rint.c, java/lang/sf_rint.c: Fixed ISO C9X
 	and namespace collision with __uint32_t

From-SVN: r27729
This commit is contained in:
Tom Tromey 1999-06-24 20:06:09 +00:00
parent fe574d5d92
commit 0d16618c58
31 changed files with 614 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libjava/ChangeLog
View file

@ -1,3 +1,24 @@
Fri May 28 22:20:03 1999 Anthony Green <green@cygnus.com>
* java/lang/fdlibm.h: Don't use __uint32_t. Include mprec.h.
* java/lang/e_log.c: Don't use __uint32_t.
1999-05-27 Eric Christopher <echristo@cygnus.com>
* configure: Rebuilt
* configure.in: Fixed ISO C9X and namespace collision with __uint32_t
* acconfig.h: Rebuilt
* include/config.h.in: Rebuilt
* java/lang/mprec.h, java/lang/e_acos.c, java/lang/e_asin.c,
java/lang/e_atan2.c, java/lang/e_exp.c, java/lang/e_fmod.c,
e_log.c, java/lang/e_pow.c, java/lang/e_rem_pio2.c,
java/lang/e_remainder.c, java/lang/e_sqrt.c, java/lang/fdlibm.h,
k_tan.c, java/lang/mprec.h, java/lang/s_atan.c,
java/lang/s_ceil.c, java/lang/s_copysign.c, java/lang/s_fabs.c,
s_floor.c, java/lang/s_rint.c, java/lang/sf_rint.c: Fixed ISO C9X
and namespace collision with __uint32_t
1999-06-23 Tom Tromey <tromey@cygnus.com> 1999-06-23 Tom Tromey <tromey@cygnus.com>
* java/util/zip/InflaterInputStream.java (read): Throw * java/util/zip/InflaterInputStream.java (read): Throw

5
libjava/acconfig.h
View file

@ -28,9 +28,12 @@
/* Define if you have sleep. */ /* Define if you have sleep. */
#undef HAVE_SLEEP #undef HAVE_SLEEP
/* Define if you have __int32_t and __uint32_t. */ /* Define if you have int32_t and uint32_t. */
#undef HAVE_INT32_DEFINED #undef HAVE_INT32_DEFINED
/* Define if you have u_int32_t */
#undef HAVE_BSD_INT32_DEFINED
/* Define if you're running eCos. */ /* Define if you're running eCos. */
#undef ECOS #undef ECOS

255
libjava/configure vendored
View file

@ -2707,10 +2707,10 @@ echo "$ac_t""$CPP" 1>&6
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2709 "configure" #line 2709 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <stdint.h>
EOF EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "__uint32_t" >/dev/null 2>&1; then egrep "uint32_t" >/dev/null 2>&1; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_INT32_DEFINED 1 #define HAVE_INT32_DEFINED 1
@ -2722,10 +2722,10 @@ rm -f conftest*
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2724 "configure" #line 2724 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/config.h> #include <inttypes.h>
EOF EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "__uint32_t" >/dev/null 2>&1; then egrep "uint32_t" >/dev/null 2>&1; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_INT32_DEFINED 1 #define HAVE_INT32_DEFINED 1
@ -2734,9 +2734,40 @@ EOF
fi fi
rm -f conftest* rm -f conftest*
cat > conftest.$ac_ext <<EOF
#line 2739 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "u_int32_t" >/dev/null 2>&1; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_BSD_INT32_DEFINED 1
EOF
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2740 "configure" #line 2754 "configure"
#include "confdefs.h"
#include <sys/config.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "u_int32_t" >/dev/null 2>&1; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_BSD_INT32_DEFINED 1
EOF
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
#line 2771 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <time.h> #include <time.h>
EOF EOF
@ -2751,7 +2782,7 @@ fi
rm -f conftest* rm -f conftest*
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2755 "configure" #line 2786 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <time.h> #include <time.h>
EOF EOF
@ -2789,7 +2820,7 @@ ZLIBSPEC=
libsubdir=.libs libsubdir=.libs
echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6 echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6
echo "configure:2793: checking for garbage collector to use" >&5 echo "configure:2824: checking for garbage collector to use" >&5
# Check whether --enable-java-gc or --disable-java-gc was given. # Check whether --enable-java-gc or --disable-java-gc was given.
if test "${enable_java_gc+set}" = set; then if test "${enable_java_gc+set}" = set; then
enableval="$enable_java_gc" enableval="$enable_java_gc"
@ -2839,7 +2870,7 @@ esac
echo $ac_n "checking for threads package to use""... $ac_c" 1>&6 echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
echo "configure:2843: checking for threads package to use" >&5 echo "configure:2874: checking for threads package to use" >&5
# Check whether --enable-threads or --disable-threads was given. # Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then if test "${enable_threads+set}" = set; then
enableval="$enable_threads" enableval="$enable_threads"
@ -3031,12 +3062,12 @@ else
for ac_func in strerror ioctl select open fsync sleep for ac_func in strerror ioctl select open fsync sleep
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3035: checking for $ac_func" >&5 echo "configure:3066: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3040 "configure" #line 3071 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3059,7 +3090,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3086,12 +3117,12 @@ done
for ac_func in ctime_r ctime for ac_func in ctime_r ctime
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3090: checking for $ac_func" >&5 echo "configure:3121: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3095 "configure" #line 3126 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3114,7 +3145,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3141,12 +3172,12 @@ done
for ac_func in gmtime_r localtime_r readdir_r getpwuid_r for ac_func in gmtime_r localtime_r readdir_r getpwuid_r
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3145: checking for $ac_func" >&5 echo "configure:3176: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3150 "configure" #line 3181 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3169,7 +3200,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3196,12 +3227,12 @@ done
for ac_func in access stat mkdir rename rmdir unlink realpath for ac_func in access stat mkdir rename rmdir unlink realpath
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3200: checking for $ac_func" >&5 echo "configure:3231: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3205 "configure" #line 3236 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3224,7 +3255,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3251,12 +3282,12 @@ done
for ac_func in inet_aton inet_addr for ac_func in inet_aton inet_addr
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3255: checking for $ac_func" >&5 echo "configure:3286: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3260 "configure" #line 3291 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3279,7 +3310,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3306,12 +3337,12 @@ done
for ac_func in inet_pton uname for ac_func in inet_pton uname
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3310: checking for $ac_func" >&5 echo "configure:3341: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3315 "configure" #line 3346 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3334,7 +3365,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3362,12 +3393,12 @@ done
for ac_func in gethostbyname_r for ac_func in gethostbyname_r
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3366: checking for $ac_func" >&5 echo "configure:3397: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3371 "configure" #line 3402 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3390,7 +3421,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3417,7 +3448,7 @@ EOF
# We look for the one that returns `int'. # We look for the one that returns `int'.
# Hopefully this check is robust enough. # Hopefully this check is robust enough.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3421 "configure" #line 3452 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <netdb.h> #include <netdb.h>
EOF EOF
@ -3441,12 +3472,12 @@ done
for ac_func in gethostbyaddr_r for ac_func in gethostbyaddr_r
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3445: checking for $ac_func" >&5 echo "configure:3476: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3450 "configure" #line 3481 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3469,7 +3500,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3496,7 +3527,7 @@ EOF
# We look for the one that returns `int'. # We look for the one that returns `int'.
# Hopefully this check is robust enough. # Hopefully this check is robust enough.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3500 "configure" #line 3531 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <netdb.h> #include <netdb.h>
EOF EOF
@ -3520,12 +3551,12 @@ done
for ac_func in gethostname for ac_func in gethostname
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3524: checking for $ac_func" >&5 echo "configure:3555: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3529 "configure" #line 3560 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3548,7 +3579,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3572,7 +3603,7 @@ EOF
EOF EOF
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3576 "configure" #line 3607 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <unistd.h> #include <unistd.h>
EOF EOF
@ -3599,12 +3630,12 @@ done
for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np sched_yield for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np sched_yield
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3603: checking for $ac_func" >&5 echo "configure:3634: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3608 "configure" #line 3639 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3627,7 +3658,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3655,12 +3686,12 @@ done
for ac_func in sched_yield for ac_func in sched_yield
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3659: checking for $ac_func" >&5 echo "configure:3690: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3664 "configure" #line 3695 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3683,7 +3714,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3705,7 +3736,7 @@ EOF
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
echo "configure:3709: checking for sched_yield in -lposix4" >&5 echo "configure:3740: checking for sched_yield in -lposix4" >&5
ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -3713,7 +3744,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS" LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3717 "configure" #line 3748 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -3724,7 +3755,7 @@ int main() {
sched_yield() sched_yield()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -3759,12 +3790,12 @@ done
for ac_func in gettimeofday time ftime for ac_func in gettimeofday time ftime
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3763: checking for $ac_func" >&5 echo "configure:3794: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3768 "configure" #line 3799 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3787,7 +3818,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3820,12 +3851,12 @@ done
for ac_func in memmove for ac_func in memmove
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3824: checking for $ac_func" >&5 echo "configure:3855: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3829 "configure" #line 3860 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3848,7 +3879,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3881,12 +3912,12 @@ done
for ac_func in memcpy for ac_func in memcpy
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3885: checking for $ac_func" >&5 echo "configure:3916: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3890 "configure" #line 3921 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -3909,7 +3940,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -3957,7 +3988,7 @@ done
#-------------------------------------------------------------------- #--------------------------------------------------------------------
echo $ac_n "checking for socket libraries""... $ac_c" 1>&6 echo $ac_n "checking for socket libraries""... $ac_c" 1>&6
echo "configure:3961: checking for socket libraries" >&5 echo "configure:3992: checking for socket libraries" >&5
if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3965,12 +3996,12 @@ else
gcj_checkBoth=0 gcj_checkBoth=0
unset ac_cv_func_connect unset ac_cv_func_connect
echo $ac_n "checking for connect""... $ac_c" 1>&6 echo $ac_n "checking for connect""... $ac_c" 1>&6
echo "configure:3969: checking for connect" >&5 echo "configure:4000: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3974 "configure" #line 4005 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */ which can conflict with char connect(); below. */
@ -3993,7 +4024,7 @@ connect();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_connect=yes" eval "ac_cv_func_connect=yes"
else else
@ -4016,7 +4047,7 @@ fi
if test "$gcj_checkSocket" = 1; then if test "$gcj_checkSocket" = 1; then
unset ac_cv_func_connect unset ac_cv_func_connect
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
echo "configure:4020: checking for main in -lsocket" >&5 echo "configure:4051: checking for main in -lsocket" >&5
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -4024,14 +4055,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS" LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4028 "configure" #line 4059 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -4058,12 +4089,12 @@ fi
LIBS="$LIBS -lsocket -lnsl" LIBS="$LIBS -lsocket -lnsl"
unset ac_cv_func_accept unset ac_cv_func_accept
echo $ac_n "checking for accept""... $ac_c" 1>&6 echo $ac_n "checking for accept""... $ac_c" 1>&6
echo "configure:4062: checking for accept" >&5 echo "configure:4093: checking for accept" >&5
if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4067 "configure" #line 4098 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char accept(); below. */ which can conflict with char accept(); below. */
@ -4086,7 +4117,7 @@ accept();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_accept=yes" eval "ac_cv_func_accept=yes"
else else
@ -4113,12 +4144,12 @@ fi
gcj_oldLibs=$LIBS gcj_oldLibs=$LIBS
LIBS="$LIBS $gcj_cv_lib_sockets" LIBS="$LIBS $gcj_cv_lib_sockets"
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
echo "configure:4117: checking for gethostbyname" >&5 echo "configure:4148: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4122 "configure" #line 4153 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */ which can conflict with char gethostbyname(); below. */
@ -4141,7 +4172,7 @@ gethostbyname();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes" eval "ac_cv_func_gethostbyname=yes"
else else
@ -4159,7 +4190,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
echo "configure:4163: checking for main in -lnsl" >&5 echo "configure:4194: checking for main in -lnsl" >&5
ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -4167,14 +4198,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS" LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4171 "configure" #line 4202 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -4206,7 +4237,7 @@ echo "$ac_t""$gcj_cv_lib_sockets" 1>&6
if test "$with_system_zlib" = yes; then if test "$with_system_zlib" = yes; then
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
echo "configure:4210: checking for deflate in -lz" >&5 echo "configure:4241: checking for deflate in -lz" >&5
ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -4214,7 +4245,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS" LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4218 "configure" #line 4249 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -4225,7 +4256,7 @@ int main() {
deflate() deflate()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -4254,7 +4285,7 @@ fi
# requires -ldl. # requires -ldl.
if test "$GC" = boehm; then if test "$GC" = boehm; then
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
echo "configure:4258: checking for main in -ldl" >&5 echo "configure:4289: checking for main in -ldl" >&5
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -4262,14 +4293,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS" LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4266 "configure" #line 4297 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -4374,21 +4405,21 @@ EOF
for ac_hdr in unistd.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h for ac_hdr in unistd.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h inttypes.h stdint.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:4382: checking for $ac_hdr" >&5 echo "configure:4413: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4387 "configure" #line 4418 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:4423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -4418,17 +4449,17 @@ for ac_hdr in dirent.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:4422: checking for $ac_hdr" >&5 echo "configure:4453: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4427 "configure" #line 4458 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:4463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -4456,16 +4487,16 @@ done
echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6 echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
echo "configure:4460: checking whether struct sockaddr_in6 is in netinet/in.h" >&5 echo "configure:4491: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4462 "configure" #line 4493 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <netinet/in.h> #include <netinet/in.h>
int main() { int main() {
struct sockaddr_in6 addr6; struct sockaddr_in6 addr6;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_INET6 1 #define HAVE_INET6 1
@ -4481,16 +4512,16 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
echo "configure:4485: checking for socklen_t in sys/socket.h" >&5 echo "configure:4516: checking for socklen_t in sys/socket.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4487 "configure" #line 4518 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/socket.h> #include <sys/socket.h>
int main() { int main() {
socklen_t x = 5; socklen_t x = 5;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_SOCKLEN_T 1 #define HAVE_SOCKLEN_T 1
@ -4506,16 +4537,16 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
echo "configure:4510: checking for tm_gmtoff in struct tm" >&5 echo "configure:4541: checking for tm_gmtoff in struct tm" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4512 "configure" #line 4543 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <time.h> #include <time.h>
int main() { int main() {
struct tm tim; tim.tm_gmtoff = 0; struct tm tim; tim.tm_gmtoff = 0;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define STRUCT_TM_HAS_GMTOFF 1 #define STRUCT_TM_HAS_GMTOFF 1
@ -4528,16 +4559,16 @@ else
rm -rf conftest* rm -rf conftest*
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
echo "configure:4532: checking for global timezone variable" >&5 echo "configure:4563: checking for global timezone variable" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4534 "configure" #line 4565 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <time.h> #include <time.h>
int main() { int main() {
long z2 = timezone; long z2 = timezone;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_TIMEZONE 1 #define HAVE_TIMEZONE 1
@ -4557,19 +4588,19 @@ rm -f conftest*
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless! # for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
echo "configure:4561: checking for working alloca.h" >&5 echo "configure:4592: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4566 "configure" #line 4597 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <alloca.h> #include <alloca.h>
int main() { int main() {
char *p = alloca(2 * sizeof(int)); char *p = alloca(2 * sizeof(int));
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_header_alloca_h=yes ac_cv_header_alloca_h=yes
else else
@ -4590,12 +4621,12 @@ EOF
fi fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6 echo $ac_n "checking for alloca""... $ac_c" 1>&6
echo "configure:4594: checking for alloca" >&5 echo "configure:4625: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4599 "configure" #line 4630 "configure"
#include "confdefs.h" #include "confdefs.h"
#ifdef __GNUC__ #ifdef __GNUC__
@ -4623,7 +4654,7 @@ int main() {
char *p = (char *) alloca(1); char *p = (char *) alloca(1);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_func_alloca_works=yes ac_cv_func_alloca_works=yes
else else
@ -4655,12 +4686,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
echo "configure:4659: checking whether alloca needs Cray hooks" >&5 echo "configure:4690: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4664 "configure" #line 4695 "configure"
#include "confdefs.h" #include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2) #if defined(CRAY) && ! defined(CRAY2)
webecray webecray
@ -4685,12 +4716,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:4689: checking for $ac_func" >&5 echo "configure:4720: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4694 "configure" #line 4725 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -4713,7 +4744,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -4740,7 +4771,7 @@ done
fi fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
echo "configure:4744: checking stack direction for C alloca" >&5 echo "configure:4775: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -4748,7 +4779,7 @@ else
ac_cv_c_stack_direction=0 ac_cv_c_stack_direction=0
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4752 "configure" #line 4783 "configure"
#include "confdefs.h" #include "confdefs.h"
find_stack_direction () find_stack_direction ()
{ {
@ -4767,7 +4798,7 @@ main ()
exit (find_stack_direction() < 0); exit (find_stack_direction() < 0);
} }
EOF EOF
if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:4802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_c_stack_direction=1 ac_cv_c_stack_direction=1
else else
@ -4794,7 +4825,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:4798: checking for $ac_word" >&5 echo "configure:4829: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else

9
libjava/configure.in
View file

@ -64,8 +64,11 @@ case "$TARGET_ECOS" in
;; ;;
esac esac
AC_EGREP_HEADER(__uint32_t, sys/types.h, AC_DEFINE(HAVE_INT32_DEFINED)) AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED))
AC_EGREP_HEADER(__uint32_t, sys/config.h, AC_DEFINE(HAVE_INT32_DEFINED)) AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED))
AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED))
AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED))
dnl These may not be defined in a non-ANS conformant embedded system. dnl These may not be defined in a non-ANS conformant embedded system.
dnl FIXME: Should these case a runtime exception in that case? dnl FIXME: Should these case a runtime exception in that case?
@ -466,7 +469,7 @@ AC_SUBST(AM_RUNTESTFLAGS)
dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there. dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
dnl On that system, sys/ioctl.h will not include sys/filio.h unless dnl On that system, sys/ioctl.h will not include sys/filio.h unless
dnl BSD_COMP is defined; just including sys/filio.h is simpler. dnl BSD_COMP is defined; just including sys/filio.h is simpler.
AC_CHECK_HEADERS(unistd.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h) AC_CHECK_HEADERS(unistd.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h inttypes.h stdint.h)
dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h
dnl for now. If you change this, you also must update natFile.cc. dnl for now. If you change this, you also must update natFile.cc.
AC_CHECK_HEADERS(dirent.h) AC_CHECK_HEADERS(dirent.h)

14
libjava/include/config.h.in
View file

@ -40,9 +40,12 @@
/* Define if you have strerror. */ /* Define if you have strerror. */
#undef HAVE_STRERROR #undef HAVE_STRERROR
/* Define if you have __int32_t and __uint32_t. */ /* Define if you have int32_t and uint32_t. */
#undef HAVE_INT32_DEFINED #undef HAVE_INT32_DEFINED
/* Define if you have u_int32_t */
#undef HAVE_BSD_INT32_DEFINED
/* Define if you're running eCos. */ /* Define if you're running eCos. */
#undef ECOS #undef ECOS
@ -214,6 +217,9 @@
/* Define if you have the <fcntl.h> header file. */ /* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* Define if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if you have the <netdb.h> header file. */ /* Define if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H #undef HAVE_NETDB_H
@ -223,6 +229,12 @@
/* Define if you have the <pwd.h> header file. */ /* Define if you have the <pwd.h> header file. */
#undef HAVE_PWD_H #undef HAVE_PWD_H
/* Define if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define if you have the <sys/config.h> header file. */
#undef HAVE_SYS_CONFIG_H
/* Define if you have the <sys/filio.h> header file. */ /* Define if you have the <sys/filio.h> header file. */
#undef HAVE_SYS_FILIO_H #undef HAVE_SYS_FILIO_H

4
libjava/java/lang/dtoa.c
View file

@ -679,7 +679,7 @@ _DEFUN (_dtoa_r,
{ {
if (!word1 (d) && !(word0 (d) & Bndry_mask) if (!word1 (d) && !(word0 (d) & Bndry_mask)
#ifndef Sudden_Underflow #ifndef Sudden_Underflow
&& word0 (d) & Exp_mask && word0(d) & Exp_mask
#endif #endif
) )
{ {
@ -902,5 +902,3 @@ _DEFUN (_dtoa,
return; return;
} }

4
libjava/java/lang/e_acos.c
View file

@ -67,11 +67,11 @@ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
#endif #endif
{ {
double z,p,q,r,w,s,c,df; double z,p,q,r,w,s,c,df;
__int32_t hx,ix; int32_t hx,ix;
GET_HIGH_WORD(hx,x); GET_HIGH_WORD(hx,x);
ix = hx&0x7fffffff; ix = hx&0x7fffffff;
if(ix>=0x3ff00000) { /* |x| >= 1 */ if(ix>=0x3ff00000) { /* |x| >= 1 */
__uint32_t lx; uint32_t lx;
GET_LOW_WORD(lx,x); GET_LOW_WORD(lx,x);
if(((ix-0x3ff00000)|lx)==0) { /* |x|==1 */ if(((ix-0x3ff00000)|lx)==0) { /* |x|==1 */
if(hx>0) return 0.0; /* acos(1) = 0 */ if(hx>0) return 0.0; /* acos(1) = 0 */

6
libjava/java/lang/e_atan2.c
View file

@ -63,8 +63,8 @@ pi_lo = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */
#endif #endif
{ {
double z; double z;
__int32_t k,m,hx,hy,ix,iy; int32_t k,m,hx,hy,ix,iy;
__uint32_t lx,ly; uint32_t lx,ly;
EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hx,lx,x);
ix = hx&0x7fffffff; ix = hx&0x7fffffff;
@ -117,7 +117,7 @@ pi_lo = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */
switch (m) { switch (m) {
case 0: return z ; /* atan(+,+) */ case 0: return z ; /* atan(+,+) */
case 1: { case 1: {
__uint32_t zh; uint32_t zh;
GET_HIGH_WORD(zh,z); GET_HIGH_WORD(zh,z);
SET_HIGH_WORD(z,zh ^ 0x80000000); SET_HIGH_WORD(z,zh ^ 0x80000000);
} }

10
libjava/java/lang/e_exp.c
View file

@ -109,8 +109,8 @@ P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */
#endif #endif
{ {
double y,hi,lo,c,t; double y,hi,lo,c,t;
__int32_t k,xsb; int32_t k,xsb;
__uint32_t hx; uint32_t hx;
GET_HIGH_WORD(hx,x); GET_HIGH_WORD(hx,x);
xsb = (hx>>31)&1; /* sign bit of x */ xsb = (hx>>31)&1; /* sign bit of x */
@ -119,7 +119,7 @@ P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */
/* filter out non-finite argument */ /* filter out non-finite argument */
if(hx >= 0x40862E42) { /* if |x|>=709.78... */ if(hx >= 0x40862E42) { /* if |x|>=709.78... */
if(hx>=0x7ff00000) { if(hx>=0x7ff00000) {
__uint32_t lx; uint32_t lx;
GET_LOW_WORD(lx,x); GET_LOW_WORD(lx,x);
if(((hx&0xfffff)|lx)!=0) if(((hx&0xfffff)|lx)!=0)
return x+x; /* NaN */ return x+x; /* NaN */
@ -152,12 +152,12 @@ P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */
if(k==0) return one-((x*c)/(c-2.0)-x); if(k==0) return one-((x*c)/(c-2.0)-x);
else y = one-((lo-(x*c)/(2.0-c))-hi); else y = one-((lo-(x*c)/(2.0-c))-hi);
if(k >= -1021) { if(k >= -1021) {
__uint32_t hy; uint32_t hy;
GET_HIGH_WORD(hy,y); GET_HIGH_WORD(hy,y);
SET_HIGH_WORD(y,hy+(k<<20)); /* add k to y's exponent */ SET_HIGH_WORD(y,hy+(k<<20)); /* add k to y's exponent */
return y; return y;
} else { } else {
__uint32_t hy; uint32_t hy;
GET_HIGH_WORD(hy,y); GET_HIGH_WORD(hy,y);
SET_HIGH_WORD(y,hy+((k+1000)<<20)); /* add k to y's exponent */ SET_HIGH_WORD(y,hy+((k+1000)<<20)); /* add k to y's exponent */
return y*twom1000; return y*twom1000;

12
libjava/java/lang/e_fmod.c
View file

@ -34,8 +34,8 @@ static double one = 1.0, Zero[] = {0.0, -0.0,};
double x,y ; double x,y ;
#endif #endif
{ {
__int32_t n,hx,hy,hz,ix,iy,sx,i; int32_t n,hx,hy,hz,ix,iy,sx,i;
__uint32_t lx,ly,lz; uint32_t lx,ly,lz;
EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hx,lx,x);
EXTRACT_WORDS(hy,ly,y); EXTRACT_WORDS(hy,ly,y);
@ -50,7 +50,7 @@ static double one = 1.0, Zero[] = {0.0, -0.0,};
if(hx<=hy) { if(hx<=hy) {
if((hx<hy)||(lx<ly)) return x; /* |x|<|y| return x */ if((hx<hy)||(lx<ly)) return x; /* |x|<|y| return x */
if(lx==ly) if(lx==ly)
return Zero[(__uint32_t)sx>>31]; /* |x|=|y| return x*0*/ return Zero[(uint32_t)sx>>31]; /* |x|=|y| return x*0*/
} }
/* determine ix = ilogb(x) */ /* determine ix = ilogb(x) */
@ -104,7 +104,7 @@ static double one = 1.0, Zero[] = {0.0, -0.0,};
if(hz<0){hx = hx+hx+(lx>>31); lx = lx+lx;} if(hz<0){hx = hx+hx+(lx>>31); lx = lx+lx;}
else { else {
if((hz|lz)==0) /* return sign(x)*0 */ if((hz|lz)==0) /* return sign(x)*0 */
return Zero[(__uint32_t)sx>>31]; return Zero[(uint32_t)sx>>31];
hx = hz+hz+(lz>>31); lx = lz+lz; hx = hz+hz+(lz>>31); lx = lz+lz;
} }
} }
@ -113,7 +113,7 @@ static double one = 1.0, Zero[] = {0.0, -0.0,};
/* convert back to floating value and restore the sign */ /* convert back to floating value and restore the sign */
if((hx|lx)==0) /* return sign(x)*0 */ if((hx|lx)==0) /* return sign(x)*0 */
return Zero[(__uint32_t)sx>>31]; return Zero[(uint32_t)sx>>31];
while(hx<0x00100000) { /* normalize x */ while(hx<0x00100000) { /* normalize x */
hx = hx+hx+(lx>>31); lx = lx+lx; hx = hx+hx+(lx>>31); lx = lx+lx;
iy -= 1; iy -= 1;
@ -124,7 +124,7 @@ static double one = 1.0, Zero[] = {0.0, -0.0,};
} else { /* subnormal output */ } else { /* subnormal output */
n = -1022 - iy; n = -1022 - iy;
if(n<=20) { if(n<=20) {
lx = (lx>>n)|((__uint32_t)hx<<(32-n)); lx = (lx>>n)|((uint32_t)hx<<(32-n));
hx >>= n; hx >>= n;
} else if (n<=31) { } else if (n<=31) {
lx = (hx<<(32-n))|(lx>>n); hx = sx; lx = (hx<<(32-n))|(lx>>n); hx = sx;

4
libjava/java/lang/e_log.c
View file

@ -96,8 +96,8 @@ static double zero = 0.0;
#endif #endif
{ {
double hfsq,f,s,z,R,w,t1,t2,dk; double hfsq,f,s,z,R,w,t1,t2,dk;
__int32_t k,hx,i,j; int32_t k,hx,i,j;
__uint32_t lx; uint32_t lx;
EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hx,lx,x);

12
libjava/java/lang/e_pow.c
View file

@ -106,9 +106,9 @@ ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
{ {
double z,ax,z_h,z_l,p_h,p_l; double z,ax,z_h,z_l,p_h,p_l;
double y1,t1,t2,r,s,t,u,v,w; double y1,t1,t2,r,s,t,u,v,w;
__int32_t i,j,k,yisint,n; int32_t i,j,k,yisint,n;
__int32_t hx,hy,ix,iy; int32_t hx,hy,ix,iy;
__uint32_t lx,ly; uint32_t lx,ly;
EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hx,lx,x);
EXTRACT_WORDS(hy,ly,y); EXTRACT_WORDS(hy,ly,y);
@ -134,7 +134,7 @@ ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
k = (iy>>20)-0x3ff; /* exponent */ k = (iy>>20)-0x3ff; /* exponent */
if(k>20) { if(k>20) {
j = ly>>(52-k); j = ly>>(52-k);
if((__uint32_t)(j<<(52-k))==ly) yisint = 2-(j&1); if((uint32_t)(j<<(52-k))==ly) yisint = 2-(j&1);
} else if(ly==0) { } else if(ly==0) {
j = iy>>(20-k); j = iy>>(20-k);
if((j<<(20-k))==iy) yisint = 2-(j&1); if((j<<(20-k))==iy) yisint = 2-(j&1);
@ -183,7 +183,7 @@ ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
if((((hx>>31)+1)|yisint)==0) return (x-x)/(x-x); if((((hx>>31)+1)|yisint)==0) return (x-x)/(x-x);
but ANSI C says a right shift of a signed negative quantity is but ANSI C says a right shift of a signed negative quantity is
implementation defined. */ implementation defined. */
if(((((__uint32_t)hx>>31)-1)|yisint)==0) return (x-x)/(x-x); if(((((uint32_t)hx>>31)-1)|yisint)==0) return (x-x)/(x-x);
/* |y| is huge */ /* |y| is huge */
if(iy>0x41e00000) { /* if |y| > 2**31 */ if(iy>0x41e00000) { /* if |y| > 2**31 */
@ -254,7 +254,7 @@ ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
} }
s = one; /* s (sign of result -ve**odd) = -1 else = 1 */ s = one; /* s (sign of result -ve**odd) = -1 else = 1 */
if(((((__uint32_t)hx>>31)-1)|(yisint-1))==0) if(((((uint32_t)hx>>31)-1)|(yisint-1))==0)
s = -one;/* (-ve)**(odd int) */ s = -one;/* (-ve)**(odd int) */
/* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */ /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */

24
libjava/java/lang/e_rem_pio2.c
View file

@ -26,9 +26,9 @@
* Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi
*/ */
#ifdef __STDC__ #ifdef __STDC__
static const __int32_t two_over_pi[] = { static const int32_t two_over_pi[] = {
#else #else
static __int32_t two_over_pi[] = { static int32_t two_over_pi[] = {
#endif #endif
0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62, 0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62,
0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A, 0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A,
@ -44,9 +44,9 @@ static __int32_t two_over_pi[] = {
}; };
#ifdef __STDC__ #ifdef __STDC__
static const __int32_t npio2_hw[] = { static const int32_t npio2_hw[] = {
#else #else
static __int32_t npio2_hw[] = { static int32_t npio2_hw[] = {
#endif #endif
0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C, 0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C,
0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C, 0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C,
@ -83,17 +83,17 @@ pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */
pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
#ifdef __STDC__ #ifdef __STDC__
__int32_t __ieee754_rem_pio2(double x, double *y) int32_t __ieee754_rem_pio2(double x, double *y)
#else #else
__int32_t __ieee754_rem_pio2(x,y) int32_t __ieee754_rem_pio2(x,y)
double x,y[]; double x,y[];
#endif #endif
{ {
double z,w,t,r,fn; double z,w,t,r,fn;
double tx[3]; double tx[3];
__int32_t i,j,n,ix,hx; int32_t i,j,n,ix,hx;
int e0,nx; int e0,nx;
__uint32_t low; uint32_t low;
GET_HIGH_WORD(hx,x); /* high word of x */ GET_HIGH_WORD(hx,x); /* high word of x */
ix = hx&0x7fffffff; ix = hx&0x7fffffff;
@ -126,14 +126,14 @@ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
} }
if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */ if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */
t = fabs(x); t = fabs(x);
n = (__int32_t) (t*invpio2+half); n = (int32_t) (t*invpio2+half);
fn = (double)n; fn = (double)n;
r = t-fn*pio2_1; r = t-fn*pio2_1;
w = fn*pio2_1t; /* 1st round good to 85 bit */ w = fn*pio2_1t; /* 1st round good to 85 bit */
if(n<32&&ix!=npio2_hw[n-1]) { if(n<32&&ix!=npio2_hw[n-1]) {
y[0] = r-w; /* quick check no cancellation */ y[0] = r-w; /* quick check no cancellation */
} else { } else {
__uint32_t high; uint32_t high;
j = ix>>20; j = ix>>20;
y[0] = r-w; y[0] = r-w;
GET_HIGH_WORD(high,y[0]); GET_HIGH_WORD(high,y[0]);
@ -169,9 +169,9 @@ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
GET_LOW_WORD(low,x); GET_LOW_WORD(low,x);
SET_LOW_WORD(z,low); SET_LOW_WORD(z,low);
e0 = (int)((ix>>20)-1046); /* e0 = ilogb(z)-23; */ e0 = (int)((ix>>20)-1046); /* e0 = ilogb(z)-23; */
SET_HIGH_WORD(z, ix - ((__int32_t)e0<<20)); SET_HIGH_WORD(z, ix - ((int32_t)e0<<20));
for(i=0;i<2;i++) { for(i=0;i<2;i++) {
tx[i] = (double)((__int32_t)(z)); tx[i] = (double)((int32_t)(z));
z = (z-tx[i])*two24; z = (z-tx[i])*two24;
} }
tx[2] = z; tx[2] = z;

4
libjava/java/lang/e_remainder.c
View file

@ -38,8 +38,8 @@ static double zero = 0.0;
double x,p; double x,p;
#endif #endif
{ {
__int32_t hx,hp; int32_t hx,hp;
__uint32_t sx,lx,lp; uint32_t sx,lx,lp;
double p_half; double p_half;
EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hx,lx,x);

12
libjava/java/lang/e_sqrt.c
View file

@ -99,9 +99,9 @@ static double one = 1.0, tiny=1.0e-300;
#endif #endif
{ {
double z; double z;
__int32_t sign = (int)0x80000000; int32_t sign = (int)0x80000000;
__uint32_t r,t1,s1,ix1,q1; uint32_t r,t1,s1,ix1,q1;
__int32_t ix0,s0,q,m,t,i; int32_t ix0,s0,q,m,t,i;
EXTRACT_WORDS(ix0,ix1,x); EXTRACT_WORDS(ix0,ix1,x);
@ -160,7 +160,7 @@ static double one = 1.0, tiny=1.0e-300;
t = s0; t = s0;
if((t<ix0)||((t==ix0)&&(t1<=ix1))) { if((t<ix0)||((t==ix0)&&(t1<=ix1))) {
s1 = t1+r; s1 = t1+r;
if(((t1&sign)==(__uint32_t)sign)&&(s1&sign)==0) s0 += 1; if(((t1&sign)==(uint32_t)sign)&&(s1&sign)==0) s0 += 1;
ix0 -= t; ix0 -= t;
if (ix1 < t1) ix0 -= 1; if (ix1 < t1) ix0 -= 1;
ix1 -= t1; ix1 -= t1;
@ -176,9 +176,9 @@ static double one = 1.0, tiny=1.0e-300;
z = one-tiny; /* trigger inexact flag */ z = one-tiny; /* trigger inexact flag */
if (z>=one) { if (z>=one) {
z = one+tiny; z = one+tiny;
if (q1==(__uint32_t)0xffffffff) { q1=0; q += 1;} if (q1==(uint32_t)0xffffffff) { q1=0; q += 1;}
else if (z>one) { else if (z>one) {
if (q1==(__uint32_t)0xfffffffe) q+=1; if (q1==(uint32_t)0xfffffffe) q+=1;
q1+=2; q1+=2;
} else } else
q1 += (q1&1); q1 += (q1&1);

2
libjava/java/lang/k_cos.c
View file

@ -71,7 +71,7 @@ C6 = -1.13596475577881948265e-11; /* 0xBDA8FAE9, 0xBE8838D4 */
#endif #endif
{ {
double a,hz,z,r,qx; double a,hz,z,r,qx;
__int32_t ix; int32_t ix;
GET_HIGH_WORD(ix,x); GET_HIGH_WORD(ix,x);
ix &= 0x7fffffff; /* ix = |x|'s high word*/ ix &= 0x7fffffff; /* ix = |x|'s high word*/
if(ix<0x3e400000) { /* if x < 2**27 */ if(ix<0x3e400000) { /* if x < 2**27 */

20
libjava/java/lang/k_rem_pio2.c
View file

@ -163,13 +163,13 @@ two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */
twon24 = 5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */ twon24 = 5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */
#ifdef __STDC__ #ifdef __STDC__
int __kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, const __int32_t *ipio2) int __kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, const int32_t *ipio2)
#else #else
int __kernel_rem_pio2(x,y,e0,nx,prec,ipio2) int __kernel_rem_pio2(x,y,e0,nx,prec,ipio2)
double x[], y[]; int e0,nx,prec; __int32_t ipio2[]; double x[], y[]; int e0,nx,prec; int32_t ipio2[];
#endif #endif
{ {
__int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih; int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih;
double z,fw,f[20],fq[20],q[20]; double z,fw,f[20],fq[20],q[20];
/* initialize jk*/ /* initialize jk*/
@ -194,15 +194,15 @@ twon24 = 5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */
recompute: recompute:
/* distill q[] into iq[] reversingly */ /* distill q[] into iq[] reversingly */
for(i=0,j=jz,z=q[jz];j>0;i++,j--) { for(i=0,j=jz,z=q[jz];j>0;i++,j--) {
fw = (double)((__int32_t)(twon24* z)); fw = (double)((int32_t)(twon24* z));
iq[i] = (__int32_t)(z-two24*fw); iq[i] = (int32_t)(z-two24*fw);
z = q[j-1]+fw; z = q[j-1]+fw;
} }
/* compute n */ /* compute n */
z = scalbn(z,(int)q0); /* actual value of z */ z = scalbn(z,(int)q0); /* actual value of z */
z -= 8.0*floor(z*0.125); /* trim off integer >= 8 */ z -= 8.0*floor(z*0.125); /* trim off integer >= 8 */
n = (__int32_t) z; n = (int32_t) z;
z -= (double)n; z -= (double)n;
ih = 0; ih = 0;
if(q0>0) { /* need iq[jz-1] to determine n */ if(q0>0) { /* need iq[jz-1] to determine n */
@ -261,11 +261,11 @@ recompute:
} else { /* break z into 24-bit if necessary */ } else { /* break z into 24-bit if necessary */
z = scalbn(z,-(int)q0); z = scalbn(z,-(int)q0);
if(z>=two24) { if(z>=two24) {
fw = (double)((__int32_t)(twon24*z)); fw = (double)((int32_t)(twon24*z));
iq[jz] = (__int32_t)(z-two24*fw); iq[jz] = (int32_t)(z-two24*fw);
jz += 1; q0 += 24; jz += 1; q0 += 24;
iq[jz] = (__int32_t) fw; iq[jz] = (int32_t) fw;
} else iq[jz] = (__int32_t) z ; } else iq[jz] = (int32_t) z ;
} }
/* convert integer "bit" chunk to floating-point value */ /* convert integer "bit" chunk to floating-point value */

2
libjava/java/lang/k_sin.c
View file

@ -64,7 +64,7 @@ S6 = 1.58969099521155010221e-10; /* 0x3DE5D93A, 0x5ACFD57C */
#endif #endif
{ {
double z,r,v; double z,r,v;
__int32_t ix; int32_t ix;
GET_HIGH_WORD(ix,x); GET_HIGH_WORD(ix,x);
ix &= 0x7fffffff; /* high word of x */ ix &= 0x7fffffff; /* high word of x */
if(ix<0x3e400000) /* |x| < 2**-27 */ if(ix<0x3e400000) /* |x| < 2**-27 */

4
libjava/java/lang/k_tan.c
View file

@ -81,12 +81,12 @@ T[] = {
#endif #endif
{ {
double z,r,v,w,s; double z,r,v,w,s;
__int32_t ix,hx; int32_t ix,hx;
GET_HIGH_WORD(hx,x); GET_HIGH_WORD(hx,x);
ix = hx&0x7fffffff; /* high word of |x| */ ix = hx&0x7fffffff; /* high word of |x| */
if(ix<0x3e300000) /* x < 2**-28 */ if(ix<0x3e300000) /* x < 2**-28 */
{if((int)x==0) { /* generate inexact */ {if((int)x==0) { /* generate inexact */
__uint32_t low; uint32_t low;
GET_LOW_WORD(low,x); GET_LOW_WORD(low,x);
if(((ix|low)|(iy+1))==0) return one/fabs(x); if(((ix|low)|(iy+1))==0) return one/fabs(x);
else return (iy==1)? x: -one/x; else return (iy==1)? x: -one/x;

128
libjava/java/lang/mprec.h
View file

@ -37,13 +37,35 @@ extern "C" {
// #include <float.h> // #include <float.h>
// #include <errno.h> // #include <errno.h>
/* These typedefs are true for the targets running Java. */ #if defined HAVE_STDINT_H
#include <stdint.h>
#ifndef HAVE_INT32_DEFINED #elif defined HAVE_INTTYPES_H
typedef int __int32_t; #include <inttypes.h>
typedef unsigned int __uint32_t;
#endif #endif
#if defined HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#if defined HAVE_SYS_CONFIG_H
#include <sys/config.h>
#endif
/* ISO C9X int type declarations */
#if !defined HAVE_INT32_DEFINED && defined HAVE_BSD_INT32_DEFINED
typedef u_int32_t uint32_t;
#endif
#if !defined HAVE_BSD_INT32_DEFINED && !defined HAVE_INT32_DEFINED
// FIXME -- this could have problems with systems that don't define SI to be 4
typedef int int32_t __attribute__((mode(SI)));
typedef unsigned int uint32_t __attribute__((mode(SI)));
#endif
/* These typedefs are true for the targets running Java. */
#ifdef __IEEE_LITTLE_ENDIAN #ifdef __IEEE_LITTLE_ENDIAN
#define IEEE_8087 #define IEEE_8087
#endif #endif
@ -63,7 +85,7 @@ typedef unsigned int __uint32_t;
#ifdef Unsigned_Shifts #ifdef Unsigned_Shifts
#define Sign_Extend(a,b) if (b < 0) a |= (__uint32_t)0xffff0000; #define Sign_Extend(a,b) if (b < 0) a |= (uint32_t)0xffff0000;
#else #else
#define Sign_Extend(a,b) /*no-op*/ #define Sign_Extend(a,b) /*no-op*/
#endif #endif
@ -79,8 +101,7 @@ Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
union double_union union double_union
{ {
double d; double d;
// FIXME: This should be some well-defined 32 bit type. uint32_t i[2];
__uint32_t i[2];
}; };
#ifdef IEEE_8087 #ifdef IEEE_8087
@ -113,34 +134,34 @@ union double_union
#if defined (_DOUBLE_IS_32BITS) #if defined (_DOUBLE_IS_32BITS)
#define Exp_shift 23 #define Exp_shift 23
#define Exp_shift1 23 #define Exp_shift1 23
#define Exp_msk1 ((__uint32_t)0x00800000L) #define Exp_msk1 ((uint32_t)0x00800000L)
#define Exp_msk11 ((__uint32_t)0x00800000L) #define Exp_msk11 ((uint32_t)0x00800000L)
#define Exp_mask ((__uint32_t)0x7f800000L) #define Exp_mask ((uint32_t)0x7f800000L)
#define P 24 #define P 24
#define Bias 127 #define Bias 127
#if 0 #if 0
#define IEEE_Arith /* it is, but the code doesn't handle IEEE singles yet */ #define IEEE_Arith /* it is, but the code doesn't handle IEEE singles yet */
#endif #endif
#define Emin (-126) #define Emin (-126)
#define Exp_1 ((__uint32_t)0x3f800000L) #define Exp_1 ((uint32_t)0x3f800000L)
#define Exp_11 ((__uint32_t)0x3f800000L) #define Exp_11 ((uint32_t)0x3f800000L)
#define Ebits 8 #define Ebits 8
#define Frac_mask ((__uint32_t)0x007fffffL) #define Frac_mask ((uint32_t)0x007fffffL)
#define Frac_mask1 ((__uint32_t)0x007fffffL) #define Frac_mask1 ((uint32_t)0x007fffffL)
#define Ten_pmax 10 #define Ten_pmax 10
#define Sign_bit ((__uint32_t)0x80000000L) #define Sign_bit ((uint32_t)0x80000000L)
#define Ten_pmax 10 #define Ten_pmax 10
#define Bletch 2 #define Bletch 2
#define Bndry_mask ((__uint32_t)0x007fffffL) #define Bndry_mask ((uint32_t)0x007fffffL)
#define Bndry_mask1 ((__uint32_t)0x007fffffL) #define Bndry_mask1 ((uint32_t)0x007fffffL)
#define LSB 1 #define LSB 1
#define Sign_bit ((__uint32_t)0x80000000L) #define Sign_bit ((uint32_t)0x80000000L)
#define Log2P 1 #define Log2P 1
#define Tiny0 0 #define Tiny0 0
#define Tiny1 1 #define Tiny1 1
#define Quick_max 5 #define Quick_max 5
#define Int_max 6 #define Int_max 6
#define Infinite(x) (word0(x) == ((__uint32_t)0x7f800000L)) #define Infinite(x) (word0(x) == ((uint32_t)0x7f800000L))
#undef word0 #undef word0
#undef word1 #undef word1
@ -150,30 +171,30 @@ union double_union
#define Exp_shift 20 #define Exp_shift 20
#define Exp_shift1 20 #define Exp_shift1 20
#define Exp_msk1 ((__uint32_t)0x100000L) #define Exp_msk1 ((uint32_t)0x100000L)
#define Exp_msk11 ((__uint32_t)0x100000L) #define Exp_msk11 ((uint32_t)0x100000L)
#define Exp_mask ((__uint32_t)0x7ff00000L) #define Exp_mask ((uint32_t)0x7ff00000L)
#define P 53 #define P 53
#define Bias 1023 #define Bias 1023
#define IEEE_Arith #define IEEE_Arith
#define Emin (-1022) #define Emin (-1022)
#define Exp_1 ((__uint32_t)0x3ff00000L) #define Exp_1 ((uint32_t)0x3ff00000L)
#define Exp_11 ((__uint32_t)0x3ff00000L) #define Exp_11 ((uint32_t)0x3ff00000L)
#define Ebits 11 #define Ebits 11
#define Frac_mask ((__uint32_t)0xfffffL) #define Frac_mask ((uint32_t)0xfffffL)
#define Frac_mask1 ((__uint32_t)0xfffffL) #define Frac_mask1 ((uint32_t)0xfffffL)
#define Ten_pmax 22 #define Ten_pmax 22
#define Bletch 0x10 #define Bletch 0x10
#define Bndry_mask ((__uint32_t)0xfffffL) #define Bndry_mask ((uint32_t)0xfffffL)
#define Bndry_mask1 ((__uint32_t)0xfffffL) #define Bndry_mask1 ((uint32_t)0xfffffL)
#define LSB 1 #define LSB 1
#define Sign_bit ((__uint32_t)0x80000000L) #define Sign_bit ((uint32_t)0x80000000L)
#define Log2P 1 #define Log2P 1
#define Tiny0 0 #define Tiny0 0
#define Tiny1 1 #define Tiny1 1
#define Quick_max 14 #define Quick_max 14
#define Int_max 14 #define Int_max 14
#define Infinite(x) (word0(x) == ((__uint32_t)0x7ff00000L)) /* sufficient test for here */ #define Infinite(x) (word0(x) == ((uint32_t)0x7ff00000L)) /* sufficient test for here */
#endif #endif
#else #else
@ -182,24 +203,24 @@ union double_union
#ifdef IBM #ifdef IBM
#define Exp_shift 24 #define Exp_shift 24
#define Exp_shift1 24 #define Exp_shift1 24
#define Exp_msk1 ((__uint32_t)0x1000000L) #define Exp_msk1 ((uint32_t)0x1000000L)
#define Exp_msk11 ((__uint32_t)0x1000000L) #define Exp_msk11 ((uint32_t)0x1000000L)
#define Exp_mask ((__uint32_t)0x7f000000L) #define Exp_mask ((uint32_t)0x7f000000L)
#define P 14 #define P 14
#define Bias 65 #define Bias 65
#define Exp_1 ((__uint32_t)0x41000000L) #define Exp_1 ((uint32_t)0x41000000L)
#define Exp_11 ((__uint32_t)0x41000000L) #define Exp_11 ((uint32_t)0x41000000L)
#define Ebits 8 /* exponent has 7 bits, but 8 is the right value in b2d */ #define Ebits 8 /* exponent has 7 bits, but 8 is the right value in b2d */
#define Frac_mask ((__uint32_t)0xffffffL) #define Frac_mask ((uint32_t)0xffffffL)
#define Frac_mask1 ((__uint32_t)0xffffffL) #define Frac_mask1 ((uint32_t)0xffffffL)
#define Bletch 4 #define Bletch 4
#define Ten_pmax 22 #define Ten_pmax 22
#define Bndry_mask ((__uint32_t)0xefffffL) #define Bndry_mask ((uint32_t)0xefffffL)
#define Bndry_mask1 ((__uint32_t)0xffffffL) #define Bndry_mask1 ((uint32_t)0xffffffL)
#define LSB 1 #define LSB 1
#define Sign_bit ((__uint32_t)0x80000000L) #define Sign_bit ((uint32_t)0x80000000L)
#define Log2P 4 #define Log2P 4
#define Tiny0 ((__uint32_t)0x100000L) #define Tiny0 ((uint32_t)0x100000L)
#define Tiny1 0 #define Tiny1 0
#define Quick_max 14 #define Quick_max 14
#define Int_max 15 #define Int_max 15
@ -207,21 +228,21 @@ union double_union
#define Exp_shift 23 #define Exp_shift 23
#define Exp_shift1 7 #define Exp_shift1 7
#define Exp_msk1 0x80 #define Exp_msk1 0x80
#define Exp_msk11 ((__uint32_t)0x800000L) #define Exp_msk11 ((uint32_t)0x800000L)
#define Exp_mask ((__uint32_t)0x7f80L) #define Exp_mask ((uint32_t)0x7f80L)
#define P 56 #define P 56
#define Bias 129 #define Bias 129
#define Exp_1 ((__uint32_t)0x40800000L) #define Exp_1 ((uint32_t)0x40800000L)
#define Exp_11 ((__uint32_t)0x4080L) #define Exp_11 ((uint32_t)0x4080L)
#define Ebits 8 #define Ebits 8
#define Frac_mask ((__uint32_t)0x7fffffL) #define Frac_mask ((uint32_t)0x7fffffL)
#define Frac_mask1 ((__uint32_t)0xffff007fL) #define Frac_mask1 ((uint32_t)0xffff007fL)
#define Ten_pmax 24 #define Ten_pmax 24
#define Bletch 2 #define Bletch 2
#define Bndry_mask ((__uint32_t)0xffff007fL) #define Bndry_mask ((uint32_t)0xffff007fL)
#define Bndry_mask1 ((__uint32_t)0xffff007fL) #define Bndry_mask1 ((uint32_t)0xffff007fL)
#define LSB ((__uint32_t)0x10000L) #define LSB ((uint32_t)0x10000L)
#define Sign_bit ((__uint32_t)0x8000L) #define Sign_bit ((uint32_t)0x8000L)
#define Log2P 1 #define Log2P 1
#define Tiny0 0x80 #define Tiny0 0x80
#define Tiny1 0 #define Tiny1 0
@ -248,7 +269,7 @@ extern double rnd_prod(double, double), rnd_quot(double, double);
#endif #endif
#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1)) #define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
#define Big1 ((__uint32_t)0xffffffffL) #define Big1 ((uint32_t)0xffffffffL)
#ifndef Just_16 #ifndef Just_16
/* When Pack_32 is not defined, we store 16 bits per 32-bit long. /* When Pack_32 is not defined, we store 16 bits per 32-bit long.
@ -371,4 +392,3 @@ extern _CONST double tens[];
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

4
libjava/java/lang/s_atan.c
View file

@ -133,12 +133,12 @@ huge = 1.0e300;
#endif #endif
{ {
double w,s1,s2,z; double w,s1,s2,z;
__int32_t ix,hx,id; int32_t ix,hx,id;
GET_HIGH_WORD(hx,x); GET_HIGH_WORD(hx,x);
ix = hx&0x7fffffff; ix = hx&0x7fffffff;
if(ix>=0x44100000) { /* if |x| >= 2^66 */ if(ix>=0x44100000) { /* if |x| >= 2^66 */
__uint32_t low; uint32_t low;
GET_LOW_WORD(low,x); GET_LOW_WORD(low,x);
if(ix>0x7ff00000|| if(ix>0x7ff00000||
(ix==0x7ff00000&&(low!=0))) (ix==0x7ff00000&&(low!=0)))

8
libjava/java/lang/s_ceil.c
View file

@ -37,8 +37,8 @@ static double huge = 1.0e300;
double x; double x;
#endif #endif
{ {
__int32_t i0,i1,j0; int32_t i0,i1,j0;
__uint32_t i,j; uint32_t i,j;
EXTRACT_WORDS(i0,i1,x); EXTRACT_WORDS(i0,i1,x);
j0 = ((i0>>20)&0x7ff)-0x3ff; j0 = ((i0>>20)&0x7ff)-0x3ff;
if(j0<20) { if(j0<20) {
@ -59,14 +59,14 @@ static double huge = 1.0e300;
if(j0==0x400) return x+x; /* inf or NaN */ if(j0==0x400) return x+x; /* inf or NaN */
else return x; /* x is integral */ else return x; /* x is integral */
} else { } else {
i = ((__uint32_t)(0xffffffff))>>(j0-20); i = ((uint32_t)(0xffffffff))>>(j0-20);
if((i1&i)==0) return x; /* x is integral */ if((i1&i)==0) return x; /* x is integral */
if(huge+x>0.0) { /* raise inexact flag */ if(huge+x>0.0) { /* raise inexact flag */
if(i0>0) { if(i0>0) {
if(j0==20) i0+=1; if(j0==20) i0+=1;
else { else {
j = i1 + (1<<(52-j0)); j = i1 + (1<<(52-j0));
if(j<(__uint32_t)i1) i0+=1; /* got a carry */ if(j<(uint32_t)i1) i0+=1; /* got a carry */
i1 = j; i1 = j;
} }
} }

2
libjava/java/lang/s_copysign.c
View file

@ -72,7 +72,7 @@ Definition (Issue 2).
double x,y; double x,y;
#endif #endif
{ {
__uint32_t hx,hy; uint32_t hx,hy;
GET_HIGH_WORD(hx,x); GET_HIGH_WORD(hx,x);
GET_HIGH_WORD(hy,y); GET_HIGH_WORD(hy,y);
SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000)); SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000));

2
libjava/java/lang/s_cos.c
View file

@ -54,7 +54,7 @@
#endif #endif
{ {
double y[2],z=0.0; double y[2],z=0.0;
__int32_t n,ix; int32_t n,ix;
/* High word of x. */ /* High word of x. */
GET_HIGH_WORD(ix,x); GET_HIGH_WORD(ix,x);

2
libjava/java/lang/s_fabs.c
View file

@ -64,7 +64,7 @@ PORTABILITY
double x; double x;
#endif #endif
{ {
__uint32_t high; uint32_t high;
GET_HIGH_WORD(high,x); GET_HIGH_WORD(high,x);
SET_HIGH_WORD(x,high&0x7fffffff); SET_HIGH_WORD(x,high&0x7fffffff);
return x; return x;

8
libjava/java/lang/s_floor.c
View file

@ -90,8 +90,8 @@ static double huge = 1.0e300;
double x; double x;
#endif #endif
{ {
__int32_t i0,i1,j0; int32_t i0,i1,j0;
__uint32_t i,j; uint32_t i,j;
EXTRACT_WORDS(i0,i1,x); EXTRACT_WORDS(i0,i1,x);
j0 = ((i0>>20)&0x7ff)-0x3ff; j0 = ((i0>>20)&0x7ff)-0x3ff;
if(j0<20) { if(j0<20) {
@ -113,14 +113,14 @@ static double huge = 1.0e300;
if(j0==0x400) return x+x; /* inf or NaN */ if(j0==0x400) return x+x; /* inf or NaN */
else return x; /* x is integral */ else return x; /* x is integral */
} else { } else {
i = ((__uint32_t)(0xffffffff))>>(j0-20); i = ((uint32_t)(0xffffffff))>>(j0-20);
if((i1&i)==0) return x; /* x is integral */ if((i1&i)==0) return x; /* x is integral */
if(huge+x>0.0) { /* raise inexact flag */ if(huge+x>0.0) { /* raise inexact flag */
if(i0<0) { if(i0<0) {
if(j0==20) i0+=1; if(j0==20) i0+=1;
else { else {
j = i1+(1<<(52-j0)); j = i1+(1<<(52-j0));
if(j<(__uint32_t)i1) i0 +=1 ; /* got a carry */ if(j<(uint32_t)i1) i0 +=1 ; /* got a carry */
i1=j; i1=j;
} }
} }

6
libjava/java/lang/s_rint.c
View file

@ -42,8 +42,8 @@ TWO52[2]={
double x; double x;
#endif #endif
{ {
__int32_t i0,j0,sx; int32_t i0,j0,sx;
__uint32_t i,i1; uint32_t i,i1;
double t; double t;
volatile double w; volatile double w;
EXTRACT_WORDS(i0,i1,x); EXTRACT_WORDS(i0,i1,x);
@ -74,7 +74,7 @@ TWO52[2]={
if(j0==0x400) return x+x; /* inf or NaN */ if(j0==0x400) return x+x; /* inf or NaN */
else return x; /* x is integral */ else return x; /* x is integral */
} else { } else {
i = ((__uint32_t)(0xffffffff))>>(j0-20); i = ((uint32_t)(0xffffffff))>>(j0-20);
if((i1&i)==0) return x; /* x is integral */ if((i1&i)==0) return x; /* x is integral */
i>>=1; i>>=1;
if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20)); if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20));

2
libjava/java/lang/s_scalbn.c
View file

@ -76,7 +76,7 @@ tiny = 1.0e-300;
double x; int n; double x; int n;
#endif #endif
{ {
__int32_t k,hx,lx; int32_t k,hx,lx;
EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hx,lx,x);
k = (hx&0x7ff00000)>>20; /* extract exponent */ k = (hx&0x7ff00000)>>20; /* extract exponent */
if (k==0) { /* 0 or subnormal x */ if (k==0) { /* 0 or subnormal x */

2
libjava/java/lang/s_sin.c
View file

@ -104,7 +104,7 @@ QUICKREF
#endif #endif
{ {
double y[2],z=0.0; double y[2],z=0.0;
__int32_t n,ix; int32_t n,ix;
/* High word of x. */ /* High word of x. */
GET_HIGH_WORD(ix,x); GET_HIGH_WORD(ix,x);

2
libjava/java/lang/s_tan.c
View file

@ -91,7 +91,7 @@ PORTABILITY
#endif #endif
{ {
double y[2],z=0.0; double y[2],z=0.0;
__int32_t n,ix; int32_t n,ix;
/* High word of x. */ /* High word of x. */
GET_HIGH_WORD(ix,x); GET_HIGH_WORD(ix,x);

4
libjava/java/lang/sf_rint.c
View file

@ -32,8 +32,8 @@ TWO23[2]={
float x; float x;
#endif #endif
{ {
__int32_t i0,j0,sx; int32_t i0,j0,sx;
__uint32_t i,i1; uint32_t i,i1;
float w,t; float w,t;
GET_FLOAT_WORD(i0,x); GET_FLOAT_WORD(i0,x);
sx = (i0>>31)&1; sx = (i0>>31)&1;