From ec4b0518a39f46354c0d75b4c3e2f507c9af261e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 20 Sep 1996 01:58:09 +0000 Subject: update from main archive 960919 Thu Sep 19 21:50:55 1996 Ulrich Drepper * sysdeps/posix/gettimeofday.c (__gettimeofday): Use localtime_r instead of localtime. Reported by Matthias Urlichs. * shlib-versions: Remove version number for libcrypt. * features.h: Define __USE_REENTRANT if _REENTRANT or _THREAD_SAFE. * libc-symbols.h: Define _REENTRANT while compiling libc. * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): Define even if !_LIBC_REENTRANT. * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): Likewise. * sysdeps/posix/cuserid.h: Remove prototype for geteuid(). De-ANSI-fy. * MakeTAGS ($P/libc.pot): Generate correctly formed header. * po/header.pot: Correct title line. * po/nl.po: Update. Thu Sep 19 18:59:55 1996 Ulrich Drepper * Makeconfig (soversions.mk): Prefer shared lib version numbers is add ons over version in libc itself. * sysdeps/unix/sysv/linux/i386/sysdep.S: Include . * sysdeps/unix/sysv/linux/i386/sysdep.h: Prevent multiple inclusion. * libio/iofgets.c: Use __flockfile and __funlockfile instead of _IO_flockfile and _IO_funlockfile resp. * locale/categories.def: Partly support for correct `era' handling in LC_TIME category. * locale/langinfo.h: Likewise. * locale/programs/ld-time.c: Likewise. * locale/localeinfo.h: Change comment a bit. * malloc/memalign.c: Don't use goto, not necessary anymore. 1996-09-18 Paul Eggert * time/mktime.c (ydhms_tm_diff): Work correctly even if year is negative, or if time_t is unsigned. * time/strftime.c (tm_diff): Work correctly even if tm_year is near INT_MIN. Tue Sep 17 16:14:34 1996 Andreas Schwab * sysdeps/m68k/fpu/__math.h (__inline_mathop): Changed to generate all three versions of the math function. (__inline_mathopf, __inline_mathopl): Removed. (__inline_functions): New temporary definition containing all non-trivial inline functions. Wed Sep 18 00:25:41 1996 Ulrich Drepper * time/strftime.c (strftime): The T_FMT_AMPM string may be empty. Tue Sep 17 20:27:18 1996 Ulrich Drepper * math/Makefile (extra-libs-others): Use $(extra-libs) instead of $(extra-libc). Tue Sep 17 17:09:44 1996 Ulrich Drepper * sysdeps/stub/fpu_control.h: Correct end of file comment. Tue Sep 17 05:39:18 1996 Ulrich Drepper * stdio-common/bug3.c, stdio-common/bug4.c, stdio-common/bug5.c, stdio-common/test-popen.c: Remove temporary files after test. * stdio-common/bug5.c: Use `system' instead of `execlp'. Patches by Andreas Jaeger. * stdio-common/bug5.c: Create string for `system' argument to make sure the input and output file names are really correct. Sun Sep 15 12:46:44 1996 Andreas Schwab * configure.in: If $os contains a hyphen add the part before the hyphen to $ostry. Sun Sep 15 18:14:02 1996 Andreas Schwab * sysdeps/m68k/fpu/__math.h (__ieee754_pow, __ieee754_powf, __ieee754_powl): Rename local variable i to __i. (__ieee754_atan2, __ieee754_atan2f, __ieee754_atan2l): New inline functions. * sysdeps/m68k/fpu/e_atan2.c, sysdeps/m68k/fpu/e_atan2f.c, sysdeps/m68k/fpu/e_atan2l.c: New files. 1996-09-15 Paul Eggert * manual/time.texi: Change `range X to Y' to `range X through Y', to avoid ambiguity in English. (strftime): Numbers that do not have a range indicated are not padded. Describe E and O modifiers. %g, %G, %u: New formats. %C, %y, %Y: Describe behavior on negative years. %e: Fix typo (was labeled %d). %l, %V: Fix typo in range. %M, %S, %U, %w, %W: Give ranges. %p: Clarify how noon and midnight are handled for AM and PM. %s: Clarify leap second handling. %r: Now locale-defined. %C, %D, %e, %h, %n, %r, %t, %T: Say that they are POSIX.2 extensions. %z: Say that it is a GNU extension. %Z: Wording fix. * time/strftime.c: (strftime): %V: Fix mishandling of week numbers near year boundaries. %g, %G: New formats (suggested by Arthur David Olson). %U, %W: Use inline expression instead of `week' function. %C, %y: Handle negative years portably. %C, %Y: Use width 1, since values can be arbitrarily wide. %r: Use T_FMT_AMPM format if _NL_CURRENT is defined. %u: New Posix.2 format. %w: Width is 1, not 2. (iso_week_days): New function, for %V, %G, %g. (week): Remove; it didn't handle %V correctly. (__isleap): New macro. (mbsinit): Use arg, to pacify GCC -Wall. 1996-09-13 Paul Eggert * time/strftime.c (strftime): If using the GNU C library, do not bother to check for multibyte encodings, since they're safe in formats. Otherwise: - Check for multibyte encodings when encountering any character that is not in the basic execution character set of the C Standard. - Use mbrlen (if available) instead of mblen, to avoid modifying mblen's internal state. - Do not assume that '%' cannot appear as the first character of a multibyte character sequence, since this is possible when not in the initial shift state. (HAVE_MBRLEN, MULTIBYTE_IS_FORMAT_SAFE): Define if _LIBC is defined. (DO_MULTIBYTE): New macro. (): Do not include. (): Include if HAVE_MBRLEN. (mbstate_t, mbrlen, mbsinit): Define if ! HAVE_MBRLEN. (mbstate_zero): New constant. 1996-09-12 Paul Eggert * time/strftime.c (strftime): Use an empty zone if it can't be determined; POSIX.2 requires this. Use plain `int' for pad and modifier (which now contain char value). Use plain `int' for number_value, to print negative values correctly. Use plain `int' for digits; there was no need to make it unsigned. Initialize subfmt consistently. Remove incorrect code for %EC and %Ey; they aren't implemented yet. For %O, if there is no alternate digit, output Ascii instead of "". Output the `%' of an unknown format; this is most likely the right thing to do if a multibyte string has been misparsed. Thu Sep 12 23:23:13 1996 Andreas Schwab * stdio-common/scanf7.c (main): Remove extra conversion from printf format string. Thu Sep 12 23:01:16 1996 Andreas Schwab * stdlib/test-canon.c (tests): Rename structure member from errno to error, all uses changed. Thu Sep 12 20:08:06 1996 Andreas Schwab * sysdeps/m68k/fpu/__math.h (__ldexp, __ldexpf, __ldexpl): Removed. * sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c, sysdeps/m68k/fpu/s_ldexpl.c: Removed, use generic implementation instead. * sysdeps/m68k/fpu/s_scalbn.c, sysdeps/m68k/fpu/s_scalbnf.c, sysdeps/m68k/fpu/s_scalbnl.c: Replaced with old contents of s_ldexp.c, s_ldexpf.c and s_ldexpl.c, resp., suitably adpted. * sysdeps/m68k/fpu/__math.h (__frexp, __frexpf, __frexpl): Return value must be in [0.5, 1), not [1, 2). Reported by Chris Lawrence. (__ilogb, __ilogbf, __ilogbl): Check for argument being zero. (__scalbn, __scalbnf, __scalbnl): Use second argument directly. Thu Sep 12 19:59:24 1996 Andreas Schwab * sysdeps/libm-ieee754/e_acoshl.c: Fix typos. * sysdeps/libm-ieee754/s_cbrtl.c: Remove unused variable. Thu Sep 12 19:59:24 1996 Andreas Schwab * sysdeps/libm-ieee754/e_acoshl.c: Fix typos. * sysdeps/libm-ieee754/s_cbrtl.c: Remove unused variable. Thu Sep 12 19:56:07 1996 Andreas Schwab * inet/herrno.c (__h_errno_location): Fix return type. Tue Sep 17 10:51:58 1996 Thomas Bushnell, n/BSG * malloc/memalign.c (memalign): Only acquire __libc_malloc_lock for actual modifications to global state. Fri Sep 13 01:21:36 1996 Thomas Bushnell, n/BSG * sysdeps/mach/Makefile (includes): Add -I$(common-objpfx)mach/. * sysdeps/mach/hurd/Makefile (includes): Add -I$(common-objpfx)hurd/. Reported by Marcus Daniels. * sysdeps/generic/schedbits.h (struct sched_param): Renamed from struct sched_params. * sysdeps/stub/sched_setp.c (__sched_setparam): struct sched_params -> struct sched_param. * sysdeps/stub/sched_getp.c (__sched_getparam): Likewise. * sysdeps/stub/sched_sets.c (__sched_setscheduler): Likewise. Thu Sep 12 23:58:25 1996 Thomas Bushnell, n/BSG * sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): Fix syntax error. * stdio-common/Makefile: Put lockfile in routines unconditionally. Define _MT_SAFE_IO if using for libio and compiling reentrant libc. * stdio-common/vfprintf.c (__flockfile, __funlockfile): Declare this always, not just if _LIBC_REENTRANT. (__funlockfile): Don't use weak_extern for this one; __libc_cleanup_region_end might be defined and the use of __funlockfile can't be protected the way the use of __flockfile can be. * sched.h: New file. Helper to access posix/sched.h. Thu Sep 12 12:33:52 1996 Thomas Bushnell, n/BSG * sysdeps/mach/hurd/dl-cache.c: Delete second copy of file accidentally added on. * sysdeps/stub/intr-msg.h: New file. * stdio-common/vfprintf.c: Include . * stdio-common/vfscanf.c: Include . * sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): New macro. (__libc_cleanup_region_end): New macro. --- sysdeps/libm-ieee754/e_acoshl.c | 8 +- sysdeps/libm-ieee754/s_cbrtl.c | 1 - sysdeps/m68k/fpu/__math.h | 775 ++++++++++------------------------ sysdeps/m68k/fpu/s_ldexp.c | 39 -- sysdeps/m68k/fpu/s_ldexpf.c | 5 - sysdeps/m68k/fpu/s_ldexpl.c | 5 - sysdeps/m68k/fpu/s_scalbn.c | 38 ++ sysdeps/m68k/fpu/s_scalbnf.c | 4 + sysdeps/m68k/fpu/s_scalbnl.c | 4 + sysdeps/posix/cuserid.c | 13 +- sysdeps/posix/gettimeofday.c | 2 +- sysdeps/stub/fpu_control.h | 2 +- sysdeps/unix/sysv/linux/i386/sysdep.S | 12 +- sysdeps/unix/sysv/linux/i386/sysdep.h | 5 + sysdeps/unix/sysv/linux/m68k/sysdep.S | 2 - 15 files changed, 297 insertions(+), 618 deletions(-) delete mode 100644 sysdeps/m68k/fpu/s_ldexp.c delete mode 100644 sysdeps/m68k/fpu/s_ldexpf.c delete mode 100644 sysdeps/m68k/fpu/s_ldexpl.c (limited to 'sysdeps') diff --git a/sysdeps/libm-ieee754/e_acoshl.c b/sysdeps/libm-ieee754/e_acoshl.c index 8af7c27aa7..7b7bea7054 100644 --- a/sysdeps/libm-ieee754/e_acoshl.c +++ b/sysdeps/libm-ieee754/e_acoshl.c @@ -52,17 +52,17 @@ ln2 = 6.931471805599453094287e-01L; /* 0x3FFE, 0xB17217F7, 0xD1CF79AC */ { long double t; u_int32_t se,i0,i1; - EXTRACT_LDOUBLE_WORDS(se,i0,i1,x); + GET_LDOUBLE_WORDS(se,i0,i1,x); if(se<0x3fff) { /* x < 1 */ return (x-x)/(x-x); - } else if(hx >=0x401b) { /* x > 2**28 */ - if(hx >=0x7fff) { /* x is inf of NaN */ + } else if(se >=0x401b) { /* x > 2**28 */ + if(se >=0x7fff) { /* x is inf of NaN */ return x+x; } else return __ieee754_logl(x)+ln2; /* acoshl(huge)=logl(2x) */ } else if(((se-0x3fff)|i0|i1)==0) { return 0.0; /* acosh(1) = 0 */ - } else if (hx > 0x4000) { /* 2**28 > x > 2 */ + } else if (se > 0x4000) { /* 2**28 > x > 2 */ t=x*x; return __ieee754_logl(2.0*x-one/(x+__ieee754_sqrtl(t-one))); } else { /* 1 0) \ + { \ + if (__y > 0) \ + { \ + if (__x > __y) \ + return __m81_u(__atan##__s) (__y / __x); \ + else \ + return __pi_2 - __m81_u(__atan##__s) (__x / __y); \ + } \ + else \ + { \ + if (__x > -__y) \ + return __m81_u(__atan##__s) (__y / __x); \ + else \ + return -__pi_2 - __m81_u(__atan##__s) (__x / __y); \ + } \ + } \ + else \ + { \ + if (__y > 0) \ + { \ + if (-__x < __y) \ + return __pi + __m81_u(__atan##__s) (__y / __x); \ + else \ + return __pi_2 - __m81_u(__atan##__s) (__x / __y); \ + } \ + else \ + { \ + if (-__x > -__y) \ + return -__pi + __m81_u(__atan##__s) (__y / __x); \ + else \ + return -__pi_2 - __m81_u(__atan##__s) (__x / __y); \ + } \ + } \ +} \ + \ +__m81_inline __float_type \ +__m81_u(__frexp##__s)(__float_type __value, int *__expptr) \ +{ \ + __float_type __mantissa, __exponent; \ + int __iexponent; \ + if (__value == 0.0) \ + { \ + *__expptr = 0; \ + return __value; \ + } \ + __asm("fgetexp%.x %1, %0" : "=f" (__exponent) : "f" (__value)); \ + __iexponent = (int) __exponent + 1; \ + *__expptr = __iexponent; \ + __asm("fscale%.l %2, %0" : "=f" (__mantissa) \ + : "0" (__value), "dmi" (-__iexponent)); \ + return __mantissa; \ +} \ + \ +__m81_defun (__float_type, __floor##__s, (__float_type __x)) \ +{ \ + __float_type __result; \ + unsigned long int __ctrl_reg; \ + __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); \ + /* Set rounding towards negative infinity. */ \ + __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + : "dmi" ((__ctrl_reg & ~0x10) | 0x20)); \ + /* Convert X to an integer, using -Inf rounding. */ \ + __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); \ + /* Restore the previous rounding mode. */ \ + __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + : "dmi" (__ctrl_reg)); \ + return __result; \ +} \ + \ +__m81_defun (__float_type, \ + __ieee754_pow##__s, (__float_type __x, __float_type __y)) \ +{ \ + __float_type __result; \ + if (__x == 0.0) \ + { \ + if (__y <= 0.0) \ + __result = 0.0 / 0.0; \ + else \ + __result = 0.0; \ + } \ + else if (__y == 0.0 || __x == 1.0) \ + __result = 1.0; \ + else if (__y == 1.0) \ + __result = __x; \ + else if (__y == 2.0) \ + __result = __x * __x; \ + else if (__x == 10.0) \ + __asm("ftentox%.x %1, %0" : "=f" (__result) : "f" (__y)); \ + else if (__x == 2.0) \ + __asm("ftwotox%.x %1, %0" : "=f" (__result) : "f" (__y)); \ + else if (__x < 0.0) \ + { \ + __float_type __temp = __m81_u (__rint##__s) (__y); \ + if (__y == __temp) \ + { \ + int __i = (int) __y; \ + __result = (__m81_u(__ieee754_exp##__s) \ + (__y * __m81_u(__ieee754_log##__s) (-__x))); \ + if (__i & 1) \ + __result = -__result; \ + } \ + else \ + __result = 0.0 / 0.0; \ + } \ + else \ + __result = (__m81_u(__ieee754_exp##__s) \ + (__y * __m81_u(__ieee754_log##__s) (__x))); \ + return __result; \ +} \ + \ +__m81_defun (__float_type, __ceil##__s, (__float_type __x)) \ +{ \ + __float_type __result; \ + unsigned long int __ctrl_reg; \ + __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); \ + /* Set rounding towards positive infinity. */ \ + __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + : "dmi" (__ctrl_reg | 0x30)); \ + /* Convert X to an integer, using +Inf rounding. */ \ + __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); \ + /* Restore the previous rounding mode. */ \ + __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + : "dmi" (__ctrl_reg)); \ + return __result; \ +} \ + \ +__m81_inline __float_type \ +__m81_u(__modf##__s)(__float_type __value, __float_type *__iptr) \ +{ \ + __float_type __modf_int; \ + __asm ("fintrz%.x %1, %0" : "=f" (__modf_int) : "f" (__value)); \ + *__iptr = __modf_int; \ + return __value - __modf_int; \ +} \ + \ +__m81_defun (int, __isinf##__s, (__float_type __value)) \ +{ \ + /* There is no branch-condition for infinity, \ + so we must extract and examine the condition codes manually. */ \ + unsigned long int __fpsr; \ + __asm("ftst%.x %1\n" \ + "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value)); \ + return (__fpsr & (2 << 24)) ? (__fpsr & (8 << 24) ? -1 : 1) : 0; \ +} \ + \ +__m81_defun (int, __isnan##__s, (__float_type __value)) \ +{ \ + char __result; \ + __asm("ftst%.x %1\n" \ + "fsun %0" : "=dm" (__result) : "f" (__value)); \ + return __result; \ +} \ + \ +__m81_defun (int, __finite##__s, (__float_type __value)) \ +{ \ + /* There is no branch-condition for infinity, so we must extract and \ + examine the condition codes manually. */ \ + unsigned long int __fpsr; \ + __asm ("ftst%.x %1\n" \ + "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value)); \ + return (__fpsr & (3 << 24)) == 0; \ +} \ + \ +__m81_defun (int, __ilogb##__s, (__float_type __x)) \ +{ \ + __float_type __result; \ + if (__x == 0.0) \ + return 0x80000001; \ + __asm("fgetexp%.x %1, %0" : "=f" (__result) : "f" (__x)); \ + return (int) __result; \ +} \ + \ +__m81_defun (__float_type, \ + __ieee754_scalb##__s, (__float_type __x, __float_type __n)) \ +{ \ + __float_type __result; \ + __asm ("fscale%.x %1, %0" : "=f" (__result) : "f" (__n), "0" (__x)); \ + return __result; \ +} \ + \ +__m81_defun (__float_type, __scalbn##__s, (__float_type __x, int __n)) \ +{ \ + __float_type __result; \ + __asm ("fscale%.l %1, %0" : "=f" (__result) : "dmi" (__n), "0" (__x)); \ + return __result; \ +} + +/* This defines the three variants of the inline functions. */ +__inline_functions (double, ) +__inline_functions (float, f) +__inline_functions (long double, l) +#undef __inline_functions #endif /* GCC. */ diff --git a/sysdeps/m68k/fpu/s_ldexp.c b/sysdeps/m68k/fpu/s_ldexp.c deleted file mode 100644 index 18f4d43c37..0000000000 --- a/sysdeps/m68k/fpu/s_ldexp.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 1996 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., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include -#define __NO_M81_MATH_INLINES -#include - -#ifndef FUNC -#define FUNC ldexp -#endif -#ifndef float_type -#define float_type double -#endif - -#define __CONCATX(a,b) __CONCAT(a,b) - -float_type -DEFUN(__CONCATX(__,FUNC), (x, exp), float_type x AND int exp) -{ - return __m81_u(__CONCATX(__,FUNC))(x, exp); -} - -#define weak_aliasx(a,b) weak_alias(a,b) -weak_aliasx (__CONCATX(__,FUNC), FUNC) diff --git a/sysdeps/m68k/fpu/s_ldexpf.c b/sysdeps/m68k/fpu/s_ldexpf.c deleted file mode 100644 index 81a6b28acc..0000000000 --- a/sysdeps/m68k/fpu/s_ldexpf.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef FUNC -#define FUNC ldexpf -#endif -#define float_type float -#include diff --git a/sysdeps/m68k/fpu/s_ldexpl.c b/sysdeps/m68k/fpu/s_ldexpl.c deleted file mode 100644 index 25796b75f4..0000000000 --- a/sysdeps/m68k/fpu/s_ldexpl.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef FUNC -#define FUNC ldexpl -#endif -#define float_type long double -#include diff --git a/sysdeps/m68k/fpu/s_scalbn.c b/sysdeps/m68k/fpu/s_scalbn.c index 433aa757d2..4039bba652 100644 --- a/sysdeps/m68k/fpu/s_scalbn.c +++ b/sysdeps/m68k/fpu/s_scalbn.c @@ -1,2 +1,40 @@ +/* Copyright (C) 1996 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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#define __NO_M81_MATH_INLINES +#include + +#ifndef FUNC #define FUNC scalbn #include +#endif +#ifndef float_type +#define float_type double +#endif + +#define __CONCATX(a,b) __CONCAT(a,b) + +float_type +DEFUN(__CONCATX(__,FUNC), (x, exp), float_type x AND int exp) +{ + return __m81_u(__CONCATX(__,FUNC))(x, exp); +} + +#define weak_aliasx(a,b) weak_alias(a,b) +weak_aliasx (__CONCATX(__,FUNC), FUNC) diff --git a/sysdeps/m68k/fpu/s_scalbnf.c b/sysdeps/m68k/fpu/s_scalbnf.c index 00461dc30c..55d64fd502 100644 --- a/sysdeps/m68k/fpu/s_scalbnf.c +++ b/sysdeps/m68k/fpu/s_scalbnf.c @@ -1,2 +1,6 @@ +#ifndef FUNC #define FUNC scalbnf #include +#endif +#define float_type float +#include diff --git a/sysdeps/m68k/fpu/s_scalbnl.c b/sysdeps/m68k/fpu/s_scalbnl.c index 83e8bfefc1..84849921dc 100644 --- a/sysdeps/m68k/fpu/s_scalbnl.c +++ b/sysdeps/m68k/fpu/s_scalbnl.c @@ -1,2 +1,6 @@ +#ifndef FUNC #define FUNC scalbnl #include +#endif +#define float_type long double +#include diff --git a/sysdeps/posix/cuserid.c b/sysdeps/posix/cuserid.c index b874e909ce..2fe535ea1d 100644 --- a/sysdeps/posix/cuserid.c +++ b/sysdeps/posix/cuserid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996 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 @@ -16,22 +16,19 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include -extern int EXFUN(geteuid, (NOARGS)); - - /* Return the username of the caller. If S is not NULL, it points to a buffer of at least L_cuserid bytes into which the name is copied; otherwise, a static buffer is used. */ char * -DEFUN(cuserid, (s), char *s) +cuserid (s) + char *s; { static char name[L_cuserid]; - struct passwd *pwent = getpwuid(geteuid()); + struct passwd *pwent = getpwuid (geteuid ()); if (pwent == NULL) { @@ -42,5 +39,5 @@ DEFUN(cuserid, (s), char *s) if (s == NULL) s = name; - return strcpy(s, pwent->pw_name); + return strcpy (s, pwent->pw_name); } diff --git a/sysdeps/posix/gettimeofday.c b/sysdeps/posix/gettimeofday.c index c3b8108258..3c079a5af2 100644 --- a/sysdeps/posix/gettimeofday.c +++ b/sysdeps/posix/gettimeofday.c @@ -56,7 +56,7 @@ __gettimeofday (tv, tz) save_tzname[0] = __tzname[0]; save_tzname[1] = __tzname[1]; - tmp = localtime (&timer, &tm); + tmp = localtime_r (&timer, &tm); tz->tz_minuteswest = __timezone / 60; tz->tz_dsttime = __daylight; diff --git a/sysdeps/stub/fpu_control.h b/sysdeps/stub/fpu_control.h index 65f58824ae..832c15aac9 100644 --- a/sysdeps/stub/fpu_control.h +++ b/sysdeps/stub/fpu_control.h @@ -43,4 +43,4 @@ extern void __setfpucw __P ((fpu_control_t)); __END_DECLS -#endif /* _M68K_FPU_CONTROL_H */ +#endif /* _FPU_CONTROL_H */ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.S b/sysdeps/unix/sysv/linux/i386/sysdep.S index 7d5444d6a6..0f3e31dbce 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.S +++ b/sysdeps/unix/sysv/linux/i386/sysdep.S @@ -16,6 +16,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include + /* Because the Linux version is in fact i386/ELF and the start.? file for this system (sysdeps/i386/elf/start.S) is also used by The Hurd and therefore this files must not contain the definition of the @@ -43,9 +45,7 @@ _errno = errno /* This name is expected by hj libc.so.5 startup code. */ The code for Linux is almost identical to the canonical Unix/i386 code, except that the error number in %eax is negated. */ - .globl __syscall_error - .type __syscall_error,@function -__syscall_error: +ENTRY (__syscall_error) negl %eax #define __syscall_error __syscall_error_1 @@ -54,10 +54,7 @@ __syscall_error: #endif /* !PIC */ -#ifdef _LIBC_REENTRANT - .globl __errno_location - .type __errno_location,@function -__errno_location: +ENTRY (__errno_location) #ifdef PIC call .L2 .L2: popl %ecx @@ -69,4 +66,3 @@ __errno_location: ret .Lfe1: .size __errno_location, .Lfe1-__errno_location -#endif diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index 96470a19b9..cbd7b5553b 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -17,6 +17,9 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef _LINUX_I386_SYSDEP_H +#define _LINUX_I386_SYSDEP_H 1 + /* There is some commonality. */ #include @@ -179,3 +182,5 @@ syscall_error: \ #define _POPARGS_5 _POPARGS_4; popl %edi #endif /* ASSEMBLER */ + +#endif /* linux/i386/sysdep.h */ diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.S b/sysdeps/unix/sysv/linux/m68k/sysdep.S index 674715f824..b47e167159 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.S +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.S @@ -62,7 +62,6 @@ __syscall_error: .size __syscall_error, . - __syscall_error #endif /* PIC */ -#ifdef _LIBC_REENTRANT .globl __errno_location .type __errno_location, @function __errno_location: @@ -73,4 +72,3 @@ __errno_location: #endif rts .size __errno_location, . - __errno_location -#endif -- cgit v1.2.3