diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bfb372dff83..f0283499656 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2018-10-16  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/experimental/socket (basic_socket::at_mark): Add missing
+	return.
+
 	* acinclude.m4 (GLIBCXX_CHECK_RANDOM_TR1): Replace with ...
 	(GLIBCXX_CHECK_DEV_RANDOM): New macro with more descriptive name.
 	Define _GLIBCXX_USE_DEV_RANDOM as well as _GLIBCXX_USE_RANDOM_TR1.
diff --git a/libstdc++-v3/include/experimental/socket b/libstdc++-v3/include/experimental/socket
index 7adb42e7e20..e92a4374db9 100644
--- a/libstdc++-v3/include/experimental/socket
+++ b/libstdc++-v3/include/experimental/socket
@@ -756,12 +756,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       {
 	const int __result = ::sockatmark(native_handle());
 	if (__result == -1)
-	  __ec.assign(errno, generic_category());
-	else
 	  {
-	    __ec.clear();
-	    return __result;
+	    __ec.assign(errno, generic_category());
+	    return false;
 	  }
+	__ec.clear();
+	return (bool)__result;
       }
 
       size_t