diff --git a/gold/ChangeLog b/gold/ChangeLog
index af6c4f54b8..176e1911c5 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -10,6 +10,11 @@
 
 	* nacl.cc: Include "libiberty.h" for vasprintf declaration.
 
+2012-11-01  Roland McGrath  <mcgrathr@google.com>
+
+	* descriptors.cc (set_close_on_exec): Add ATTRIBUTE_UNUSED to the
+	parameter, which is unused in the [!F_SETFD] case.
+
 2012-10-30  Steve McIntyre  <steve.mcintyre@linaro.org>
 
 	* gold.cc (Target_arm::do_adjust_elf_header): Add the
diff --git a/gold/descriptors.cc b/gold/descriptors.cc
index 2ab0d5c881..f3f071e32b 100644
--- a/gold/descriptors.cc
+++ b/gold/descriptors.cc
@@ -1,6 +1,6 @@
 // descriptors.cc -- manage file descriptors for gold
 
-// Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -45,7 +45,7 @@
 #endif
 
 static inline void
-set_close_on_exec(int fd)
+set_close_on_exec(int fd ATTRIBUTE_UNUSED)
 {
 // Mingw does not define F_SETFD.
 #ifdef F_SETFD