update

[l4.git] / l4 / pkg / uclibc / lib / contrib / uclibc / libc / string / x86_64 / memset.S

diff --git a/l4/pkg/uclibc/lib/contrib/uclibc/libc/string/x86_64/memset.S b/l4/pkg/uclibc/lib/contrib/uclibc/libc/string/x86_64/memset.S
index df265f394f3d2a5a9b7bcac3f285492642ca849f..d6744129dc374a6cdef54a53c06f1c4fe63470e7 100644 (file)
--- a/l4/pkg/uclibc/lib/contrib/uclibc/libc/string/x86_64/memset.S
+++ b/l4/pkg/uclibc/lib/contrib/uclibc/libc/string/x86_64/memset.S
@@ -15,9 +15,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include "_glibc_inc.h"
 
@@ -29,12 +28,10 @@
 #define LARGE $120000
 
         .text
-#if defined __PIC__ && !defined NOT_IN_libc
+#if defined __PIC__ && !defined NOT_IN_libc && defined __UCLIBC_HAS_FORTIFY__
 ENTRY (__memset_chk)
        cmpq    %rdx, %rcx
-#if defined __UCLIBC_HAS_SSP__
        jb      HIDDEN_JUMPTARGET (__chk_fail)
-#endif
 END (__memset_chk)
 #endif
 ENTRY (memset)
@@ -144,6 +141,6 @@ END (memset)
 libc_hidden_def(memset)
 #endif
 
-#if !BZERO_P && defined __PIC__ && !defined NOT_IN_libc
+#if !BZERO_P && defined __PIC__ && !defined NOT_IN_libc && defined __UCLIBC_HAS_FORTIFY__
 strong_alias (__memset_chk, __memset_zero_constant_len_parameter)
 #endif