diff options
author | peter <peter@FreeBSD.org> | 2008-11-02 01:28:47 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2008-11-02 01:28:47 +0000 |
commit | 3375b8347bf4a4a5365a390af7fa3c2adb0ad6cd (patch) | |
tree | 3dffbf64ba2a3402b9a89f84ff5f5036d0a9ce91 /lib/libc/i386/string | |
parent | aa63008f13d7a07b62a85c25814374cb77dc7f84 (diff) | |
download | FreeBSD-src-3375b8347bf4a4a5365a390af7fa3c2adb0ad6cd.zip FreeBSD-src-3375b8347bf4a4a5365a390af7fa3c2adb0ad6cd.tar.gz |
Add missing END() macros, as per rev 184547 for amd64. The lack of these
is mostly harmless, but it does upset some of valgrind's functionality.
Diffstat (limited to 'lib/libc/i386/string')
-rw-r--r-- | lib/libc/i386/string/bcmp.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/bcopy.S | 9 | ||||
-rw-r--r-- | lib/libc/i386/string/bzero.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/ffs.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/index.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/memchr.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/memcmp.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/memset.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/rindex.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/strcat.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/strchr.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/strcmp.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/strcpy.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/strlen.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/strncmp.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/strrchr.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/swab.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/wcschr.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/wcscmp.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/wcslen.S | 1 | ||||
-rw-r--r-- | lib/libc/i386/string/wmemchr.S | 1 |
21 files changed, 29 insertions, 0 deletions
diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S index aa6a6ab..eaf9666 100644 --- a/lib/libc/i386/string/bcmp.S +++ b/lib/libc/i386/string/bcmp.S @@ -61,3 +61,4 @@ L1: popl %esi popl %edi ret +END(bcmp) diff --git a/lib/libc/i386/string/bcopy.S b/lib/libc/i386/string/bcopy.S index 1a3d588..2f3525e 100644 --- a/lib/libc/i386/string/bcopy.S +++ b/lib/libc/i386/string/bcopy.S @@ -97,3 +97,12 @@ ENTRY(bcopy) popl %esi cld ret +#ifdef MEMCOPY +END(memcpy) +#else +#ifdef MEMMOVE +END(memmove) +#else +END(bcopy) +#endif +#endif diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S index f66bd78..3c22b36 100644 --- a/lib/libc/i386/string/bzero.S +++ b/lib/libc/i386/string/bzero.S @@ -79,3 +79,4 @@ L1: rep popl %ebx popl %edi ret +END(bzero) diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S index 450f586..e668447 100644 --- a/lib/libc/i386/string/ffs.S +++ b/lib/libc/i386/string/ffs.S @@ -51,3 +51,4 @@ ENTRY(ffs) .align 2 L1: xorl %eax,%eax /* clear result */ ret +END(ffs) diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S index db0a162..e7e7a8c 100644 --- a/lib/libc/i386/string/index.S +++ b/lib/libc/i386/string/index.S @@ -61,3 +61,4 @@ L1: L2: popl %ebx ret +END(index) diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S index 639077d..a313d4d 100644 --- a/lib/libc/i386/string/memchr.S +++ b/lib/libc/i386/string/memchr.S @@ -56,3 +56,4 @@ ENTRY(memchr) L1: xorl %eax,%eax popl %edi ret +END(memchr) diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S index 8aa2f4e..fa9586f 100644 --- a/lib/libc/i386/string/memcmp.S +++ b/lib/libc/i386/string/memcmp.S @@ -73,3 +73,4 @@ L6: movzbl -1(%edi),%eax /* Perform unsigned comparison */ popl %esi popl %edi ret +END(memcmp) diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S index 52f0485..25768c22 100644 --- a/lib/libc/i386/string/memset.S +++ b/lib/libc/i386/string/memset.S @@ -87,3 +87,4 @@ L1: rep popl %ebx popl %edi ret +END(memset) diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S index f0d99f1..c52f6d3 100644 --- a/lib/libc/i386/string/rindex.S +++ b/lib/libc/i386/string/rindex.S @@ -62,3 +62,4 @@ L2: jne L1 popl %ebx ret +END(rindex) diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S index 3a667ca..6715bd8 100644 --- a/lib/libc/i386/string/strcat.S +++ b/lib/libc/i386/string/strcat.S @@ -98,3 +98,4 @@ L1: movb (%edx),%al /* unroll loop, but not too much */ L2: popl %eax /* pop destination address */ popl %edi /* restore edi */ ret +END(strcat) diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S index 19ff5d4..8c518fb 100644 --- a/lib/libc/i386/string/strchr.S +++ b/lib/libc/i386/string/strchr.S @@ -61,3 +61,4 @@ L1: L2: popl %ebx ret +END(strchr) diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S index 07a87b6..9ca104e 100644 --- a/lib/libc/i386/string/strcmp.S +++ b/lib/libc/i386/string/strcmp.S @@ -117,3 +117,4 @@ L3: movzbl (%eax),%eax /* unsigned comparison */ movzbl (%edx),%edx subl %edx,%eax ret +END(strcmp) diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S index a474ec1..7367c07 100644 --- a/lib/libc/i386/string/strcpy.S +++ b/lib/libc/i386/string/strcpy.S @@ -87,3 +87,4 @@ L1: movb (%edx),%al /* unroll loop, but not too much */ jne L1 L2: popl %eax /* pop dst address */ ret +END(strcpy) diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S index 22d683e..6e91f1a 100644 --- a/lib/libc/i386/string/strlen.S +++ b/lib/libc/i386/string/strlen.S @@ -51,3 +51,4 @@ ENTRY(strlen) leal -1(%ecx),%eax /* and subtracting one */ popl %edi ret +END(strlen) diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S index e5953c5..98e3656 100644 --- a/lib/libc/i386/string/strncmp.S +++ b/lib/libc/i386/string/strncmp.S @@ -164,3 +164,4 @@ L3: movzbl (%eax),%eax /* unsigned comparison */ L4: xorl %eax,%eax popl %ebx ret +END(strncmp) diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S index 8b63ddf..f044c2e 100644 --- a/lib/libc/i386/string/strrchr.S +++ b/lib/libc/i386/string/strrchr.S @@ -62,3 +62,4 @@ L2: jne L1 popl %ebx ret +END(strrchr) diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S index 80b2f3c..5035de2 100644 --- a/lib/libc/i386/string/swab.S +++ b/lib/libc/i386/string/swab.S @@ -97,3 +97,4 @@ L3: lodsw L4: popl %edi popl %esi ret +END(swab) diff --git a/lib/libc/i386/string/wcschr.S b/lib/libc/i386/string/wcschr.S index c020d74..8f6c543 100644 --- a/lib/libc/i386/string/wcschr.S +++ b/lib/libc/i386/string/wcschr.S @@ -74,3 +74,4 @@ found0: popl %ebx no: popl %ebx xorl %eax,%eax ret +END(wcschr) diff --git a/lib/libc/i386/string/wcscmp.S b/lib/libc/i386/string/wcscmp.S index aa44140..8d0700a 100644 --- a/lib/libc/i386/string/wcscmp.S +++ b/lib/libc/i386/string/wcscmp.S @@ -77,3 +77,4 @@ no0: subl (%esi),%eax popl %esi popl %edi ret +END(wcscmp) diff --git a/lib/libc/i386/string/wcslen.S b/lib/libc/i386/string/wcslen.S index 2bebc1e..9fea2b0 100644 --- a/lib/libc/i386/string/wcslen.S +++ b/lib/libc/i386/string/wcslen.S @@ -66,3 +66,4 @@ found2: incl %eax found1: incl %eax found0: popl %ebx ret +END(wcslen) diff --git a/lib/libc/i386/string/wmemchr.S b/lib/libc/i386/string/wmemchr.S index a4ef081..2b5270b 100644 --- a/lib/libc/i386/string/wmemchr.S +++ b/lib/libc/i386/string/wmemchr.S @@ -103,3 +103,4 @@ no: xorl %eax,%eax popl %ebx popl %edi ret +END(wmemchr) |