* [PATCH] Misc fixes
@ 2002-12-16 10:56 Jakub Jelinek
2002-12-16 11:33 ` Ulrich Drepper
0 siblings, 1 reply; 8+ messages in thread
From: Jakub Jelinek @ 2002-12-16 10:56 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
Hi!
As I mentioned in another mail, C99 designated initializers don't work ATM
in C++. Also, IA-64 needs some __syscall_* wrappers to build.
2002-12-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/fpu/bits/mathinline.h: Backout last change.
* sysdeps/ieee754/bits/nan.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/syscalls.list (__syscall_open,
__syscall_wait4, __syscall_ioctl, __syscall_write): Add.
--- libc/sysdeps/i386/fpu/bits/mathinline.h 16 Dec 2002 02:05:09 -0000 1.49
+++ libc/sysdeps/i386/fpu/bits/mathinline.h 6 Jul 2001 04:55:53 -0000 1.48
@@ -127,19 +127,19 @@
__MATH_INLINE int
__signbitf (float __x) __THROW
{
- __extension__ union { float __f; int __i; } __u = { .__f = __x };
+ __extension__ union { float __f; int __i; } __u = { __f: __x };
return __u.__i < 0;
}
__MATH_INLINE int
__signbit (double __x) __THROW
{
- __extension__ union { double __d; int __i[2]; } __u = { .__d = __x };
+ __extension__ union { double __d; int __i[2]; } __u = { __d: __x };
return __u.__i[1] < 0;
}
__MATH_INLINE int
__signbitl (long double __x) __THROW
{
- __extension__ union { long double __l; int __i[3]; } __u = { .__l = __x };
+ __extension__ union { long double __l; int __i[3]; } __u = { __l: __x };
return (__u.__i[2] & 0x8000) != 0;
}
# endif
@@ -467,7 +467,7 @@ __inline_mathop_declNP (atan, "fld1; fpa
__inline_mathcode_ (long double, __sgn1l, __x, \
__extension__ union { long double __xld; unsigned int __xi[3]; } __n = \
- { .__xld = __x }; \
+ { __xld: __x }; \
__n.__xi[2] = (__n.__xi[2] & 0x8000) | 0x3fff; \
__n.__xi[1] = 0x80000000; \
__n.__xi[0] = 0; \
@@ -666,7 +666,7 @@ __MATH_INLINE int
__finite (double __x) __THROW
{
return (__extension__
- (((((union { double __d; int __i[2]; }) {.__d = __x}).__i[1]
+ (((((union { double __d; int __i[2]; }) {__d: __x}).__i[1]
| 0x800fffffu) + 1) >> 31));
}
--- libc/sysdeps/ieee754/bits/nan.h 16 Dec 2002 02:05:09 -0000 1.6
+++ libc/sysdeps/ieee754/bits/nan.h 6 Jul 2001 04:55:54 -0000 1.5
@@ -29,7 +29,7 @@
# define NAN \
(__extension__ \
((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; }) \
- { .__l = 0x7fc00000UL }).__d)
+ { __l: 0x7fc00000UL }).__d)
#else
--- libc/sysdeps/unix/sysv/linux/ia64/syscalls.list Mon Dec 16 03:18:52 2002
+++ libc/sysdeps/unix/sysv/linux/ia64/syscalls.list Mon Dec 16 04:17:15 2002
@@ -81,6 +81,10 @@ s_stat xstat stat i:sp __syscall_stat
s_lstat lxstat lstat i:sp __syscall_lstat
s_fstat fxstat fstat i:ip __syscall_fstat
s_sysctl sysctl _sysctl i:p __syscall__sysctl
+s_open open open i:siv __syscall_open
+s_wait4 wait4 wait4 i:iWiP __syscall_wait4
+s_ioctl ioctl ioctl i:iiI __syscall_ioctl
+s_write write write i:ibn __syscall_write
# IA-64 specific
getunwind EXTRA getunwind i:pi getunwind
Jakub
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Misc fixes
2002-12-16 10:56 [PATCH] Misc fixes Jakub Jelinek
@ 2002-12-16 11:33 ` Ulrich Drepper
0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Drepper @ 2002-12-16 11:33 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Roland McGrath, Glibc hackers
Jakub Jelinek wrote:
> Hi!
>
> As I mentioned in another mail, C99 designated initializers don't work ATM
> in C++. Also, IA-64 needs some __syscall_* wrappers to build.
Applied. Thanks,
--
--------------. ,-. 444 Castro Street
Ulrich Drepper \ ,-----------------' \ Mountain View, CA 94041 USA
Red Hat `--' drepper at redhat.com `---------------------------
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] Misc fixes
@ 2009-03-10 13:42 Jakub Jelinek
0 siblings, 0 replies; 8+ messages in thread
From: Jakub Jelinek @ 2009-03-10 13:42 UTC (permalink / raw)
To: Ulrich Drepper; +Cc: Glibc hackers
Hi!
This patch fixes 2 small issues. fmemopen call in psiginfo shouldn't go
through PLT (elf/check-localplt failure) and there is a warning about
multi-line comment in sprof.c.
2009-03-10 Jakub Jelinek <jakub@redhat.com>
* include/stdio.h (fmemopen): Add libc_hidden_proto.
* libio/fmemopen.c (fmemopen): Add libc_hidden_def.
* elf/sprof.c: Avoid warning about multi-line comment.
--- libc/include/stdio.h.jj 2008-12-09 10:58:34.000000000 +0100
+++ libc/include/stdio.h 2009-03-10 14:22:16.000000000 +0100
@@ -152,6 +152,7 @@ libc_hidden_proto (fread_unlocked)
libc_hidden_proto (fwrite_unlocked)
libc_hidden_proto (fgets_unlocked)
libc_hidden_proto (fputs_unlocked)
+libc_hidden_proto (fmemopen)
libc_hidden_proto (open_memstream)
libc_hidden_proto (__libc_fatal)
libc_hidden_proto (__vsprintf_chk)
--- libc/libio/fmemopen.c.jj 2008-10-11 10:43:36.000000000 +0200
+++ libc/libio/fmemopen.c 2009-03-10 14:22:53.000000000 +0100
@@ -1,5 +1,6 @@
/* Fmemopen implementation.
- Copyright (C) 2000, 2002, 2005, 2006, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2005, 2006, 2008, 2009
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Hanno Mueller, kontakt@hanno.de, 2000.
@@ -258,3 +259,4 @@ fmemopen (void *buf, size_t len, const c
return _IO_fopencookie (c, mode, iof);
}
+libc_hidden_def (fmemopen)
--- libc/elf/sprof.c.jj 2009-02-16 14:47:24.000000000 +0100
+++ libc/elf/sprof.c 2009-03-10 13:15:52.000000000 +0100
@@ -87,7 +87,7 @@ static const struct argp_option options[
/* Short description of program. */
static const char doc[] = N_("Read and display shared object profiling data.");
-//For bug reporting instructions, please see:\n \
+//For bug reporting instructions, please see:\n
//<http://www.gnu.org/software/libc/bugs.html>.\n");
/* Strings for arguments in help texts. */
Jakub
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] Misc fixes
@ 2004-10-06 11:41 Jakub Jelinek
0 siblings, 0 replies; 8+ messages in thread
From: Jakub Jelinek @ 2004-10-06 11:41 UTC (permalink / raw)
To: Ulrich Drepper; +Cc: Glibc hackers
Hi!
Most of the changes don't probably need comments, they are there just
to shut up warnings or fix tst-clock2 failing on i386.
The __nwaiters change makes x86-64 look like the rest of arches,
consistency is good and the type really should be unsigned.
The allocatestack.c change is to make GCC 4 and 3.4.2-RH happy,
otherwise I get:
allocatestack.c:778: warning: `visibility' attribute ignored on non-class types
You know the GCC PR for this already...
2004-10-06 Jakub Jelinek <jakub@redhat.com>
* posix/tst-getaddrinfo2.c: Include stdlib.h and string.h.
(do_test): Use %p instead of 0x%08X to print a pointer.
* malloc/malloc.c: Include stdio-common/_itoa.h.
nptl/
* sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h (pthread_cond_t):
Change __data.__nwaiters from int to unsigned int.
* tst-clock2.c (do_test): Don't fail if _POSIX_THREAD_CPUTIME == 0 and
sysconf (_SC_THREAD_CPUTIME) returns negative value.
* allocatestack.c (__find_thread_by_id): Move attribute_hidden
before return type.
--- libc/posix/tst-getaddrinfo2.c.jj 2004-09-26 10:42:15.000000000 +0200
+++ libc/posix/tst-getaddrinfo2.c 2004-10-06 13:03:39.000000000 +0200
@@ -2,6 +2,8 @@
#include <errno.h>
#include <netdb.h>
#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
#include <sys/socket.h>
static int
@@ -47,7 +49,7 @@ do_test (void)
if (err)
{
printf ("FAIL getaddrinfo IPv4 socktype 0,513: "
- "fam %d alen %d addr 0x%08X addr/fam %d "
+ "fam %d alen %d addr %p addr/fam %d "
"addr/port %d H[%d]\n",
pai->ai_family, pai->ai_addrlen, psin,
psin ? psin->sin_family : 0,
--- libc/malloc/malloc.c.jj 2004-10-05 09:04:44.000000000 +0200
+++ libc/malloc/malloc.c 2004-10-06 12:59:31.000000000 +0200
@@ -257,6 +257,10 @@
#include <malloc-machine.h>
+#ifdef _LIBC
+#include <stdio-common/_itoa.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
--- libc/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h.jj 2004-09-30 00:50:04.000000000 +0200
+++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h 2004-10-06 12:55:33.312919606 +0200
@@ -100,7 +100,7 @@ typedef union
__extension__ unsigned long long int __wakeup_seq;
__extension__ unsigned long long int __woken_seq;
void *__mutex;
- int __nwaiters;
+ unsigned int __nwaiters;
unsigned int __broadcast_seq;
} __data;
char __size[__SIZEOF_PTHREAD_COND_T];
--- libc/nptl/tst-clock2.c.jj 2004-10-06 11:04:06.000000000 +0200
+++ libc/nptl/tst-clock2.c 2004-10-06 13:21:51.000000000 +0200
@@ -58,6 +58,14 @@ do_test (void)
#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
# define N 10
+# if _POSIX_THREAD_CPUTIME == 0
+ if (sysconf (_SC_THREAD_CPUTIME) < 0)
+ {
+ puts ("_POSIX_THREAD_CPUTIME option not available");
+ return 0;
+ }
+# endif
+
if (pthread_barrier_init (&b2, NULL, 2) != 0
|| pthread_barrier_init (&bN, NULL, N + 1) != 0)
{
--- libc/nptl/allocatestack.c.jj 2004-10-06 13:17:51.000000000 +0200
+++ libc/nptl/allocatestack.c 2004-10-06 13:17:51.000000000 +0200
@@ -772,8 +772,8 @@ __reclaim_stacks (void)
#if HP_TIMING_AVAIL
/* Find a thread given the thread ID. */
-struct pthread *
attribute_hidden
+struct pthread *
__find_thread_by_id (pid_t tid)
{
struct pthread *result = NULL;
Jakub
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Misc fixes
2003-07-12 14:19 Jakub Jelinek
@ 2003-07-12 18:49 ` Ulrich Drepper
0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Drepper @ 2003-07-12 18:49 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Roland McGrath, Glibc hackers
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jakub Jelinek wrote:
> 2003-07-12 Jakub Jelinek <jakub@redhat.com>
>
> * sysdeps/unix/sysv/linux/futimes.c: Include kernel-features.h.
> * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_UTIMES): Fix
> a typo.
Applied.
- --
- --------------. ,-. 444 Castro Street
Ulrich Drepper \ ,-----------------' \ Mountain View, CA 94041 USA
Red Hat `--' drepper at redhat.com `---------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE/EFgi2ijCOnn/RHQRAtQdAKDODR1hMmdrhx8P9gBgS5fW8rIEgQCfYSEE
ZRI73xAhtcr/7EMSuxUE6zQ=
=CBiL
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] Misc fixes
@ 2003-07-12 14:19 Jakub Jelinek
2003-07-12 18:49 ` Ulrich Drepper
0 siblings, 1 reply; 8+ messages in thread
From: Jakub Jelinek @ 2003-07-12 14:19 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
Hi!
2003-07-12 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/futimes.c: Include kernel-features.h.
* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_UTIMES): Fix
a typo.
--- libc/sysdeps/unix/sysv/linux/futimes.c 12 Jul 2003 09:10:10 -0000 1.1.1.1
+++ libc/sysdeps/unix/sysv/linux/futimes.c 12 Jul 2003 09:48:04 -0000 1.2
@@ -23,6 +23,8 @@
#include <sys/time.h>
#include <stdio-common/_itoa.h>
+#include "kernel-features.h"
+
/* Change the access time of FILE to TVP[0] and
the modification time of FILE to TVP[1], but do not follow symlinks.
--- libc/sysdeps/unix/sysv/linux/kernel-features.h 12 Jul 2003 09:10:10 -0000 1.1.1.39
+++ libc/sysdeps/unix/sysv/linux/kernel-features.h 12 Jul 2003 09:48:04 -0000 1.24
@@ -347,7 +347,7 @@
#endif
/* The utimes syscall has been available for some architectures forever. */
-#if defined __alpha__ || defined __ia64__ || defined __hppa_ \
+#if defined __alpha__ || defined __ia64__ || defined __hppa__ \
|| defined __sparc__
# define __ASSUME_UTIMES 1
#endif
Jakub
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Misc fixes
1999-12-28 7:14 Jakub Jelinek
@ 1999-12-28 8:29 ` Ulrich Drepper
0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Drepper @ 1999-12-28 8:29 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: libc-hacker
You have introduced a larger number of new errors.
> --- libc/locale/programs/ld-time.c.jj Tue Dec 28 11:28:26 1999
> +++ libc/locale/programs/ld-time.c Tue Dec 28 14:37:33 1999
> @@ -219,7 +219,7 @@ time_finish (struct localedef_t *locale,
> if (*str != '+' && *str != '-')
> {
> if (!be_quiet)
> - error (0, 0, _("%s: direction flag in string %d in `era' field"
> + error (0, 0, _("%s: direction flag in string %z in `era' field"
> " is not '+' nor '-'"),
> "LC_TIME", idx + 1);
> /* Default arbitrarily to '+'. */
The z in %z is a modifier. As it is there would be no output
generated for the number. Could you fix all these cases in your
patch? (I konw gcc should warn about this and I have a patch, which I
sent yesterday, but it is not yet approved...)
--
---------------. drepper at gnu.org ,-. 1325 Chesapeake Terrace
Ulrich Drepper \ ,-------------------' \ Sunnyvale, CA 94089 USA
Cygnus Solutions `--' drepper at cygnus.com `------------------------
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] Misc fixes
@ 1999-12-28 7:14 Jakub Jelinek
1999-12-28 8:29 ` Ulrich Drepper
0 siblings, 1 reply; 8+ messages in thread
From: Jakub Jelinek @ 1999-12-28 7:14 UTC (permalink / raw)
To: drepper; +Cc: libc-hacker
Hi!
This patch kills a few warnings here and there, plus provides two different
__signbit{,l} inlines for 32bit/64bit SPARC, because what we use to have did
generate suboptimal code on 64bit (if it was accidentally correct).
1999-12-28 Jakub Jelinek <jakub@redhat.com>
* elf/sprof.c (load_shobj): Fix error message.
(generate_call_graph): Cast %*s length argument to int.
* locale/programs/localedef.c (construct_output_path): Likewise.
* locale/programs/ld-ctype.c (ctype_finish): Use proper format
specifier.
(ctype_class_new): Likewise.
* locale/programs/ld-time.c (time_finish): Likewise.
* sunrpc/svc_simple.c (register_rpc): Likewise.
* nscd/connections.c (nscd_run, start_threads): Use long instead of
int to avoid cast warnings.
* sysdeps/ieee754/ldbl-128/e_atan2l.c (__ieee754_atan2l): Kill
warning.
* sysdeps/ieee754/ldbl-128/s_roundl.c (__roundl): Remove unused
variable se.
* time/strftime.c (my_strftime): Provide wide era string when
requested.
* sysdeps/sparc/fpu/bits/mathinline.h (__signbit, __signbitl):
Separate into 32bit and 64bit versions.
--- libc/elf/sprof.c.jj Tue Feb 9 10:33:00 1999
+++ libc/elf/sprof.c Tue Dec 28 13:43:54 1999
@@ -530,7 +530,8 @@ load_shobj (const char *name)
fd = open (map->l_name, O_RDONLY);
if (fd == -1)
/* Dooh, this really shouldn't happen. We know the file is available. */
- error (EXIT_FAILURE, errno, _("Reopening shared object `%s' failed"));
+ error (EXIT_FAILURE, errno, _("Reopening shared object `%s' failed"),
+ map->l_name);
/* Now map the section header. */
ptr = mmap (NULL, (ehdr->e_shnum * sizeof (ElfW(Shdr))
@@ -1206,7 +1207,7 @@ generate_call_graph (struct profdata *pr
/* Info abount the function itself. */
n = printf ("[%Zu]", cnt);
printf ("%*s%5.1f%8.2f%8.2f%9" PRIdMAX " %s [%Zd]\n",
- 7 - n, " ",
+ (int) (7 - n), " ",
total_ticks ? (100.0 * sortsym[cnt]->ticks) / total_ticks : 0,
sortsym[cnt]->ticks * tick_unit,
0.0, /* FIXME: what's time for the children, recursive */
--- libc/locale/programs/ld-ctype.c.jj Tue Dec 28 11:28:26 1999
+++ libc/locale/programs/ld-ctype.c Tue Dec 28 14:36:07 1999
@@ -437,7 +437,7 @@ character L'\\u%0*x' in class `%s' must
{
char buf[17];
- sprintf (buf, "\\%o", cnt);
+ sprintf (buf, "\\%zo", cnt);
if (!be_quiet)
error (0, 0, _("\
@@ -452,7 +452,7 @@ character '%s' in class `%s' must be in
{
char buf[17];
- sprintf (buf, "\\%o", cnt);
+ sprintf (buf, "\\%zo", cnt);
if (!be_quiet)
error (0, 0, _("\
@@ -1021,7 +1021,7 @@ ctype_class_new (struct linereader *lr,
if (ctype->nr_charclass == MAX_NR_CHARCLASS)
/* Exit code 2 is prescribed in P1003.2b. */
error (2, 0, _("\
-implementation limit: no more than %d character classes allowed"),
+implementation limit: no more than %z character classes allowed"),
MAX_NR_CHARCLASS);
ctype->classnames[ctype->nr_charclass++] = name;
--- libc/locale/programs/ld-time.c.jj Tue Dec 28 11:28:26 1999
+++ libc/locale/programs/ld-time.c Tue Dec 28 14:37:33 1999
@@ -219,7 +219,7 @@ time_finish (struct localedef_t *locale,
if (*str != '+' && *str != '-')
{
if (!be_quiet)
- error (0, 0, _("%s: direction flag in string %d in `era' field"
+ error (0, 0, _("%s: direction flag in string %z in `era' field"
" is not '+' nor '-'"),
"LC_TIME", idx + 1);
/* Default arbitrarily to '+'. */
@@ -230,7 +230,7 @@ time_finish (struct localedef_t *locale,
if (*++str != ':')
{
if (!be_quiet)
- error (0, 0, _("%s: direction flag in string %d in `era' field"
+ error (0, 0, _("%s: direction flag in string %z in `era' field"
" is not a single character"),
"LC_TIME", idx + 1);
(void) strsep (&str, ":");
@@ -243,7 +243,7 @@ time_finish (struct localedef_t *locale,
if (endp == str)
{
if (!be_quiet)
- error (0, 0, _("%s: invalid number for offset in string %d in"
+ error (0, 0, _("%s: invalid number for offset in string %z in"
" `era' field"),
"LC_TIME", idx + 1);
(void) strsep (&str, ":");
@@ -252,7 +252,7 @@ time_finish (struct localedef_t *locale,
{
if (!be_quiet)
error (0, 0, _("%s: garbage at end of offset value in"
- " string %d in `era' field"),
+ " string %z in `era' field"),
"LC_TIME", idx + 1);
(void) strsep (&str, ":");
}
@@ -302,7 +302,7 @@ time_finish (struct localedef_t *locale,
{
invalid_start_date:
if (!be_quiet)
- error (0, 0, _("%s: invalid starting date in string %d in"
+ error (0, 0, _("%s: invalid starting date in string %z in"
" `era' field"),
"LC_TIME", idx + 1);
(void) strsep (&str, ":");
@@ -312,7 +312,7 @@ time_finish (struct localedef_t *locale,
garbage_start_date:
if (!be_quiet)
error (0, 0, _("%s: garbage at end of starting date "
- "in string %d in `era' field "),
+ "in string %z in `era' field "),
"LC_TIME", idx + 1);
(void) strsep (&str, ":");
}
@@ -331,7 +331,7 @@ time_finish (struct localedef_t *locale,
&& !__isleap (time->era_entries[idx].start_date[0])))
&& !be_quiet)
error (0, 0, _("%s: starting date is invalid in"
- " string %d in `era' field"),
+ " string %z in `era' field"),
"LC_TIME", idx + 1);
}
}
@@ -379,7 +379,7 @@ time_finish (struct localedef_t *locale,
{
invalid_stop_date:
if (!be_quiet)
- error (0, 0, _("%s: invalid stopping date in string %d in"
+ error (0, 0, _("%s: invalid stopping date in string %z in"
" `era' field"),
"LC_TIME", idx + 1);
(void) strsep (&str, ":");
@@ -389,7 +389,7 @@ time_finish (struct localedef_t *locale,
garbage_stop_date:
if (!be_quiet)
error (0, 0, _("%s: garbage at end of stopping date "
- "in string %d in `era' field"),
+ "in string %z in `era' field"),
"LC_TIME", idx + 1);
(void) strsep (&str, ":");
}
@@ -408,7 +408,7 @@ time_finish (struct localedef_t *locale,
&& !__isleap (time->era_entries[idx].stop_date[0])))
&& !be_quiet)
error (0, 0, _("%s: stopping date is invalid in"
- " string %d in `era' field"),
+ " string %z in `era' field"),
"LC_TIME", idx + 1);
}
}
@@ -416,7 +416,7 @@ time_finish (struct localedef_t *locale,
if (str == NULL || *str == '\0')
{
if (!be_quiet)
- error (0, 0, _("%s: missing era name in string %d in `era'"
+ error (0, 0, _("%s: missing era name in string %z in `era'"
" field"), "LC_TIME", idx + 1);
time->era_entries[idx].name =
time->era_entries[idx].format = "";
@@ -428,7 +428,7 @@ time_finish (struct localedef_t *locale,
if (str == NULL || *str == '\0')
{
if (!be_quiet)
- error (0, 0, _("%s: missing era format in string %d"
+ error (0, 0, _("%s: missing era format in string %z"
" in `era' field"),
"LC_TIME", idx + 1);
time->era_entries[idx].name =
--- libc/locale/programs/localedef.c.jj Tue Dec 28 11:28:26 1999
+++ libc/locale/programs/localedef.c Tue Dec 28 13:30:07 1999
@@ -356,8 +356,8 @@ construct_output_path (char *path)
if (normal == NULL)
n = asprintf (&result, "%s/%s%c", LOCALEDIR, path, '\0');
else
- n = asprintf (&result, "%s/%.*s%s%s%c", LOCALEDIR, startp - path, path,
- normal, endp, '\0');
+ n = asprintf (&result, "%s/%.*s%s%s%c", LOCALEDIR,
+ (int) (startp - path), path, normal, endp, '\0');
endp = result + n;
}
--- libc/nscd/connections.c.jj Mon Sep 27 05:50:58 1999
+++ libc/nscd/connections.c Tue Dec 28 13:41:53 1999
@@ -382,7 +382,7 @@ static void *
__attribute__ ((__noreturn__))
nscd_run (void *p)
{
- int my_number = (int) p;
+ long my_number = (long) p;
struct pollfd conn;
int run_prune = my_number < lastdb && dbs[my_number].enabled;
time_t now = time (NULL);
@@ -496,7 +496,7 @@ nscd_run (void *p)
void
start_threads (void)
{
- int i;
+ long i;
pthread_attr_t attr;
pthread_t th;
--- libc/sunrpc/svc_simple.c.jj Sat Jun 19 11:47:45 1999
+++ libc/sunrpc/svc_simple.c Tue Dec 28 13:14:56 1999
@@ -73,7 +73,7 @@ registerrpc (u_long prognum, u_long vers
if (procnum == NULLPROC)
{
(void) fprintf (stderr,
- _("can't reassign procedure number %d\n"), NULLPROC);
+ _("can't reassign procedure number %ld\n"), NULLPROC);
return -1;
}
if (transp == 0)
@@ -89,7 +89,7 @@ registerrpc (u_long prognum, u_long vers
if (!svc_register (transp, (u_long) prognum, (u_long) versnum,
universal, IPPROTO_UDP))
{
- (void) fprintf (stderr, _("couldn't register prog %d vers %d\n"),
+ (void) fprintf (stderr, _("couldn't register prog %ld vers %ld\n"),
prognum, versnum);
return -1;
}
--- libc/sysdeps/ieee754/ldbl-128/e_atan2l.c.jj Wed Jul 14 02:04:51 1999
+++ libc/sysdeps/ieee754/ldbl-128/e_atan2l.c Tue Dec 28 13:32:56 1999
@@ -73,7 +73,7 @@ pi_lo = 8.6718101301237810247970440260
if(((ix|((lx|-lx)>>63))>0x7fff000000000000LL)||
((iy|((ly|-ly)>>63))>0x7fff000000000000LL)) /* x or y is NaN */
return x+y;
- if((hx-0x3fff000000000000LL|lx)==0) return __atanl(y); /* x=1.0L */
+ if(((hx-0x3fff000000000000LL)|lx)==0) return __atanl(y); /* x=1.0L */
m = ((hy>>63)&1)|((hx>>62)&2); /* 2*sign(x)+sign(y) */
/* when y = 0 */
--- libc/sysdeps/ieee754/ldbl-128/s_roundl.c.jj Wed Jul 14 02:09:56 1999
+++ libc/sysdeps/ieee754/ldbl-128/s_roundl.c Tue Dec 28 13:33:42 1999
@@ -31,7 +31,7 @@ long double
__roundl (long double x)
{
int32_t j0;
- u_int64_t se, i1, i0;
+ u_int64_t i1, i0;
GET_LDOUBLE_WORDS64 (i0, i1, x);
j0 = ((i0 >> 48) & 0x7fff) - 0x3fff;
--- libc/sysdeps/sparc/fpu/bits/mathinline.h.jj Fri Nov 12 16:30:35 1999
+++ libc/sysdeps/sparc/fpu/bits/mathinline.h Tue Dec 28 11:51:06 1999
@@ -110,6 +110,8 @@ __signbitf (float __x)
return __u.__i < 0;
}
+#if __WORDSIZE == 32
+
__MATH_INLINE int
__signbit (double __x)
{
@@ -120,17 +122,26 @@ __signbit (double __x)
__MATH_INLINE int
__signbitl (long double __x)
{
- if (sizeof(long double) == 8)
- {
- __extension__ union { long double __l; int __i[2]; } __u = { __l: __x };
- return __u.__i[0] < 0;
- }
- else
- {
- __extension__ union { long double __l; int __i[4]; } __u = { __l: __x };
- return __u.__i[0] < 0;
- }
+ return __signbit ((double)__x);
+}
+
+#else /* sparc64 */
+
+__MATH_INLINE int
+__signbit (double __x)
+{
+ __extension__ union { double __d; long __i; } __u = { __d: __x };
+ return __u.__i < 0;
+}
+
+__MATH_INLINE int
+__signbitl (long double __x)
+{
+ __extension__ union { long double __l; long __i[2]; } __u = { __l: __x };
+ return __u.__i[0] < 0;
}
+
+#endif /* sparc64 */
__MATH_INLINE double
sqrt(double __x)
--- libc/time/strftime.c.jj Wed Dec 22 08:04:48 1999
+++ libc/time/strftime.c Tue Dec 28 13:49:20 1999
@@ -834,8 +834,8 @@ my_strftime (s, maxsize, format, tp ut_a
if (era)
{
# ifdef COMPILE_WIDE
- size_t len = strlen (era->era_name);
- cpy (len, era->era_name);
+ size_t len = wcslen (era->era_wname);
+ cpy (len, era->era_wname);
# else
size_t len = strlen (era->era_name);
cpy (len, era->era_name);
Cheers,
Jakub
___________________________________________________________________
Jakub Jelinek | jakub@redhat.com | http://sunsite.mff.cuni.cz/~jj
Linux version 2.3.34 on a sparc64 machine (1343.49 BogoMips)
___________________________________________________________________
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2009-03-10 13:42 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-12-16 10:56 [PATCH] Misc fixes Jakub Jelinek
2002-12-16 11:33 ` Ulrich Drepper
-- strict thread matches above, loose matches on Subject: below --
2009-03-10 13:42 Jakub Jelinek
2004-10-06 11:41 Jakub Jelinek
2003-07-12 14:19 Jakub Jelinek
2003-07-12 18:49 ` Ulrich Drepper
1999-12-28 7:14 Jakub Jelinek
1999-12-28 8:29 ` Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).