diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/test-memcmp.c | 10 | ||||
| -rw-r--r-- | string/test-strcmp.c | 10 | ||||
| -rw-r--r-- | string/test-strncmp.c | 10 |
3 files changed, 21 insertions, 9 deletions
diff --git a/string/test-memcmp.c b/string/test-memcmp.c index d3cc560470..4d38ddbf6a 100644 --- a/string/test-memcmp.c +++ b/string/test-memcmp.c @@ -1,5 +1,5 @@ /* Test and measure memcmp functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek <jakub@redhat.com>, 1999. @@ -110,7 +110,8 @@ static void do_random_tests (void) { size_t i, j, n, align1, align2, pos, len; - int result, r; + int result; + long r; unsigned char *p1 = buf1 + page_size - 512; unsigned char *p2 = buf2 + page_size - 512; @@ -159,11 +160,14 @@ do_random_tests (void) FOR_EACH_IMPL (impl, 1) { r = CALL (impl, p1 + align1, p2 + align2, len); + /* Test whether on 64-bit architectures where ABI requires + callee to promote has the promotion been done. */ + asm ("" : "=g" (r) : "0" (r)); if ((r == 0 && result) || (r < 0 && result >= 0) || (r > 0 && result <= 0)) { - error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd) %d != %d, p1 %p p2 %p", + error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd) %ld != %d, p1 %p p2 %p", n, impl->name, align1, align2, len, pos, r, result, p1, p2); ret = 1; } diff --git a/string/test-strcmp.c b/string/test-strcmp.c index dbbe3a4ff6..63f14f1ce4 100644 --- a/string/test-strcmp.c +++ b/string/test-strcmp.c @@ -1,5 +1,5 @@ /* Test and measure strcmp functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek <jakub@redhat.com>, 1999. @@ -126,7 +126,8 @@ static void do_random_tests (void) { size_t i, j, n, align1, align2, pos, len1, len2; - int result, r; + int result; + long r; unsigned char *p1 = buf1 + page_size - 512; unsigned char *p2 = buf2 + page_size - 512; @@ -196,11 +197,14 @@ do_random_tests (void) FOR_EACH_IMPL (impl, 1) { r = CALL (impl, p1 + align1, p2 + align2); + /* Test whether on 64-bit architectures where ABI requires + callee to promote has the promotion been done. */ + asm ("" : "=g" (r) : "0" (r)); if ((r == 0 && result) || (r < 0 && result >= 0) || (r > 0 && result <= 0)) { - error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd, %zd) %d != %d, p1 %p p2 %p", + error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd, %zd) %ld != %d, p1 %p p2 %p", n, impl->name, align1, align2, len1, len2, pos, r, result, p1, p2); ret = 1; } diff --git a/string/test-strncmp.c b/string/test-strncmp.c index 2c49e576d6..4fed4e50f1 100644 --- a/string/test-strncmp.c +++ b/string/test-strncmp.c @@ -1,5 +1,5 @@ /* Test and measure strncmp functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek <jakub@redhat.com>, 1999. @@ -132,7 +132,8 @@ static void do_random_tests (void) { size_t i, j, n, align1, align2, pos, len1, len2, size; - int result, r; + int result; + long r; unsigned char *p1 = buf1 + page_size - 512; unsigned char *p2 = buf2 + page_size - 512; @@ -206,11 +207,14 @@ do_random_tests (void) FOR_EACH_IMPL (impl, 1) { r = CALL (impl, p1 + align1, p2 + align2, size); + /* Test whether on 64-bit architectures where ABI requires + callee to promote has the promotion been done. */ + asm ("" : "=g" (r) : "0" (r)); if ((r == 0 && result) || (r < 0 && result >= 0) || (r > 0 && result <= 0)) { - error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd, %zd, %zd) %d != %d, p1 %p p2 %p", + error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd, %zd, %zd) %ld != %d, p1 %p p2 %p", n, impl->name, align1, align2, len1, len2, pos, size, r, result, p1, p2); ret = 1; } |