[gdb/testsuite] Fix g0 search in gdb.arch/i386-sse-stack-align.exp

When running test-case gdb.arch/i386-sse-stack-align.exp on target board
unix/-m32, I run into:
...
(gdb) print (int) g0 ()^M
Invalid data type for function to be called.^M
(gdb) FAIL: gdb.arch/i386-sse-stack-align.exp: print (int) g0 ()
...

Gdb is supposed to use minimal symbol g0:
...
$ nm i386-sse-stack-align | grep g0
08049194 t g0
...
but instead it finds a g0 symbol in the debug info of libm, specifically in
./sysdeps/ieee754/ldbl-96/e_lgammal_r.c.

Fix this by renaming g[0-4] to test_g[0-4].

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2021-01-28  Tom de Vries  <tdevries@suse.de>

	* gdb.arch/i386-sse-stack-align.S: Rename g[0-4] to test_g[0-4].
	* gdb.arch/i386-sse-stack-align.c: Same.
	* gdb.arch/i386-sse-stack-align.exp: Same.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b752e6d4f0721298173a3e36ab2b3db7c909548e..ac45381f6c93d71309c171e0cb367cd70f55f555 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2021-01-28  Tom de Vries  <tdevries@suse.de>
+
+       * gdb.arch/i386-sse-stack-align.S: Rename g[0-4] to test_g[0-4].
+       * gdb.arch/i386-sse-stack-align.c: Same.
+       * gdb.arch/i386-sse-stack-align.exp: Same.
+
 2021-01-28  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * lib/gdb.exp (default_gdb_init): Unset XDG_CONFIG_HOME.

diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.S b/gdb/testsuite/gdb.arch/i386-sse-stack-align.S
index cd3b49ed8297f8fdabb797873bf6a62d2f2b7f26..2e9d54a81902a77ba9495cdfada1f0973734a921 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.S
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.S
@@ -70,8 +70,8 @@ f:
        .cfi_endproc
 .LFE1:
        .size   f, .-f
-       .type   g0, @function
-g0:
+       .type   test_g0, @function
+test_g0:
 .LFB2:
        .cfi_startproc
        pushl   %ebp
@@ -87,9 +87,9 @@ g0:
        ret
        .cfi_endproc
 .LFE2:
-       .size   g0, .-g0
-       .type   g1, @function
-g1:
+       .size   test_g0, .-test_g0
+       .type   test_g1, @function
+test_g1:
 .LFB3:
        .cfi_startproc
        pushl   %ebp
@@ -105,9 +105,9 @@ g1:
        ret
        .cfi_endproc
 .LFE3:
-       .size   g1, .-g1
-       .type   g2, @function
-g2:
+       .size   test_g1, .-test_g1
+       .type   test_g2, @function
+test_g2:
 .LFB4:
        .cfi_startproc
        pushl   %ebp
@@ -123,9 +123,9 @@ g2:
        ret
        .cfi_endproc
 .LFE4:
-       .size   g2, .-g2
-       .type   g3, @function
-g3:
+       .size   test_g2, .-test_g2
+       .type   test_g3, @function
+test_g3:
 .LFB5:
        .cfi_startproc
        pushl   %ebp
@@ -141,9 +141,9 @@ g3:
        ret
        .cfi_endproc
 .LFE5:
-       .size   g3, .-g3
-       .type   g4, @function
-g4:
+       .size   test_g3, .-test_g3
+       .type   test_g4, @function
+test_g4:
 .LFB6:
        .cfi_startproc
        pushl   %ebp
@@ -159,7 +159,7 @@ g4:
        ret
        .cfi_endproc
 .LFE6:
-       .size   g4, .-g4
+       .size   test_g4, .-test_g4
        .globl  main
        .type   main, @function
 main:
@@ -174,25 +174,25 @@ main:
        andl    $-16, %esp
        subl    $16, %esp
        .cfi_offset 3, -12
-       call    g0
+       call    test_g0
        movl    %eax, %ebx
        movl    $1, (%esp)
-       call    g1
+       call    test_g1
        addl    %eax, %ebx
        movl    $2, 4(%esp)
        movl    $1, (%esp)
-       call    g2
+       call    test_g2
        addl    %eax, %ebx
        movl    $3, 8(%esp)
        movl    $2, 4(%esp)
        movl    $1, (%esp)
-       call    g3
+       call    test_g3
        addl    %eax, %ebx
        movl    $4, 12(%esp)
        movl    $3, 8(%esp)
        movl    $2, 4(%esp)
        movl    $1, (%esp)
-       call    g4
+       call    test_g4
        addl    %ebx, %eax
        movl    -4(%ebp), %ebx
        leave

diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.c b/gdb/testsuite/gdb.arch/i386-sse-stack-align.c
index adae6b75fb1216612700e5eedfca8821d475f17e..4fd1fda35006869677e1ea28516760309dde2f7f 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.c
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.c
@@ -34,31 +34,31 @@ f (void)
 }
 
 static __attribute__((noinline, noclone)) int
-g0 (void)
+test_g0 (void)
 {
   return f ();
 }
 
 static __attribute__((noinline, noclone)) int
-g1 (int p1)
+test_g1 (int p1)
 {
   return f ();
 }
 
 static __attribute__((noinline, noclone)) int
-g2 (int p1, int p2)
+test_g2 (int p1, int p2)
 {
   return f ();
 }
 
 static __attribute__((noinline, noclone)) int
-g3 (int p1, int p2, int p3)
+test_g3 (int p1, int p2, int p3)
 {
   return f ();
 }
 
 static __attribute__((noinline, noclone)) int
-g4 (int p1, int p2, int p3, int p4)
+test_g4 (int p1, int p2, int p3, int p4)
 {
   return f ();
 }
@@ -66,5 +66,6 @@ g4 (int p1, int p2, int p3, int p4)
 int
 main (void)
 {
-  return g0 () + g1 (1) + g2 (1, 2) + g3 (1, 2, 3) + g4 (1, 2, 3, 4);
+  return (test_g0 () + test_g1 (1) + test_g2 (1, 2) + test_g3 (1, 2, 3)
+         + test_g4 (1, 2, 3, 4);
 }

diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
index 2c1cdd89c70ab64acb99134e03b4b87103bf7623..8cda3b49facd31bcaab1967036c3a5c3a4e277b1 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
@@ -43,7 +43,7 @@ if ![runto_main] then {
 
 set args ""
 foreach i {0 1 2 3 4} {
-    set test "print (int) g$i ($args)"
+    set test "print (int) test_g$i ($args)"
     gdb_test_multiple $test $test {
        -re " = 2\r\n$gdb_prompt $" {
            pass $test