From ffd12b812694f7a551c2846f3808bfcee5317646 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 14 Feb 2008 20:23:27 +0000 Subject: [PATCH] 2008-02-14 H.J. Lu * ld-shared/sh1.c (shlib_overriddencall2): Moved to ... * ld-shared/sh2.c (shlib_overriddencall2): Here. New. --- ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-shared/sh1.c | 6 ------ ld/testsuite/ld-shared/sh2.c | 8 ++++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index bc6f8098639..673f240ca65 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-02-14 H.J. Lu + + * ld-shared/sh1.c (shlib_overriddencall2): Moved to ... + * ld-shared/sh2.c (shlib_overriddencall2): Here. New. + 2008-02-07 Alan Modra * ld-spu/ovl.d: Update. diff --git a/ld/testsuite/ld-shared/sh1.c b/ld/testsuite/ld-shared/sh1.c index 20f183c2642..c8e523249a3 100644 --- a/ld/testsuite/ld-shared/sh1.c +++ b/ld/testsuite/ld-shared/sh1.c @@ -71,12 +71,6 @@ shlib_shlibcall2 () { return shlib_overriddencall2 (); } - -int -shlib_overriddencall2 () -{ - return 7; -} #endif /* This function calls a function defined by the main program. */ diff --git a/ld/testsuite/ld-shared/sh2.c b/ld/testsuite/ld-shared/sh2.c index 013a4e0994f..7cd1db38ee7 100644 --- a/ld/testsuite/ld-shared/sh2.c +++ b/ld/testsuite/ld-shared/sh2.c @@ -12,3 +12,11 @@ shlib_shlibcalled () { return 5; } + +#ifndef XCOFF_TEST +int +shlib_overriddencall2 () +{ + return 7; +} +#endif -- 2.30.2