From 67310ccd0ea72ebe9374ba4478a7357cd7a00790 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 24 Oct 2007 04:56:48 +0000 Subject: [PATCH] * Makefile.am (INCLUDES): Remove -D_GNU_SOURCE. * configure.in: Invoke AC_GNU_SOURCE. * Makefile.in: Regenerate. * config.in: Regenerate. * configure: Regenerate. * po/POTFILES.in: Regenerate. --- ld/ChangeLog | 9 +++++++++ ld/Makefile.am | 2 +- ld/Makefile.in | 11 +++++------ ld/config.in | 5 +++++ ld/configure | 8 +++++++- ld/configure.in | 1 + ld/po/POTFILES.in | 2 ++ 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 1ecce86..768913e 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2007-10-24 Alan Modra + + * Makefile.am (INCLUDES): Remove -D_GNU_SOURCE. + * configure.in: Invoke AC_GNU_SOURCE. + * Makefile.in: Regenerate. + * config.in: Regenerate. + * configure: Regenerate. + * po/POTFILES.in: Regenerate. + 2007-10-19 Nick Clifton * configure.tgt: Add support for am34-linux-gnu target. diff --git a/ld/Makefile.am b/ld/Makefile.am index f7d2d08..f1a6108 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -101,7 +101,7 @@ AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ -I $(top_srcdir)/../libiberty -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @INCINTL@ $(HDEFINES) $(CFLAGS) \ -DLOCALEDIR="\"$(datadir)/locale\"" diff --git a/ld/Makefile.in b/ld/Makefile.in index 3368bdf..58a8bd1 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -228,9 +228,11 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi` -YFLAGS = -d +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ @@ -247,7 +249,6 @@ build_vendor = @build_vendor@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ @@ -260,16 +261,13 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -283,6 +281,7 @@ AUTOMAKE_OPTIONS = cygnus dejagnu ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd SUBDIRS = po tooldir = $(exec_prefix)/$(target_alias) +YFLAGS = -d AM_CFLAGS = $(WARN_CFLAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. @@ -350,7 +349,7 @@ AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ -I $(top_srcdir)/../libiberty -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @INCINTL@ $(HDEFINES) $(CFLAGS) \ -DLOCALEDIR="\"$(datadir)/locale\"" diff --git a/ld/config.in b/ld/config.in index cae19e7..3d663b8 100644 --- a/ld/config.in +++ b/ld/config.in @@ -136,3 +136,8 @@ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ #undef YYTEXT_POINTER + +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif diff --git a/ld/configure b/ld/configure index e55c9ec..5902019 100755 --- a/ld/configure +++ b/ld/configure @@ -10404,6 +10404,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -14584,7 +14590,7 @@ done # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but diff --git a/ld/configure.in b/ld/configure.in index 05c8467..ccd49d1 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -83,6 +83,7 @@ fi # host-specific stuff: AC_PROG_CC +AC_GNU_SOURCE AC_PROG_INSTALL ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi" diff --git a/ld/po/POTFILES.in b/ld/po/POTFILES.in index 3118cfa..470da39 100644 --- a/ld/po/POTFILES.in +++ b/ld/po/POTFILES.in @@ -30,3 +30,5 @@ pe-dll.c pe-dll.h pep-dll.c pep-dll.h +sha1.c +sha1.h -- 2.7.4