diff options
Diffstat (limited to 'libstdc++-v3/libmath')
-rw-r--r-- | libstdc++-v3/libmath/Makefile.am | 7 | ||||
-rw-r--r-- | libstdc++-v3/libmath/Makefile.in | 34 | ||||
-rw-r--r-- | libstdc++-v3/libmath/mathconf.h | 53 | ||||
-rw-r--r-- | libstdc++-v3/libmath/stubs.c | 2 |
4 files changed, 51 insertions, 45 deletions
diff --git a/libstdc++-v3/libmath/Makefile.am b/libstdc++-v3/libmath/Makefile.am index 951695a..2f696f9 100644 --- a/libstdc++-v3/libmath/Makefile.am +++ b/libstdc++-v3/libmath/Makefile.am @@ -45,15 +45,8 @@ libmath_la_SOURCES = signbit.c signbitf.c stubs.c LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES -GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@ -C_INCLUDE_DIR = @C_INCLUDE_DIR@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ -LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ -LIBIO_INCLUDES = @LIBIO_INCLUDES@ -CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ INCLUDES = \ - -I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include \ $(TOPLEVEL_INCLUDES) diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index f8453c4..ecdd410 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -65,20 +65,30 @@ target_alias = @target_alias@ target_triplet = @target@ AR = @AR@ AS = @AS@ +ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@ +BASIC_FILE_H = @BASIC_FILE_H@ CC = @CC@ +CCODECVT_C = @CCODECVT_C@ +CLOCALE_H = @CLOCALE_H@ CPP = @CPP@ CSHADOW_FLAGS = @CSHADOW_FLAGS@ -CSTD_INCLUDES = @CSTD_INCLUDES@ +CSTDIO_H = @CSTDIO_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ +C_INCLUDE_DIR = @C_INCLUDE_DIR@ DEBUG_FLAGS = @DEBUG_FLAGS@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ +GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@ +GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@ +LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBMATHOBJS = @LIBMATHOBJS@ +LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ LIBSTRINGOBJS = @LIBSTRINGOBJS@ +LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -88,6 +98,7 @@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ OPT_LDFLAGS = @OPT_LDFLAGS@ +OS_INC_SRCDIR = @OS_INC_SRCDIR@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SECTION_FLAGS = @SECTION_FLAGS@ @@ -104,6 +115,7 @@ glibcpp_basedir = @glibcpp_basedir@ glibcpp_builddir = @glibcpp_builddir@ glibcpp_prefixdir = @glibcpp_prefixdir@ glibcpp_srcdir = @glibcpp_srcdir@ +glibcpp_thread_h = @glibcpp_thread_h@ glibcpp_toolexecdir = @glibcpp_toolexecdir@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ gxx_include_dir = @gxx_include_dir@ @@ -117,13 +129,18 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs noinst_LTLIBRARIES = libmath.la -EXTRA_LONG_DOUBLE_yes = hypotl.c signbitl.c +EXTRA_LONG_DOUBLE_yes = \ + hypotl.c signbitl.c -EXTRA_DIST = hypot.c hypotf.c $(EXTRA_LONG_DOUBLE_yes) +EXTRA_DIST = \ + hypot.c hypotf.c \ + $(EXTRA_LONG_DOUBLE_yes) -libmath_la_LIBADD = @LIBMATHOBJS@ $(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) +libmath_la_LIBADD = \ + @LIBMATHOBJS@ \ + $(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) @@ -133,15 +150,10 @@ libmath_la_SOURCES = signbit.c signbitf.c stubs.c LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES -GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@ -C_INCLUDE_DIR = @C_INCLUDE_DIR@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ -LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ -LIBIO_INCLUDES = @LIBIO_INCLUDES@ -CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ -INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include $(TOPLEVEL_INCLUDES) +INCLUDES = \ + $(TOPLEVEL_INCLUDES) CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/libstdc++-v3/libmath/mathconf.h b/libstdc++-v3/libmath/mathconf.h index a730770..1e87499 100644 --- a/libstdc++-v3/libmath/mathconf.h +++ b/libstdc++-v3/libmath/mathconf.h @@ -1,6 +1,6 @@ /* Configuration data for libmath subpart of libstdc++. */ -/* Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997-1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU ISO C++ Library. This library is free software; you can redistribute it and/or modify it under the @@ -28,23 +28,23 @@ the GNU General Public License. */ -#include <bits/c++config.h> +#include <config.h> -#ifdef _GLIBCPP_HAVE_ENDIAN_H +#ifdef HAVE_ENDIAN_H # include <endian.h> #else -# ifdef _GLIBCPP_HAVE_MACHINE_ENDIAN_H +# ifdef HAVE_MACHINE_ENDIAN_H # include <machine/endian.h> # else -# ifdef _GLIBCPP_HAVE_SYS_MACHINE_H +# ifdef HAVE_SYS_MACHINE_H # include <sys/machine.h> # else -# if defined _GLIBCPP_HAVE_SYS_ISA_DEFS_H || defined _GLIBCPP_HAVE_MACHINE_PARAM_H +# if defined HAVE_SYS_ISA_DEFS_H || defined HAVE_MACHINE_PARAM_H /* This is on Solaris. */ -# ifdef _GLIBCPP_HAVE_SYS_ISA_DEFS_H +# ifdef HAVE_SYS_ISA_DEFS_H # include <sys/isa_defs.h> # endif -# ifdef _GLIBCPP_HAVE_MACHINE_PARAM_H +# ifdef HAVE_MACHINE_PARAM_H # include <machine/param.h> # endif # ifdef _LITTLE_ENDIAN @@ -72,7 +72,7 @@ typedef int Int32_t __attribute ((mode (SI))); typedef unsigned int U_int64_t __attribute ((mode (DI))); typedef int Int64_t __attribute ((mode (DI))); -#ifdef _GLIBCPP_HAVE_NAN_H +#ifdef HAVE_NAN_H # include <nan.h> #endif @@ -81,15 +81,15 @@ typedef int Int64_t __attribute ((mode (DI))); double nan (void); #endif -#ifdef _GLIBCPP_HAVE_IEEEFP_H +#ifdef HAVE_IEEEFP_H # include <ieeefp.h> #endif -#ifdef _GLIBCPP_HAVE_FP_H +#ifdef HAVE_FP_H # include <fp.h> #endif -#ifdef _GLIBCPP_HAVE_FLOAT_H +#ifdef HAVE_FLOAT_H # include <float.h> #endif @@ -262,49 +262,50 @@ do { \ qw_u.value = (d); \ (msw) = qw_u.parts64.msw; \ } while (0) - + /* Replacement for non-existing float functions. */ -#if !defined(_GLIBCPP_HAVE_FABSF) && !defined(_GLIBCPP_HAVE___BUILTIN_FABSF) +#if !defined(HAVE_FABSF) && !defined(HAVE___BUILTIN_FABSF) # define fabsf(x) fabs (x) #endif -#if !defined(_GLIBCPP_HAVE_COSF) && !defined(_GLIBCPP_HAVE___BUILTIN_COSF) +#if !defined(HAVE_COSF) && !defined(HAVE___BUILTIN_COSF) # define cosf(x) cos (x) #endif -#ifndef _GLIBCPP_HAVE_COSHF +#ifndef HAVE_COSHF # define coshf(x) cosh (x) #endif -#ifndef _GLIBCPP_HAVE_EXPF +#ifndef HAVE_EXPF # define expf(x) expf (x) #endif -#ifndef _GLIBCPP_HAVE_LOGF +#ifndef HAVE_LOGF # define logf(x) log(x) #endif -#ifndef _GLIBCPP_HAVE_LOG10F +#ifndef HAVE_LOG10F # define log10f(x) log10 (x) #endif -#ifndef _GLIBCPP_HAVE_POWF +#ifndef HAVE_POWF # define powf(x, y) pow (x, y) #endif -#if !defined(_GLIBCPP_HAVE_SINF) && !defined(_GLIBCPP_HAVE___BUILTIN_SINF) +#if !defined(HAVE_SINF) && !defined(HAVE___BUILTIN_SINF) # define sinf(x) sin (x) #endif -#ifndef _GLIBCPP_HAVE_SINHF +#ifndef HAVE_SINHF # define sinhf(x) sinh (x) #endif -#if !defined(_GLIBCPP_HAVE_SQRTF) && !defined(_GLIBCPP_HAVE___BUILTIN_SQRTF) +#if !defined(HAVE_SQRTF) && !defined(HAVE___BUILTIN_SQRTF) # define sqrtf(x) sqrt (x) #endif -#ifndef _GLIBCPP_HAVE_TANF +#ifndef HAVE_TANF # define tanf(x) tan (x) #endif -#ifndef _GLIBCPP_HAVE_TANHF +#ifndef HAVE_TANHF # define tanhf(x) tanh (x) #endif -#ifndef _GLIBCPP_HAVE_STRTOF +#ifndef HAVE_STRTOF # define strtof(s, e) strtod (s, e) #endif #ifdef __cplusplus } #endif + diff --git a/libstdc++-v3/libmath/stubs.c b/libstdc++-v3/libmath/stubs.c index 515564f..cba6f84 100644 --- a/libstdc++-v3/libmath/stubs.c +++ b/libstdc++-v3/libmath/stubs.c @@ -28,7 +28,7 @@ the GNU General Public License. */ #include <math.h> -#include <bits/c++config.h> +#include <config.h> #ifndef _GLIBCPP_HAVE_ATAN2F float |