diff options
author | Andreas Jaeger <aj@suse.de> | 2000-12-28 10:35:17 +0000 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2000-12-28 10:35:17 +0000 |
commit | 8da8e2dbd2299e1a3ebc266a023ba6b37833bdc8 (patch) | |
tree | c8124bfd9a0c1232f47666b629ec013780adc192 | |
parent | 11e0f1cf9e7b2c38d5cdc0f1c682461b2ffdac0d (diff) | |
download | glibc-8da8e2dbd2299e1a3ebc266a023ba6b37833bdc8.tar.gz glibc-8da8e2dbd2299e1a3ebc266a023ba6b37833bdc8.tar.xz glibc-8da8e2dbd2299e1a3ebc266a023ba6b37833bdc8.zip |
Update.
* sysdeps/generic/ldsodefs.h: Add noreturn attribute to _dl_reloc_bad_type.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | gmon/bb_exit_func.c | 18 | ||||
-rw-r--r-- | sunrpc/rpc_cout.c | 1 | ||||
-rw-r--r-- | sunrpc/rpc_hout.c | 1 | ||||
-rw-r--r-- | sysdeps/generic/ldsodefs.h | 3 |
5 files changed, 10 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 96d2a13473..79dd0e470f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-12-28 Andreas Jaeger <aj@suse.de> + * sysdeps/generic/ldsodefs.h: Add noreturn attribute to + _dl_reloc_bad_type. + * sunrpc/rpc_hout.c (print_funcdef): Add break statement to shut up GCC's warning about "deprecated use of label at end of compound statement." diff --git a/gmon/bb_exit_func.c b/gmon/bb_exit_func.c index 4ba79885c1..f0be62d106 100644 --- a/gmon/bb_exit_func.c +++ b/gmon/bb_exit_func.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@cs.arizona.edu). @@ -20,25 +20,13 @@ /* __bb_exit_func() dumps all the basic-block statistics linked into the __bb_head chain to .d files. */ +#include <sys/gmon.h> #include <sys/gmon_out.h> #include <sys/types.h> #include <stdio.h> #include <string.h> -/* structure emitted by -a */ -struct bb - { - long int zero_word; - const char *filename; - long int *counts; - long int ncounts; - struct bb *next; - const unsigned long int *addresses; - }; - -extern struct bb *__bb_head; /* from gmon.c */ - #define OUT_NAME "gmon.out" @@ -47,7 +35,7 @@ __bb_exit_func (void) { const int version = GMON_VERSION; struct gmon_hdr ghdr; - struct bb *ptr; + struct __bb *ptr; FILE *fp; fp = fopen (OUT_NAME, "wb"); if (!fp) diff --git a/sunrpc/rpc_cout.c b/sunrpc/rpc_cout.c index 808a5053cd..44027ea39e 100644 --- a/sunrpc/rpc_cout.c +++ b/sunrpc/rpc_cout.c @@ -739,6 +739,7 @@ emit_inline (int indent, declaration * decl, int flag) f_print (fout, "}\n"); break; default: + break; /* ?... do nothing I guess */ } } diff --git a/sunrpc/rpc_hout.c b/sunrpc/rpc_hout.c index a41a7e7c91..39bfae8324 100644 --- a/sunrpc/rpc_hout.c +++ b/sunrpc/rpc_hout.c @@ -136,6 +136,7 @@ print_funcdef (definition *def) pprogramdef (def); break; default: + break; /* ?... shouldn't happen I guess */ } } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 032e26e179..d7ce4d0e64 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -391,7 +391,8 @@ extern void _dl_relocate_object (struct link_map *map, PLT is nonzero if this was a PLT reloc; it just affects the message. */ extern void _dl_reloc_bad_type (struct link_map *map, uint_fast8_t type, int plt) - internal_function; + internal_function + __attribute__ ((__noreturn__)); /* Check the version dependencies of all objects available through MAP. If VERBOSE print some more diagnostics. */ |