summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d1302b318ef..8cd3b239c37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-14 Roland McGrath <mcgrathr@google.com>
+
+ * configure.ac (ENABLE_GOLD): Consider *-*-nacl* targets ELF.
+ * configure: Regenerate.
+
2012-11-13 Richard Henderson <rth@redhat.com>
* configure.ac: Move libsanitizer logic to subdirectory.
diff --git a/configure b/configure
index 45e521e9928..d72d4f93f9c 100755
--- a/configure
+++ b/configure
@@ -2952,7 +2952,7 @@ case "${ENABLE_GOLD}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
- | *-*-solaris2* | *-*-nto*)
+ | *-*-solaris2* | *-*-nto* | *-*-nacl*)
case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*)
;;
diff --git a/configure.ac b/configure.ac
index 91ccb3dd0c6..24ea7e526a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,7 +317,7 @@ case "${ENABLE_GOLD}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
- | *-*-solaris2* | *-*-nto*)
+ | *-*-solaris2* | *-*-nto* | *-*-nacl*)
case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*)
;;