1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

* stdio/vfscanf.c (conv_error): Simplify expression to avoid

"value computed is not used" warning.

	* Makeconfig (+gccwarn): Removed -Wconversion.

	* csu/initfini.c (GLOBAL): Macro removed.
	(_init, _fini): Always define globally.
	* csu/Makefile (crtstuff, initfini): Don't make crt[in]_s.o.
This commit is contained in:
Roland McGrath
1995-07-26 14:04:19 +00:00
parent 3d61b63cc7
commit 4e1bac76a8
5 changed files with 18 additions and 22 deletions

View File

@ -1,5 +1,14 @@
Wed Jul 26 02:00:29 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> Wed Jul 26 02:00:29 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio/vfscanf.c (conv_error): Simplify expression to avoid
"value computed is not used" warning.
* Makeconfig (+gccwarn): Removed -Wconversion.
* csu/initfini.c (GLOBAL): Macro removed.
(_init, _fini): Always define globally.
* csu/Makefile (crtstuff, initfini): Don't make crt[in]_s.o.
* asia, backward, europe, leapseconds, southamerica: New data from * asia, backward, europe, leapseconds, southamerica: New data from
ADO's 95e. ADO's 95e.

View File

@ -294,8 +294,7 @@ RANLIB = ranlib
endif endif
# Extra flags to pass to GCC. # Extra flags to pass to GCC.
+gccwarn := -Wall -Wwrite-strings -Wno-parentheses -Winline \ +gccwarn := -Wall -Wwrite-strings -Wno-parentheses -Winline -Wbad-function-cast
-Wbad-function-cast -Wconversion
# This is the program that generates makefile # This is the program that generates makefile
# dependencies from C source files. # dependencies from C source files.

View File

@ -50,12 +50,9 @@ else
start-installed-name = crt1.o start-installed-name = crt1.o
# These are the special initializer/finalizer files. They are always the # These are the special initializer/finalizer files. They are always the
# first and last file in the link. crti.o ... crtn.o are used for normal # first and last file in the link. crti.o ... crtn.o define the global
# linking; they define the global "functions" _init and _fini to run the # "functions" _init and _fini to run the .init and .fini sections.
# .init and .fini sections. crti_s.o ... crtn_s.o are for making shared crtstuff = crti crtn
# library objects; they put the prologue/epilogue code into the .init and
# .fini sections, but define no global symbols.
crtstuff = crti crtn crti_s crtn_s
install-lib += $(crtstuff:=.o) install-lib += $(crtstuff:=.o)
extra-objs += $(crtstuff:=.o) extra-objs += $(crtstuff:=.o)
@ -67,13 +64,11 @@ omit-deps += $(crtstuff)
# disable emission of .size directives and debugging information, since # disable emission of .size directives and debugging information, since
# they will get confused by the splitting of the output we do. # they will get confused by the splitting of the output we do.
$(objpfx)cr%i.s $(objpfx)cr%n.s: initfini.c; $(initfini) $(objpfx)cr%i.s $(objpfx)cr%n.s: initfini.c; $(initfini)
$(objpfx)cr%i_s.s $(objpfx)cr%n_s.s: initfini.c; $(initfini)
define initfini define initfini
-rm -f $(objpfx)crtcommon.tmp -rm -f $(objpfx)crtcommon.tmp
(echo 'cat > crtcommon.tmp <<\EOF_common'; \ (echo 'cat > crtcommon.tmp <<\EOF_common'; \
$(CC) $< $(CPPFLAGS) $(CFLAGS) \ $(CC) $< $(CPPFLAGS) $(CFLAGS) \
$(patsubst %,-DGLOBAL=static,$(filter %_s.s,$@)) \
-finhibit-size-directive -g0 -S -o -; \ -finhibit-size-directive -g0 -S -o -; \
echo 'EOF_common') | (cd $(@D); $(SHELL)) echo 'EOF_common') | (cd $(@D); $(SHELL))
cat $(objpfx)crtcommon.tmp >> $(objpfx)crti.s-new cat $(objpfx)crtcommon.tmp >> $(objpfx)crti.s-new

View File

@ -34,18 +34,11 @@ Cambridge, MA 02139, USA. */
#include <stdlib.h> #include <stdlib.h>
/* We are compiled with -DGLOBAL=static to generate the versions used for
shared libraries' .init and .fini sections, which do not have entry
point symbols. */
#ifndef GLOBAL
#define GLOBAL
#endif
/* These declarations make the functions go in the right sections when /* These declarations make the functions go in the right sections when
we define them below. GCC syntax does not allow the attribute we define them below. GCC syntax does not allow the attribute
specifications to be in the function definitions themselves. */ specifications to be in the function definitions themselves. */
GLOBAL void _init (void) __attribute__ ((section (".init"))); void _init (void) __attribute__ ((section (".init")));
GLOBAL void _fini (void) __attribute__ ((section (".fini"))); void _fini (void) __attribute__ ((section (".fini")));
/* End the here document containing the initial common code. /* End the here document containing the initial common code.
Then move the output file crtcommon.tmp to crti.s-new and crtn.s-new. */ Then move the output file crtcommon.tmp to crti.s-new and crtn.s-new. */
@ -55,7 +48,7 @@ cp -f crti.s-new crtn.s-new");
/* Append the .init prologue to crti.s-new. */ /* Append the .init prologue to crti.s-new. */
asm ("cat >> crti.s-new <<\\EOF.crti.init"); asm ("cat >> crti.s-new <<\\EOF.crti.init");
GLOBAL void void
_init (void) _init (void)
{ {
(void) &_init; /* Don't optimize out the function! */ (void) &_init; /* Don't optimize out the function! */
@ -74,7 +67,7 @@ asm ("\nEOF.crtn.init\
\n\ \n\
cat >> crti.s-new <<\\EOF.crti.fini"); cat >> crti.s-new <<\\EOF.crti.fini");
GLOBAL void void
_fini (void) _fini (void)
{ {
(void) &_fini; /* Don't optimize out the function! */ (void) &_fini; /* Don't optimize out the function! */

View File

@ -36,7 +36,7 @@ Cambridge, MA 02139, USA. */
#define inchar() ((c = getc(s)) == EOF ? EOF : (++read_in, c)) #define inchar() ((c = getc(s)) == EOF ? EOF : (++read_in, c))
#define conv_error() return ((c == EOF || ungetc(c, s)), done) #define conv_error() return (ungetc(c, s), done)
#define input_error() return (done == 0 ? EOF : done) #define input_error() return (done == 0 ? EOF : done)
#define memory_error() return ((errno = ENOMEM), EOF) #define memory_error() return ((errno = ENOMEM), EOF)