1235 Use symbol capabilities to eliminate libc_hwcap*

@@ -1,8 +1,6 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.

@@ -19,10 +17,27 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
+#
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2017 Nexenta Systems, Inc.
+#
+
 $mapfile_version 2
 
-CAPABILITY {
-        hw += fpu cmov mmx sse;
+CAPABILITY i386-hwcap2 {
+        HW += fpu cmov amd_sysc mmx sse sse2;
+};
+
+SYMBOL_SCOPE {
+    global:
+        _memcpy;
+        _memmove;
+        _memset;
+        memcpy;
+        memmove;
+        memset;
+    local:
+        *;
 };