diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8d5312dbc9dd..76cc28418986 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2016-03-18  Uros Bizjak  <ubizjak@gmail.com>
+
+	Revert:
+	2015-07-02  Uros Bizjak  <ubizjak@gmail.com>
+
+	* libsupc++/guard.cc (__test_and_acquire): Use __p after __atomic_load
+	to avoid unused variable warning.
+	(__set_and_release): Use __p after __atomic_store to avoid unused
+	variable warning.
+
 2016-02-24  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/69939
diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
index 9b617998ffed..1b1b23c0cc38 100644
--- a/libstdc++-v3/libsupc++/guard.cc
+++ b/libstdc++-v3/libsupc++/guard.cc
@@ -117,7 +117,6 @@ __test_and_acquire (__cxxabiv1::__guard *g)
   unsigned char __c;
   unsigned char *__p = reinterpret_cast<unsigned char *>(g);
   __atomic_load (__p, &__c,  __ATOMIC_ACQUIRE);
-  (void) __p;
   return _GLIBCXX_GUARD_TEST(&__c);
 }
 #  define _GLIBCXX_GUARD_TEST_AND_ACQUIRE(G) __test_and_acquire (G)
@@ -133,7 +132,6 @@ __set_and_release (__cxxabiv1::__guard *g)
   unsigned char *__p = reinterpret_cast<unsigned char *>(g);
   unsigned char val = 1;
   __atomic_store (__p, &val, __ATOMIC_RELEASE);
-  (void) __p;
 }
 #  define _GLIBCXX_GUARD_SET_AND_RELEASE(G) __set_and_release (G)
 # endif