mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 23:40:10 +00:00
de1c3ebb59
* misc/bits/syslog.h (syslog): When __va_arg_pack is defined,
implement as __extern_always_inline function.
(vsyslog): Define as __extern_always_inline function unconditionally.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf):
When __va_arg_pack is defined, implement as __extern_always_inline
functions.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions unconditionally.
* libio/bits/stdio.h (vprintf): Ifdef out the inline when
bits/stdio2.h will be included.
* wcsmbs/bits/wchar2.h (__swprintf_alias): New redirect.
(swprintf, wprintf, fwprintf): When __va_arg_pack is defined,
implement as __extern_always_inline functions.
(vswprintf, vwprintf, vfwprintf): Define as
__extern_always_inline functions unconditionally.
* debug/tst-chk1.c (do_test): Enable remaining tests for C++.
2007-09-03 Jakub Jelinek <jakub@redhat.com>
* misc/sys/cdefs.h (__extern_inline, __extern_always_inline): Only
define in C++ for GCC 4.3+, in C++ always use __gnu_inline__
attribute.
* include/features.h (__USE_EXTERN_INLINES): Define only when
__extern_inline is defined.
* stdlib/stdlib.h: Include bits/stdlib.h when __extern_always_inline
is defined instead of when not __cplusplus.
* misc/sys/syslog.h: Include bits/syslog.h when __extern_always_inline
is defined instead of when not __cplusplus.
* socket/sys/socket.h: Include bits/socket2.h when
__extern_always_inline is defined instead of when not __cplusplus.
* libio/stdio.h: Include bits/stdio2.h when __extern_always_inline
is defined instead of when not __cplusplus.
* posix/unistd.h: Include bits/unistd.h when __extern_always_inline
is defined instead of when not __cplusplus.
* string/string.h: Include bits/string3.h when __extern_always_inline
is defined instead of when not __cplusplus.
* wcsmbs/wchar.h: Include bits/wchar2.h when __extern_always_inline
is defined instead of when not __cplusplus.
(btowc, wctob): Don't guard the inlines with ifndef __cplusplus.
* io/fcntl.h: Don't include bits/fcntl2.h if __extern_always_inline
is not defined.
* misc/bits/syslog-ldbl.h: Guard *_chk stuff with
defined __extern_always_inline instead of !defined __cplusplus.
* libio/bits/stdio-ldbl.h: Likewise.
* wcsmbs/bits/wchar-ldbl.h: Likewise.
* misc/bits/syslog.h (syslog): Don't define for C++.
(vsyslog): Use __extern_always_inline function for C++ instead of
a macro.
* libio/bits/stdio.h (__STDIO_INLINE): Define to __extern_inline
whenever that macro is defined.
(vprintf): Don't provide the inline for C++.
(fread_unlocked, fwrite_unlocked): Don't define the macros for C++.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf): Don't
define the macros for C++.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions for C++.
* io/sys/stat.h (stat, lstat, fstat, fstatat, mknod, mknodat,
stat64, lstat64, fstat64, fstatat64): Don't define if not
__USE_EXTERN_INLINES.
* wcsmbs/bits/wchar2.h: Fix #error message.
(swprintf, wprintf, fwprintf): Don't define the macros for C++.
(vswprintf, vwprintf, vfwprintf): Define using
__extern_always_inline functions for C++.
* string/bits/string3.h: Don't #undef macros if __cplusplus.
(memcpy, memmove, mempcpy, memset, bcopy, bzero, strcpy, stpcpy,
strncpy, strcat, strncat): Define as __extern_always_inline
functions instead of macros for C++.
* math/bits/cmathcalls.h: Guard __extern_inline routines with
defined __extern_inline.
* sysdeps/alpha/fpu/bits/mathinline.h (__MATH_INLINE): Define
to __extern_inline whenever that macro is defined.
* sysdeps/ia64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/i486/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/powerpc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/x86_64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/sparc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/unix/sysv/linux/sys/sysmacros.h (gnu_dev_major,
gnu_dev_minor, gnu_dev_makedev): Remove __extern_inline from
prototypes. Only provide __extern_inline routines if
__USE_EXTERN_INLINES.
* debug/Makefile: Add rules to build and run tst-{,lfs}chk{4,5,6}
tests.
* debug/tst-chk1.c (do_prepare, do_test): Allow compilation as C++.
For now avoid some *printf tests in C++. Skip all testing
if __USE_FORTIFY_LEVEL is defined, but __extern_always_inline macro
is not.
* debug/tst-chk4.cc: New file.
* debug/tst-chk5.cc: New file.
* debug/tst-chk6.cc: New file.
* debug/tst-lfschk4.cc: New file.
* debug/tst-lfschk5.cc: New file.
* debug/tst-lfschk6.cc: New file.
* include/wchar.h (__vfwprintf_chk, __vswprintf_chk): Avoid
prototypes in C++.
* include/stdio.h (__sprintf_chk, __snprintf_chk, __vsprintf_chk,
__vsnprintf_chk, __printf_chk, __fprintf_chk, __vprintf_chk,
__vfprintf_chk, __fgets_unlocked_chk, __fgets_chk): Likewise.
165 lines
6.5 KiB
Makefile
165 lines
6.5 KiB
Makefile
# Copyright (C) 1998-2001,2004,2005,2006,2007 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, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
# 02111-1307 USA.
|
|
|
|
#
|
|
# Sub-makefile for debug portion of the library.
|
|
#
|
|
subdir := debug
|
|
|
|
headers := execinfo.h
|
|
distribute = sigcontextinfo.h register-dump.h frame.h
|
|
|
|
routines = backtrace backtracesyms backtracesymsfd noophooks \
|
|
memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \
|
|
strcat_chk strcpy_chk strncat_chk strncpy_chk stpncpy_chk \
|
|
sprintf_chk vsprintf_chk snprintf_chk vsnprintf_chk \
|
|
printf_chk fprintf_chk vprintf_chk vfprintf_chk \
|
|
gets_chk chk_fail readonly-area fgets_chk fgets_u_chk \
|
|
read_chk pread_chk pread64_chk recv_chk recvfrom_chk \
|
|
readlink_chk readlinkat_chk getwd_chk getcwd_chk \
|
|
realpath_chk ptsname_r_chk fread_chk fread_u_chk \
|
|
wctomb_chk wcscpy_chk wmemcpy_chk wmemmove_chk wmempcpy_chk \
|
|
wcpcpy_chk wcsncpy_chk wcscat_chk wcsncat_chk wmemset_chk \
|
|
wcpncpy_chk \
|
|
swprintf_chk vswprintf_chk wprintf_chk fwprintf_chk \
|
|
vwprintf_chk vfwprintf_chk fgetws_chk fgetws_u_chk \
|
|
confstr_chk getgroups_chk ttyname_r_chk getlogin_r_chk \
|
|
gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \
|
|
wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \
|
|
wcstombs_chk \
|
|
stack_chk_fail fortify_fail \
|
|
$(static-only-routines)
|
|
static-only-routines := warning-nop stack_chk_fail_local
|
|
|
|
CFLAGS-backtrace.c = -fno-omit-frame-pointer
|
|
CFLAGS-sprintf_chk.c = -D_IO_MTSAFE_IO
|
|
CFLAGS-snprintf_chk.c = -D_IO_MTSAFE_IO
|
|
CFLAGS-vsprintf_chk.c = -D_IO_MTSAFE_IO
|
|
CFLAGS-vsnprintf_chk.c = -D_IO_MTSAFE_IO
|
|
CFLAGS-printf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-fprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-vprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-vfprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-gets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-fgets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-fgets_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-fread_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-fread_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-swprintf_chk.c = -D_IO_MTSAFE_IO
|
|
CFLAGS-vswprintf_chk.c = -D_IO_MTSAFE_IO
|
|
CFLAGS-wprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-fwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-vwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-vfwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-fgetws_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-fgetws_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
|
|
CFLAGS-read_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pread_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pread64_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-recv_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-recvfrom_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
|
|
# We know these tests have problems with format strings, this is what
|
|
# we are testing. Disable that warning.
|
|
CFLAGS-tst-chk1.c = -Wno-format
|
|
CFLAGS-tst-chk2.c = -Wno-format
|
|
CFLAGS-tst-chk3.c = -Wno-format
|
|
CFLAGS-tst-chk4.cc = -Wno-format
|
|
CFLAGS-tst-chk5.cc = -Wno-format
|
|
CFLAGS-tst-chk6.cc = -Wno-format
|
|
CFLAGS-tst-lfschk1.c = -Wno-format
|
|
CFLAGS-tst-lfschk2.c = -Wno-format
|
|
CFLAGS-tst-lfschk3.c = -Wno-format
|
|
CFLAGS-tst-lfschk4.cc = -Wno-format
|
|
CFLAGS-tst-lfschk5.cc = -Wno-format
|
|
CFLAGS-tst-lfschk6.cc = -Wno-format
|
|
tst-chk1-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-chk2-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-chk3-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-chk4-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-chk5-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-chk6-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-lfschk1-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-lfschk2-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-lfschk3-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-lfschk4-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-lfschk5-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-lfschk6-ENV = LOCPATH=$(common-objpfx)localedata
|
|
LDFLAGS-tst-chk4 = -lstdc++
|
|
LDFLAGS-tst-chk5 = -lstdc++
|
|
LDFLAGS-tst-chk6 = -lstdc++
|
|
LDFLAGS-tst-lfschk4 = -lstdc++
|
|
LDFLAGS-tst-lfschk5 = -lstdc++
|
|
LDFLAGS-tst-lfschk6 = -lstdc++
|
|
|
|
tests = backtrace-tst tst-chk1 tst-chk2 tst-chk3 \
|
|
tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk \
|
|
tst-chk4 tst-chk5 tst-chk6 tst-lfschk4 tst-lfschk5 tst-lfschk6
|
|
|
|
extra-libs = libSegFault libpcprofile
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libSegFault-routines = segfault
|
|
libSegFault-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
libpcprofile-routines = pcprofile
|
|
libpcprofile-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
others = pcprofiledump
|
|
install-bin = pcprofiledump
|
|
install-bin-script = xtrace
|
|
|
|
include ../Makeconfig
|
|
|
|
distribute += catchsegv.sh xtrace.sh
|
|
ifeq ($(elf),yes)
|
|
ifeq ($(build-shared),yes)
|
|
install-bin-script += catchsegv
|
|
endif
|
|
endif
|
|
generated = catchsegv xtrace
|
|
|
|
include ../Rules
|
|
|
|
sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,')
|
|
|
|
$(objpfx)catchsegv: catchsegv.sh $(common-objpfx)soversions.mk \
|
|
$(common-objpfx)config.make
|
|
slibpfx=`echo $(slibdir)|sed 's/lib\(64\|\)$$/\\\\\\\\$$LIB/'`; \
|
|
sed -e 's|@VERSION@|$(version)|' -e "s|@SLIB@|$$slibpfx|" $< > $@.new
|
|
chmod 555 $@.new
|
|
mv -f $@.new $@
|
|
|
|
$(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
|
|
|
|
$(objpfx)xtrace: xtrace.sh
|
|
rm -f $@.new
|
|
sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
|
|
-e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \
|
|
&& rm -f $@ && mv $@.new $@ && chmod +x $@
|
|
|
|
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
|
|
# This ensures they will load libc.so for needed symbols if loaded by
|
|
# a statically-linked program that hasn't already loaded it.
|
|
$(objpfx)libSegFault.so: $(common-objpfx)libc.so \
|
|
$(common-objpfx)libc_nonshared.a \
|
|
$(elf-objpfx)$(rtld-installed-name)
|
|
$(objpfx)libpcprofile.so: $(common-objpfx)libc.so \
|
|
$(common-objpfx)libc_nonshared.a \
|
|
$(elf-objpfx)$(rtld-installed-name)
|