diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bits/stdio_lim.h | 40 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/w_pow.c | 5 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/w_powf.c | 5 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/w_powl.c | 5 | ||||
| -rw-r--r-- | sysdeps/posix/Makefile | 37 | ||||
| -rw-r--r-- | sysdeps/posix/mk-stdiolim.c | 106 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Dist | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 27 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/stdio_lim.h.in | 43 |
9 files changed, 9 insertions, 260 deletions
diff --git a/sysdeps/generic/bits/stdio_lim.h b/sysdeps/generic/bits/stdio_lim.h deleted file mode 100644 index 86e83cf1e2..0000000000 --- a/sysdeps/generic/bits/stdio_lim.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Stdio limits for non-POSIX systems. - Copyright (C) 1994, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#if !defined _STDIO_H && !defined __need_FOPEN_MAX -# error "Never include <bits/stdio_lim.h> directly; use <stdio.h> instead." -#endif - -#ifndef __need_FOPEN_MAX -# define L_tmpnam 1 -# define TMP_MAX 0 - -# ifdef __USE_POSIX -# define L_ctermid 1 -# define L_cuserid 1 -# endif - -# define FILENAME_MAX 14 -#endif - -#if defined __need_FOPEN_MAX && !defined __defined_FOPEN_MAX -# define __defined_FOPEN_MAX -# define FOPEN_MAX 16 -#endif -#undef __need_FOPEN_MAX diff --git a/sysdeps/libm-ieee754/w_pow.c b/sysdeps/libm-ieee754/w_pow.c index 1711d71bda..5850651a1a 100644 --- a/sysdeps/libm-ieee754/w_pow.c +++ b/sysdeps/libm-ieee754/w_pow.c @@ -39,14 +39,15 @@ else return z; } - if(x==0.0){ + if(x==0.0) { if(y==0.0) return __kernel_standard(x,y,20); /* pow(0.0,0.0) */ - if(__finite(y)&&y<0.0) + if(__finite(y)&&y<0.0) { if (signbit (x) && signbit (z)) return __kernel_standard(x,y,23); /* pow(-0.0,negative) */ else return __kernel_standard(x,y,43); /* pow(+0.0,negative) */ + } return z; } if(!__finite(z)) { diff --git a/sysdeps/libm-ieee754/w_powf.c b/sysdeps/libm-ieee754/w_powf.c index 0b20822be8..32196fd89f 100644 --- a/sysdeps/libm-ieee754/w_powf.c +++ b/sysdeps/libm-ieee754/w_powf.c @@ -45,16 +45,17 @@ static char rcsid[] = "$NetBSD: w_powf.c,v 1.3 1995/05/10 20:49:41 jtc Exp $"; else return z; } - if(x==(float)0.0){ + if(x==(float)0.0) { if(y==(float)0.0) /* powf(0.0,0.0) */ return (float)__kernel_standard((double)x,(double)y,120); - if(__finitef(y)&&y<(float)0.0) + if(__finitef(y)&&y<(float)0.0) { if (signbit (x) && signbit (z)) /* powf(0.0,negative) */ return (float)__kernel_standard((double)x,(double)y,123); else return (float)__kernel_standard((double)x,(double)y,143); + } return z; } if(!__finitef(z)) { diff --git a/sysdeps/libm-ieee754/w_powl.c b/sysdeps/libm-ieee754/w_powl.c index 3529b5024c..17feb9fc61 100644 --- a/sysdeps/libm-ieee754/w_powl.c +++ b/sysdeps/libm-ieee754/w_powl.c @@ -41,14 +41,15 @@ else return z; } - if(x==0.0){ + if(x==0.0) { if(y==0.0) return __kernel_standard(x,y,220); /* pow(0.0,0.0) */ - if(__finitel(y)&&y<0.0) + if(__finitel(y)&&y<0.0) { if (signbit (x) && signbit (z)) return __kernel_standard(x,y,223); /* pow(-0.0,negative) */ else return __kernel_standard(x,y,243); /* pow(+0.0,negative) */ + } return z; } if(!__finitel(z)) { diff --git a/sysdeps/posix/Makefile b/sysdeps/posix/Makefile deleted file mode 100644 index 7806e4e86f..0000000000 --- a/sysdeps/posix/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. -# This file is part of the GNU C Library. - -# The GNU C Library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. - -# The GNU C Library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. - -# You should have received a copy of the GNU Library General Public -# License along with the GNU C Library; see the file COPYING.LIB. If not, -# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -ifneq (yes,$(inhibit-stdio_lim)) -# Disable these rules if we generate stdio_lim.h by other means. - -$(common-objpfx)bits/stdio_lim.h: $(common-objpfx)mk-stdiolim - $(dir $<)$(notdir $<) > $@-t - mv $@-t $@ - -# Turn into a version that works when cd'd into $(objdir). -mk-stdiolim-CFLAGS = $(patsubst -I$(shell pwd)//%,-I/%,\ - $(patsubst -I%,-I$(shell pwd)/%,$(+includes))) -# $(ALL_BUILD_CFLAGS) needs to come last because it contains unwanted -Is. -$(common-objpfx)mk-stdiolim: $(sysdep_dir)/posix/mk-stdiolim.c \ - $(..)posix/bits/posix1_lim.h bits/local_lim.h - $(common-objdir-compile) - -common-generated := $(common-generated) bits/stdio_lim.h mk-stdiolim -before-compile := $(before-compile) $(common-objpfx)bits/stdio_lim.h - -endif # inhibit-stdio_lim diff --git a/sysdeps/posix/mk-stdiolim.c b/sysdeps/posix/mk-stdiolim.c deleted file mode 100644 index ec482dee96..0000000000 --- a/sysdeps/posix/mk-stdiolim.c +++ /dev/null @@ -1,106 +0,0 @@ -/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <bits/posix1_lim.h> - -int -main() -{ - /* Print copyright message. */ - printf ("\ -/* Stdio limits for POSIX systems.\n\ - Copyright (C) 1994, 1997 Free Software Foundation, Inc.\n\ - This file is part of the GNU C Library.\n\ -\n\ - The GNU C Library is free software; you can redistribute it and/or\n\ - modify it under the terms of the GNU Library General Public License as\n\ - published by the Free Software Foundation; either version 2 of the\n\ - License, or (at your option) any later version.\n\ -\n\ - The GNU C Library is distributed in the hope that it will be useful,\n\ - but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n\ - Library General Public License for more details.\n\ -\n\ - You should have received a copy of the GNU Library General Publicn\n\ - License along with the GNU C Library; see the file COPYING.LIB. If not,\n\ - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n\ - Boston, MA 02111-1307, USA. */\n\ -\n\ -#if !defined _STDIO_H && !defined __need_FOPEN_MAX\n\ -# error \"Never include <bits/stdio_lim.h> directly; use <stdio.h> instead.\"\n\ -#endif\n\ -\n"); - - /* These values correspond to the code in sysdeps/posix/tempname.c. - Change the values here if you change that code. */ - puts ("#ifdef _STDIO_H"); - printf ("# define L_tmpnam %u\n", sizeof ("/usr/tmp/") + 9); - printf ("# define TMP_MAX %u\n", 62 * 62 * 62); - - puts ("# ifdef __USE_POSIX"); - printf ("# define L_ctermid %u\n", sizeof ("/dev/tty")); - printf ("# define L_cuserid 9\n"); - puts ("# endif"); - - printf (" #define FILENAME_MAX %u\n", -#ifdef PATH_MAX - PATH_MAX -#else - /* This is supposed to be the size needed to hold the longest file - name string the implementation guarantees can be opened. - PATH_MAX not being defined means the actual limit on the length - of a file name is runtime-variant (or it is unlimited). ISO - says in such a case FILENAME_MAX should be a good size to - allocate for a file name string. POSIX.1 guarantees that a - file name up to _POSIX_PATH_MAX chars long can be opened, so - this value must be at least that. */ - 1024 /* _POSIX_PATH_MAX is 255. */ -#endif - ); - - puts ("# undef __need_FOPEN_MAX"); - puts ("# define __need_FOPEN_MAX 1"); - puts ("#endif\n"); - - /* POSIX does not require that OPEN_MAX and PATH_MAX be defined, so - <bits/local_lim.h> will not define them if they are run-time - variant (which is the case in the Hurd). ISO still requires - that FOPEN_MAX and FILENAME_MAX be defined, however. */ - - puts ("#if defined __need_FOPEN_MAX && !defined __defined_FOPEN_MAX"); - puts ("# define __defined_FOPEN_MAX"); - printf ("# define FOPEN_MAX %u\n", -#ifdef OPEN_MAX - - OPEN_MAX -#else - /* This is the minimum number of files that the implementation - guarantees can be open simultaneously. OPEN_MAX not being - defined means the maximum is run-time variant; but POSIX.1 - requires that it never be less than _POSIX_OPEN_MAX, so that is - a good minimum to use. */ - _POSIX_OPEN_MAX -#endif - - ); - puts ("#endif"); - puts ("#undef __need_FOPEN_MAX"); - - exit (0); -} diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist index e96ef14c92..66d926655e 100644 --- a/sysdeps/unix/sysv/linux/Dist +++ b/sysdeps/unix/sysv/linux/Dist @@ -1,5 +1,4 @@ bits/pthreadtypes.h -stdio_lim.h.in cmsg_nxthdr.c errlist.h init-first.h diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 6d6276a463..fa12c056e2 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -89,32 +89,6 @@ endif # Don't compile the ctype glue code, since there is no old non-GNU C library. inhibit-glue = yes -# Tell sysdeps/posix/Makefile that we create stdio_lim.h differently. -inhibit-stdio_lim = yes - -$(common-objpfx)bits/stdio_%.h $(common-objpfx)bits/stdio_%.d: \ - $(..)sysdeps/unix/sysv/linux/stdio_%.h.in - rm -f $(@:.h=.d) $(@:.d=.h)-t - echo '#include <linux/limits.h>' | \ - SUNPRO_DEPENDENCIES='$(@:.h=.d) \ - $(patsubst $(common-objpfx)%,$$(common-objpfx)%,\ - $(@:.d=.h) $(@:.h=.d))' \ - $(CC) -E -dM - > $(@:.d=.h)-t - fopen_max=`sed -n 's/^#define OPEN_MAX //p' $(@:.d=.h)-t`; \ - filename_max=`sed -n 's/^#define PATH_MAX //p' $(@:.d=.h)-t`; \ - if test -n "$$fopen_max" && test -n "$$filename_max"; then \ - sed -e "s/DEFAULT_FOPEN_MAX/$$fopen_max/" \ - -e "s/DEFAULT_FILENAME_MAX/$$filename_max/" $< \ - > $(@:.d=.h).new && \ - mv -f $(@:.d=.h).new $(@:.d=.h); \ - else exit 1; fi -# Remove this last so that it can be examined if something went wrong. - rm -f $(@:.d=.h)-t -ifndef no_deps -# Get the list of dependencies (probably /usr/include/linux/limits.h). --include $(common-objpfx)bits/stdio_lim.d -endif - ifeq ($(subdir),signal) sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ rt_sigqueueinfo rt_sigaction rt_sigpending @@ -128,4 +102,3 @@ ifeq ($(subdir),nis) CFLAGS-ypclnt.c = -DUSE_BINDINGDIR=1 endif -common-generated += bits/stdio_lim.h bits/stdio_lim.d diff --git a/sysdeps/unix/sysv/linux/stdio_lim.h.in b/sysdeps/unix/sysv/linux/stdio_lim.h.in deleted file mode 100644 index bded904ef0..0000000000 --- a/sysdeps/unix/sysv/linux/stdio_lim.h.in +++ /dev/null @@ -1,43 +0,0 @@ -/* Stdio limits for Linux. - Copyright (C) 1994, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#if !defined _STDIO_H && !defined __need_FOPEN_MAX -# error "Never include <bits/stdio_lim.h> directly; use <stdio.h> instead." -#endif - -#ifdef _STDIO_H -# define L_tmpnam 19 -# define TMP_MAX 238328 - -# ifdef __USE_POSIX -# define L_ctermid 9 -# define L_cuserid 9 -# endif - -# define FILENAME_MAX DEFAULT_FILENAME_MAX - -# undef __need_FOPEN_MAX -# define __need_FOPEN_MAX -#endif - -#if defined __need_FOPEN_MAX && !defined __defined_FOPEN_MAX -# define __defined_FOPEN_MAX -# define FOPEN_MAX DEFAULT_FOPEN_MAX -#endif -#undef __need_FOPEN_MAX |