mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-15 01:21:06 +00:00
7caa5054af
gets has the dubious honor of being the only C89 library feature that
has been completely removed from the current C and C++ standards.
glibc follows suit by not declaring it in _GNU_SOURCE mode either,
but it remains present in older compatibility modes. Internally,
two test cases need to see stdio.h make the declaration, but all our
internal code is of course compiled under _GNU_SOURCE. This is currently
kludged by duplicating the gets declaration, fortify wrapper and all,
in include/stdio.h. Also, the conditional in the public headers for
deciding when to declare gets is complicated and repeated in two places.
This patch adds a new macro to features.h that encapsulates the
complicated rule for when to declare gets. stdio.h and bits/stdio2.h
then simply test __GLIBC_USE (DEPRECATED_GETS), and instead of having
a duplicate gets declaration in include/stdio.h, debug/tst-chk1.c and
stdio-common/tst-gets.c can force gets to be declared.
* include/features.h (__GLIBC_USE_DEPRECATED_GETS): New macro.
* libio/stdio.h, libio/bits/stdio2.h: Condition gets on
__GLIBC_USE (DEPRECATED_GETS). Update comments to indicate
gets was removed from C++ in C++14.
* include/stdio.h: Remove redundant declaration of gets.
* debug/tst-chk1.c, stdio-common/tst-gets.c: Force gets to
be declared, since we are testing it.
* stdio-common/Makefile (tst-gets.c): Compile with
-Wno-deprecated-declarations.
* debug/Makefile (tst-chk1.c, tst-chk2.c, tst-chk3.c, tst-chk4.cc)
(tst-chk5.cc, tst-chk6.cc, tst-lfschk1.c, tst-lfschk2.c)
(tst-lfschk3.c, tst-lfschk4.cc, tst-lfschk5.cc, tst-lfschk6.cc):
Compile with -Wno-deprecated-declarations.
158 lines
5.7 KiB
Makefile
158 lines
5.7 KiB
Makefile
# Copyright (C) 1991-2017 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 Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 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
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Specific makefile for stdio-common.
|
|
#
|
|
subdir := stdio-common
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h
|
|
|
|
routines := \
|
|
ctermid cuserid \
|
|
_itoa _itowa itoa-digits itoa-udigits itowa-digits \
|
|
vfprintf vprintf printf_fp reg-printf printf-prs printf_fphex \
|
|
reg-modifier reg-type \
|
|
printf_size fprintf printf snprintf sprintf asprintf dprintf \
|
|
vfwprintf vfscanf vfwscanf \
|
|
fscanf scanf sscanf \
|
|
perror psignal \
|
|
tmpfile tmpfile64 tmpnam tmpnam_r tempnam tempname \
|
|
getline getw putw \
|
|
remove rename renameat \
|
|
flockfile ftrylockfile funlockfile \
|
|
isoc99_scanf isoc99_vscanf isoc99_fscanf isoc99_vfscanf isoc99_sscanf \
|
|
isoc99_vsscanf \
|
|
psiginfo
|
|
|
|
aux := errlist siglist printf-parsemb printf-parsewc fxprintf
|
|
|
|
tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
|
|
temptest tst-fileno test-fwrite tst-ungetc tst-ferror \
|
|
xbug errnobug \
|
|
bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 bug11 bug12 bug13 \
|
|
tfformat tiformat tllformat tstdiomisc tst-printfsz tst-wc-printf \
|
|
scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \
|
|
scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf tst-sscanf \
|
|
tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
|
|
tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 \
|
|
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
|
|
tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
|
|
bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
|
|
scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
|
|
bug-vfprintf-nargs tst-long-dbl-fphex tst-fphex-wide tst-sprintf3 \
|
|
bug25 tst-printf-round bug23-2 bug23-3 bug23-4 bug26 tst-fmemopen3 \
|
|
tst-printf-bz18872 tst-vfprintf-width-prec tst-fmemopen4
|
|
|
|
test-srcs = tst-unbputc tst-printf
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
tests-special += $(objpfx)tst-unbputc.out $(objpfx)tst-printf.out \
|
|
$(objpfx)tst-printf-bz18872-mem.out \
|
|
$(objpfx)tst-setvbuf1-cmp.out \
|
|
$(objpfx)tst-vfprintf-width-prec-mem.out
|
|
generated += tst-printf-bz18872.c tst-printf-bz18872.mtrace \
|
|
tst-printf-bz18872-mem.out \
|
|
tst-vfprintf-width-prec.mtrace tst-vfprintf-width-prec-mem.out
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ISO-8859-1 ja_JP.EUC-JP
|
|
include ../gen-locales.mk
|
|
|
|
$(objpfx)bug14.out: $(gen-locales)
|
|
$(objpfx)scanf13.out: $(gen-locales)
|
|
$(objpfx)test-vfprintf.out: $(gen-locales)
|
|
$(objpfx)tst-grouping.out: $(gen-locales)
|
|
$(objpfx)tst-sprintf.out: $(gen-locales)
|
|
$(objpfx)tst-sscanf.out: $(gen-locales)
|
|
$(objpfx)tst-swprintf.out: $(gen-locales)
|
|
endif
|
|
|
|
tst-printf-bz18872-ENV = MALLOC_TRACE=$(objpfx)tst-printf-bz18872.mtrace
|
|
tst-vfprintf-width-prec-ENV = \
|
|
MALLOC_TRACE=$(objpfx)tst-vfprintf-width-prec.mtrace
|
|
|
|
$(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
|
|
$(evaluate-test)
|
|
|
|
$(objpfx)tst-printf.out: tst-printf.sh $(objpfx)tst-printf
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
|
|
$(evaluate-test)
|
|
|
|
# We generate this source because it requires a printf invocation with
|
|
# 10K arguments.
|
|
$(objpfx)tst-printf-bz18872.c: tst-printf-bz18872.sh
|
|
rm -f $@ && $(BASH) $^ > $@.new && mv $@.new $@
|
|
|
|
$(objpfx)tst-%-mem.out: $(objpfx)tst-%.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-$*.mtrace > $@; \
|
|
$(evaluate-test)
|
|
|
|
CFLAGS-vfprintf.c = -Wno-uninitialized
|
|
CFLAGS-vfwprintf.c = -Wno-uninitialized
|
|
|
|
CFLAGS-tmpfile.c = -fexceptions
|
|
CFLAGS-tmpfile64.c = -fexceptions
|
|
CFLAGS-tempname.c = -fexceptions
|
|
CFLAGS-psignal.c = -fexceptions
|
|
CFLAGS-vprintf.c = -fexceptions
|
|
CFLAGS-cuserid.c = -fexceptions
|
|
|
|
CFLAGS-vfprintf.c += -fexceptions
|
|
CFLAGS-fprintf.c += -fexceptions
|
|
CFLAGS-printf.c += -fexceptions
|
|
CFLAGS-vfwprintf.c += -fexceptions
|
|
CFLAGS-vfscanf.c += -fexceptions
|
|
CFLAGS-vfwscanf.c += -fexceptions
|
|
CFLAGS-fscanf.c += -fexceptions
|
|
CFLAGS-scanf.c += -fexceptions
|
|
CFLAGS-isoc99_vfscanf.c += -fexceptions
|
|
CFLAGS-isoc99_vscanf.c += -fexceptions
|
|
CFLAGS-isoc99_fscanf.c += -fexceptions
|
|
CFLAGS-isoc99_scanf.c += -fexceptions
|
|
CFLAGS-errlist.c = $(fno-unit-at-a-time)
|
|
CFLAGS-siglist.c = $(fno-unit-at-a-time)
|
|
|
|
# The following is a hack since we must compile scanf1{5,7}.c without any
|
|
# GNU extension. The latter are needed, though, when internal headers
|
|
# are used. So made sure we see the installed headers first.
|
|
CFLAGS-scanf15.c = -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
|
|
-I../wctype
|
|
CFLAGS-scanf17.c = -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
|
|
-I../wctype
|
|
|
|
# tst-gets.c tests a deprecated function.
|
|
CFLAGS-tst-gets.c += -Wno-deprecated-declarations
|
|
|
|
CPPFLAGS += $(libio-mtsafe)
|
|
|
|
$(objpfx)tst-setvbuf1.out: /dev/null $(objpfx)tst-setvbuf1
|
|
$(test-program-cmd) > $@ 2>&1; \
|
|
$(evaluate-test)
|
|
|
|
$(objpfx)tst-setvbuf1-cmp.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1.out
|
|
cmp $^ > $@; \
|
|
$(evaluate-test)
|
|
|
|
$(objpfx)tst-printf-round: $(libm)
|