From 56ab386964d99ab9b28957330af09e5ca33482f6 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 15 Oct 2015 22:35:13 +0000 Subject: Remove -fexceptions configure test. There is a configure test for -fexceptions. This option was added in GCC 2.8, so the test is obsolete - and indeed plenty of code is using -fexceptions directly. This patch removes the configure test and makes all uses of $(exceptions) use -fexceptions directly. Tested for x86_64 and x86 (testsuite, and that installed shared libraries are unchanged by the patch). * configure.ac (libc_cv_gcc_exceptions): Remove configure test. * configure: Regenerated. * sysdeps/arm/configure.ac (libc_cv_gcc_exceptions): Do not set variable. (exceptions): Likewise. * sysdeps/arm/configure: Regenerated. * config.make.in (exceptions): Remove variable. * Makeconfig (uses-callbacks): Use -fexceptions instead of $(exceptions). * debug/Makefile (CFLAGS-dprintf_chk.c): Likewise. (CFLAGS-vdprintf_chk.c): Likewise. (CFLAGS-printf_chk.c): Likewise. (CFLAGS-fprintf_chk.c): Likewise. (CFLAGS-vprintf_chk.c): Likewise. (CFLAGS-vfprintf_chk.c): Likewise. (CFLAGS-gets_chk.c): Likewise. (CFLAGS-fgets_chk.c): Likewise. (CFLAGS-fgets_u_chk.c): Likewise. (CFLAGS-fread_chk.c): Likewise. (CFLAGS-fread_u_chk.c): Likewise. (CFLAGS-wprintf_chk.c): Likewise. (CFLAGS-fwprintf_chk.c): Likewise. (CFLAGS-vwprintf_chk.c): Likewise. (CFLAGS-vfwprintf_chk.c): Likewise. (CFLAGS-fgetws_chk.c): Likewise. (CFLAGS-fgetws_u_chk.c): Likewise. * libio/Makefile (CFLAGS-fileops.c): Likewise. (CFLAGS-fputc.c): Likewise. (CFLAGS-fputwc.c): Likewise. (CFLAGS-freopen64.c): Likewise. (CFLAGS-freopen.c): Likewise. (CFLAGS-fseek.c): Likewise. (CFLAGS-fseeko64.c): Likewise. (CFLAGS-fseeko.c): Likewise. (CFLAGS-ftello64.c): Likewise. (CFLAGS-ftello.c): Likewise. (CFLAGS-fwide.c): Likewise. (CFLAGS-genops.c): Likewise. (CFLAGS-getc.c): Likewise. (CFLAGS-getchar.c): Likewise. (CFLAGS-getwc.c): Likewise. (CFLAGS-getwchar.c): Likewise. (CFLAGS-iofclose.c): Likewise. (CFLAGS-iofflush.c): Likewise. (CFLAGS-iofgetpos64.c): Likewise. (CFLAGS-iofgetpos.c): Likewise. (CFLAGS-iofgets.c): Likewise. (CFLAGS-iofgetws.c): Likewise. (CFLAGS-iofputs.c): Likewise. (CFLAGS-iofputws.c): Likewise. (CFLAGS-iofread.c): Likewise. (CFLAGS-iofsetpos64.c): Likewise. (CFLAGS-iofsetpos.c): Likewise. (CFLAGS-ioftell.c): Likewise. (CFLAGS-iofwrite.c): Likewise. (CFLAGS-iogetdelim.c): Likewise. (CFLAGS-iogetline.c): Likewise. (CFLAGS-iogets.c): Likewise. (CFLAGS-iogetwline.c): Likewise. (CFLAGS-ioputs.c): Likewise. (CFLAGS-ioseekoff.c): Likewise. (CFLAGS-ioseekpos.c): Likewise. (CFLAGS-iosetbuffer.c): Likewise. (CFLAGS-iosetvbuf.c): Likewise. (CFLAGS-ioungetc.c): Likewise. (CFLAGS-ioungetwc.c): Likewise. (CFLAGS-oldfileops.c): Likewise. (CFLAGS-oldiofclose.c): Likewise. (CFLAGS-oldiofgetpos64.c): Likewise. (CFLAGS-oldiofgetpos.c): Likewise. (CFLAGS-oldiofsetpos64.c): Likewise. (CFLAGS-oldiofsetpos.c): Likewise. (CFLAGS-peekc.c): Likewise. (CFLAGS-putc.c): Likewise. (CFLAGS-putchar.c): Likewise. (CFLAGS-putwc.c): Likewise. (CFLAGS-putwchar.c): Likewise. (CFLAGS-rewind.c): Likewise. (CFLAGS-wfileops.c): Likewise. (CFLAGS-wgenops.c): Likewise. (CFLAGS-oldiofopen.c): Likewise. (CFLAGS-iofopen.c): Likewise. (CFLAGS-iofopen64.c): Likewise. (CFLAGS-oldtmpfile.c): Likewise. * stdio-common/Makefile (CFLAGS-vfprintf.c): Likewise. (CFLAGS-fprintf.c): Likewise. (CFLAGS-printf.c): Likewise. (CFLAGS-vfwprintf.c): Likewise. (CFLAGS-vfscanf.c): Likewise. (CFLAGS-vfwscanf.c): Likewise. (CFLAGS-fscanf.c): Likewise. (CFLAGS-scanf.c): Likewise. (CFLAGS-isoc99_vfscanf.c): Likewise. (CFLAGS-isoc99_vscanf.c): Likewise. (CFLAGS-isoc99_fscanf.c): Likewise. (CFLAGS-isoc99_scanf.c): Likewise. * wcsmbs/Makefile (CFLAGS-isoc99_wscanf.c): Likewise. (CFLAGS-isoc99_fwscanf.c): Likewise. (CFLAGS-isoc99_vwscanf.c): Likewise. (CFLAGS-isoc99_vfwscanf.c): Likewise. --- libio/Makefile | 116 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'libio/Makefile') diff --git a/libio/Makefile b/libio/Makefile index 273c2400ff..1f4feb8ae1 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -84,64 +84,64 @@ endif CPPFLAGS += $(libio-mtsafe) # Support for exception handling. -CFLAGS-fileops.c = $(exceptions) -CFLAGS-fputc.c = $(exceptions) -CFLAGS-fputwc.c = $(exceptions) -CFLAGS-freopen64.c = $(exceptions) -CFLAGS-freopen.c = $(exceptions) -CFLAGS-fseek.c = $(exceptions) -CFLAGS-fseeko64.c = $(exceptions) -CFLAGS-fseeko.c = $(exceptions) -CFLAGS-ftello64.c = $(exceptions) -CFLAGS-ftello.c = $(exceptions) -CFLAGS-fwide.c = $(exceptions) -CFLAGS-genops.c = $(exceptions) -CFLAGS-getc.c = $(exceptions) -CFLAGS-getchar.c = $(exceptions) -CFLAGS-getwc.c = $(exceptions) -CFLAGS-getwchar.c = $(exceptions) -CFLAGS-iofclose.c = $(exceptions) -CFLAGS-iofflush.c = $(exceptions) -CFLAGS-iofgetpos64.c = $(exceptions) -CFLAGS-iofgetpos.c = $(exceptions) -CFLAGS-iofgets.c = $(exceptions) -CFLAGS-iofgetws.c = $(exceptions) -CFLAGS-iofputs.c = $(exceptions) -CFLAGS-iofputws.c = $(exceptions) -CFLAGS-iofread.c = $(exceptions) -CFLAGS-iofsetpos64.c = $(exceptions) -CFLAGS-iofsetpos.c = $(exceptions) -CFLAGS-ioftell.c = $(exceptions) -CFLAGS-iofwrite.c = $(exceptions) -CFLAGS-iogetdelim.c = $(exceptions) -CFLAGS-iogetline.c = $(exceptions) -CFLAGS-iogets.c = $(exceptions) -CFLAGS-iogetwline.c = $(exceptions) -CFLAGS-ioputs.c = $(exceptions) -CFLAGS-ioseekoff.c = $(exceptions) -CFLAGS-ioseekpos.c = $(exceptions) -CFLAGS-iosetbuffer.c = $(exceptions) -CFLAGS-iosetvbuf.c = $(exceptions) -CFLAGS-ioungetc.c = $(exceptions) -CFLAGS-ioungetwc.c = $(exceptions) -CFLAGS-oldfileops.c = $(exceptions) -CFLAGS-oldiofclose.c = $(exceptions) -CFLAGS-oldiofgetpos64.c = $(exceptions) -CFLAGS-oldiofgetpos.c = $(exceptions) -CFLAGS-oldiofsetpos64.c = $(exceptions) -CFLAGS-oldiofsetpos.c = $(exceptions) -CFLAGS-peekc.c = $(exceptions) -CFLAGS-putc.c = $(exceptions) -CFLAGS-putchar.c = $(exceptions) -CFLAGS-putwc.c = $(exceptions) -CFLAGS-putwchar.c = $(exceptions) -CFLAGS-rewind.c = $(exceptions) -CFLAGS-wfileops.c = $(exceptions) -CFLAGS-wgenops.c = $(exceptions) -CFLAGS-oldiofopen.c = $(exceptions) -CFLAGS-iofopen.c = $(exceptions) -CFLAGS-iofopen64.c = $(exceptions) -CFLAGS-oldtmpfile.c = $(exceptions) +CFLAGS-fileops.c = -fexceptions +CFLAGS-fputc.c = -fexceptions +CFLAGS-fputwc.c = -fexceptions +CFLAGS-freopen64.c = -fexceptions +CFLAGS-freopen.c = -fexceptions +CFLAGS-fseek.c = -fexceptions +CFLAGS-fseeko64.c = -fexceptions +CFLAGS-fseeko.c = -fexceptions +CFLAGS-ftello64.c = -fexceptions +CFLAGS-ftello.c = -fexceptions +CFLAGS-fwide.c = -fexceptions +CFLAGS-genops.c = -fexceptions +CFLAGS-getc.c = -fexceptions +CFLAGS-getchar.c = -fexceptions +CFLAGS-getwc.c = -fexceptions +CFLAGS-getwchar.c = -fexceptions +CFLAGS-iofclose.c = -fexceptions +CFLAGS-iofflush.c = -fexceptions +CFLAGS-iofgetpos64.c = -fexceptions +CFLAGS-iofgetpos.c = -fexceptions +CFLAGS-iofgets.c = -fexceptions +CFLAGS-iofgetws.c = -fexceptions +CFLAGS-iofputs.c = -fexceptions +CFLAGS-iofputws.c = -fexceptions +CFLAGS-iofread.c = -fexceptions +CFLAGS-iofsetpos64.c = -fexceptions +CFLAGS-iofsetpos.c = -fexceptions +CFLAGS-ioftell.c = -fexceptions +CFLAGS-iofwrite.c = -fexceptions +CFLAGS-iogetdelim.c = -fexceptions +CFLAGS-iogetline.c = -fexceptions +CFLAGS-iogets.c = -fexceptions +CFLAGS-iogetwline.c = -fexceptions +CFLAGS-ioputs.c = -fexceptions +CFLAGS-ioseekoff.c = -fexceptions +CFLAGS-ioseekpos.c = -fexceptions +CFLAGS-iosetbuffer.c = -fexceptions +CFLAGS-iosetvbuf.c = -fexceptions +CFLAGS-ioungetc.c = -fexceptions +CFLAGS-ioungetwc.c = -fexceptions +CFLAGS-oldfileops.c = -fexceptions +CFLAGS-oldiofclose.c = -fexceptions +CFLAGS-oldiofgetpos64.c = -fexceptions +CFLAGS-oldiofgetpos.c = -fexceptions +CFLAGS-oldiofsetpos64.c = -fexceptions +CFLAGS-oldiofsetpos.c = -fexceptions +CFLAGS-peekc.c = -fexceptions +CFLAGS-putc.c = -fexceptions +CFLAGS-putchar.c = -fexceptions +CFLAGS-putwc.c = -fexceptions +CFLAGS-putwchar.c = -fexceptions +CFLAGS-rewind.c = -fexceptions +CFLAGS-wfileops.c = -fexceptions +CFLAGS-wgenops.c = -fexceptions +CFLAGS-oldiofopen.c = -fexceptions +CFLAGS-iofopen.c = -fexceptions +CFLAGS-iofopen64.c = -fexceptions +CFLAGS-oldtmpfile.c = -fexceptions # XXX Do we need filedoalloc and wfiledoalloc? Others? CFLAGS-tst_putwc.c = -DOBJPFX=\"$(objpfx)\" -- cgit 1.4.1