diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2025-01-12 15:14:38 +0800 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2025-01-12 16:45:45 +0800 |
commit | fd7728c8a4aa7aa5761ccb18879ea8d137958b06 (patch) | |
tree | 02d14a6d6a761071d5c592f4654d6e4d1ef119ce | |
parent | b5b9f926354d7f79048701cbe5a57dac8f3919b0 (diff) | |
download | binutils-fd7728c8a4aa7aa5761ccb18879ea8d137958b06.zip binutils-fd7728c8a4aa7aa5761ccb18879ea8d137958b06.tar.gz binutils-fd7728c8a4aa7aa5761ccb18879ea8d137958b06.tar.bz2 |
ld: Update function prototypes for compilers defaulting to -std=gnu23
Since GCC 15 defaults to -std=gnu23, update function prototypes in linker
tests for compilers defaulting to -std=gnu23.
PR ld/32546
* ld-shared/main.c (shlib_checkfunptr1): Update prototype for
compilers defaulting to -std=gnu23.
(shlib_checkfunptr2): Likewise.
* ld-shared/sh1.c (shlib_checkfunptr1): Likewise.
(shlib_checkfunptr2): Likewise.
* ld-srec/sr1.c (fn1): Likewise.
(fn2): Likewise.
* ld-srec/sr2.c (fn1): Likewise.
(fn2): Likewise.
* ld-vsb/main.c (shlib_checkfunptr1): Likewise.
(shlib_checkfunptr2): Likewise.
* ld-vsb/sh1.c (hlib_checkfunptr1): Likewise.
(shlib_checkfunptr2): Likewise.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
-rw-r--r-- | ld/testsuite/ld-shared/main.c | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-shared/sh1.c | 6 | ||||
-rw-r--r-- | ld/testsuite/ld-srec/sr1.c | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-srec/sr2.c | 6 | ||||
-rw-r--r-- | ld/testsuite/ld-vsb/main.c | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-vsb/sh1.c | 6 |
6 files changed, 12 insertions, 18 deletions
diff --git a/ld/testsuite/ld-shared/main.c b/ld/testsuite/ld-shared/main.c index b5200f2..f377bda 100644 --- a/ld/testsuite/ld-shared/main.c +++ b/ld/testsuite/ld-shared/main.c @@ -12,8 +12,8 @@ extern int shlib_shlibvar1 (); extern int shlib_shlibvar2 (); extern int shlib_shlibcall (); extern int shlib_maincall (); -extern int shlib_checkfunptr1 (); -extern int shlib_checkfunptr2 (); +extern int shlib_checkfunptr1 (int (*) ()); +extern int shlib_checkfunptr2 (int (*) ()); extern int (*shlib_getfunptr1 ()) (); extern int (*shlib_getfunptr2 ()) (); extern int shlib_check (); diff --git a/ld/testsuite/ld-shared/sh1.c b/ld/testsuite/ld-shared/sh1.c index 9acb29e..a10ae39 100644 --- a/ld/testsuite/ld-shared/sh1.c +++ b/ld/testsuite/ld-shared/sh1.c @@ -83,8 +83,7 @@ shlib_maincall () confirms that the pointer compares equally. */ int -shlib_checkfunptr1 (p) - int (*p) (); +shlib_checkfunptr1 (int (*p) ()) { return p == shlib_shlibvar1; } @@ -93,8 +92,7 @@ shlib_checkfunptr1 (p) confirms that the pointer compares equally. */ int -shlib_checkfunptr2 (p) - int (*p) (); +shlib_checkfunptr2 (int (*p) ()) { return p == main_called; } diff --git a/ld/testsuite/ld-srec/sr1.c b/ld/testsuite/ld-srec/sr1.c index d7de977..706ac27 100644 --- a/ld/testsuite/ld-srec/sr1.c +++ b/ld/testsuite/ld-srec/sr1.c @@ -8,8 +8,8 @@ static int k; static int l = 1; static char ab[] = "This is a string constant"; -extern int fn1 (); -extern int fn2 (); +extern int fn1 (char *); +extern int fn2 (char *); int main () diff --git a/ld/testsuite/ld-srec/sr2.c b/ld/testsuite/ld-srec/sr2.c index 5736cfa..c753ef7 100644 --- a/ld/testsuite/ld-srec/sr2.c +++ b/ld/testsuite/ld-srec/sr2.c @@ -4,15 +4,13 @@ int e1; int e2 = 1; int -fn1 (s) - char *s; +fn1 (char *s) { return s[e1]; } int -fn2 (s) - char *s; +fn2 (char *s) { return s[e2]; } diff --git a/ld/testsuite/ld-vsb/main.c b/ld/testsuite/ld-vsb/main.c index b0359c0..908a745 100644 --- a/ld/testsuite/ld-vsb/main.c +++ b/ld/testsuite/ld-vsb/main.c @@ -29,8 +29,8 @@ extern int shlib_shlibvar1 (); extern int shlib_shlibvar2 (); extern int shlib_shlibcall (); extern int shlib_maincall (); -extern int shlib_checkfunptr1 (); -extern int shlib_checkfunptr2 (); +extern int shlib_checkfunptr1 (int (*) ()); +extern int shlib_checkfunptr2 (int (*) ()); extern int (*shlib_getfunptr1 ()) (); extern int (*shlib_getfunptr2 ()) (); extern int shlib_check (); diff --git a/ld/testsuite/ld-vsb/sh1.c b/ld/testsuite/ld-vsb/sh1.c index 193eca2..42033a3 100644 --- a/ld/testsuite/ld-vsb/sh1.c +++ b/ld/testsuite/ld-vsb/sh1.c @@ -103,8 +103,7 @@ shlib_maincall () confirms that the pointer compares equally. */ int -shlib_checkfunptr1 (p) - int (*p) (); +shlib_checkfunptr1 (int (*p) ()) { return p == shlib_shlibvar1; } @@ -113,8 +112,7 @@ shlib_checkfunptr1 (p) confirms that the pointer compares equally. */ int -shlib_checkfunptr2 (p) - int (*p) (); +shlib_checkfunptr2 (int (*p) ()) { return p == main_called; } |