diff options
Diffstat (limited to 'libjava/classpath/native/fdlibm')
| -rw-r--r-- | libjava/classpath/native/fdlibm/Makefile.in | 23 | ||||
| -rw-r--r-- | libjava/classpath/native/fdlibm/dtoa.c | 3 | ||||
| -rw-r--r-- | libjava/classpath/native/fdlibm/fdlibm.h | 7 | ||||
| -rw-r--r-- | libjava/classpath/native/fdlibm/ieeefp.h | 4 | ||||
| -rw-r--r-- | libjava/classpath/native/fdlibm/mprec.h | 2 |
5 files changed, 17 insertions, 22 deletions
diff --git a/libjava/classpath/native/fdlibm/Makefile.in b/libjava/classpath/native/fdlibm/Makefile.in index 998ba8420d6..dc4c34f342d 100644 --- a/libjava/classpath/native/fdlibm/Makefile.in +++ b/libjava/classpath/native/fdlibm/Makefile.in @@ -50,6 +50,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/../../ltoptions.m4 \ $(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltversion.m4 \ + $(top_srcdir)/m4/ac_prog_javac.m4 \ + $(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ @@ -156,7 +158,6 @@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ECJ = @ECJ@ ECJ_JAR = @ECJ_JAR@ EGREP = @EGREP@ ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@ @@ -168,19 +169,8 @@ EXTRA_CFLAGS = @EXTRA_CFLAGS@ FASTJAR = @FASTJAR@ FGREP = @FGREP@ FIND = @FIND@ -FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ -FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@ -FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@ -FOUND_GCJ_TRUE = @FOUND_GCJ_TRUE@ -FOUND_JAVAC_FALSE = @FOUND_JAVAC_FALSE@ -FOUND_JAVAC_TRUE = @FOUND_JAVAC_TRUE@ -FOUND_JIKES_FALSE = @FOUND_JIKES_FALSE@ -FOUND_JIKES_TRUE = @FOUND_JIKES_TRUE@ -FOUND_KJC_FALSE = @FOUND_KJC_FALSE@ -FOUND_KJC_TRUE = @FOUND_KJC_TRUE@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ -GCJ = @GCJ@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ GDK_CFLAGS = @GDK_CFLAGS@ @@ -212,15 +202,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JAVAC = @JAVAC@ +JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@ JAY = @JAY@ JAY_SKELETON = @JAY_SKELETON@ -JIKES = @JIKES@ -JIKESENCODING = @JIKESENCODING@ -JIKESWARNINGS = @JIKESWARNINGS@ -KJC = @KJC@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEBUG = @LIBDEBUG@ @@ -268,10 +255,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRICT_WARNING_CFLAGS = @STRICT_WARNING_CFLAGS@ STRIP = @STRIP@ -USER_CLASSLIB = @USER_CLASSLIB@ +TOOLSDIR = @TOOLSDIR@ USER_JAVAH = @USER_JAVAH@ -USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@ -USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@ USE_ESCHER_FALSE = @USE_ESCHER_FALSE@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ diff --git a/libjava/classpath/native/fdlibm/dtoa.c b/libjava/classpath/native/fdlibm/dtoa.c index e710d96deae..458e629d349 100644 --- a/libjava/classpath/native/fdlibm/dtoa.c +++ b/libjava/classpath/native/fdlibm/dtoa.c @@ -26,9 +26,10 @@ dmg@research.att.com or research!dmg */ -#include "mprec.h" #include <string.h> #include <stdlib.h> +#include "mprec.h" +#include <stdlib.h> static int _DEFUN (quorem, diff --git a/libjava/classpath/native/fdlibm/fdlibm.h b/libjava/classpath/native/fdlibm/fdlibm.h index bf9f5699107..112504e4cc4 100644 --- a/libjava/classpath/native/fdlibm/fdlibm.h +++ b/libjava/classpath/native/fdlibm/fdlibm.h @@ -13,9 +13,12 @@ #ifndef __CLASSPATH_FDLIBM_H__ #define __CLASSPATH_FDLIBM_H__ -/* AIX needs _XOPEN_SOURCE */ +/* + * On AIX we need _ALL_SOURCE defined to compile/configure native-lib, but can't + * have it defined to compile fdlibm. UGH. + */ #ifdef _AIX -#define _XOPEN_SOURCE +#undef _ALL_SOURCE #endif #include <config.h> diff --git a/libjava/classpath/native/fdlibm/ieeefp.h b/libjava/classpath/native/fdlibm/ieeefp.h index 1a9740f66dd..c230bbb3c72 100644 --- a/libjava/classpath/native/fdlibm/ieeefp.h +++ b/libjava/classpath/native/fdlibm/ieeefp.h @@ -87,6 +87,10 @@ #define __IEEE_LITTLE_ENDIAN #endif +#ifdef __AVR32__ +#define __IEEE_BIG_ENDIAN +#endif + #ifdef __MIPSEL__ #define __IEEE_LITTLE_ENDIAN #endif diff --git a/libjava/classpath/native/fdlibm/mprec.h b/libjava/classpath/native/fdlibm/mprec.h index 0efa2d98904..1139b72f1ff 100644 --- a/libjava/classpath/native/fdlibm/mprec.h +++ b/libjava/classpath/native/fdlibm/mprec.h @@ -294,7 +294,9 @@ struct _Jv_Bigint #define _SIGNED signed #define _DOTS , ... #define _VOID void +#ifndef _EXFUN #define _EXFUN(name, proto) name proto +#endif /* !EXFUN */ #define _DEFUN(name, arglist, args) name(args) #define _DEFUN_VOID(name) name(_NOARGS) #define _CAST_VOID (void) |