From ec04413559d3299dc764721fb06850a49929c824 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Wed, 24 Oct 2007 18:11:23 +0000
Subject: [PATCH] Use AC_GNU_SOURCE.

---
 gold/Makefile.am           | 2 +-
 gold/Makefile.in           | 2 +-
 gold/config.in             | 5 +++++
 gold/configure             | 8 ++++++++
 gold/configure.ac          | 3 +++
 gold/testsuite/Makefile.am | 2 +-
 gold/testsuite/Makefile.in | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gold/Makefile.am b/gold/Makefile.am
index d05979e3cf..c9cde9ca97 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../bfd -I ../config
 
 AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CXXFLAGS)
 
-INCLUDES = -D_GNU_SOURCE \
+INCLUDES = \
 	-I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
 	-DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
diff --git a/gold/Makefile.in b/gold/Makefile.in
index 4b1b9e2a96..a7e3f73893 100644
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -271,7 +271,7 @@ SUBDIRS = po testsuite
 tooldir = $(exec_prefix)/$(target_alias)
 ACLOCAL_AMFLAGS = -I ../bfd -I ../config
 AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CXXFLAGS)
-INCLUDES = -D_GNU_SOURCE \
+INCLUDES = \
 	-I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
 	-DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
diff --git a/gold/config.in b/gold/config.in
index f46745d20d..7550224168 100644
--- a/gold/config.in
+++ b/gold/config.in
@@ -100,3 +100,8 @@
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
+
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
diff --git a/gold/configure b/gold/configure
index 2490e255f2..7648c2c412 100755
--- a/gold/configure
+++ b/gold/configure
@@ -3810,6 +3810,14 @@ else
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+
+
 # If we haven't got the data from the intl directory,
 # assume NLS is disabled.
 USE_NLS=no
diff --git a/gold/configure.ac b/gold/configure.ac
index d8f71dfcb6..e230b5f55b 100644
--- a/gold/configure.ac
+++ b/gold/configure.ac
@@ -144,6 +144,9 @@ AC_PROG_YACC
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
+
+AC_GNU_SOURCE
+
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index bcbdcc3401..5c42b3fb3b 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS =
 # eventually.
 AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CXXFLAGS) -fmerge-constants
 
-INCLUDES = -D_GNU_SOURCE \
+INCLUDES = \
 	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../../include \
 	-I$(srcdir)/../../elfcpp \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index b8ab3e5553..1cfea398ce 100644
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -545,7 +545,7 @@ AUTOMAKE_OPTIONS =
 # it on.  This may need to be controlled by a configure option
 # eventually.
 AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CXXFLAGS) -fmerge-constants
-INCLUDES = -D_GNU_SOURCE \
+INCLUDES = \
 	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../../include \
 	-I$(srcdir)/../../elfcpp \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
-- 
2.11.0