ChangeLog:
configure.ac: Remove check for __bswapsi2 and __bswapdi2.
include/grub/powerpc/libgcc.h: Use weak attribute for all
exports.
include/grub/sparc64/libgcc.h: Likewise. Don't use preprocessor
conditionals.
---
configure.ac | 3 ---
include/grub/powerpc/libgcc.h | 10 +++++-----
include/grub/sparc64/libgcc.h | 8 ++------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac
index e448c2f..8ece359 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,9 +409,6 @@ CFLAGS="$TARGET_CFLAGS"
CPPFLAGS="$TARGET_CPPFLAGS"
LDFLAGS="$TARGET_LDFLAGS"
-# Check for target functions.
-AC_CHECK_FUNCS(__bswapsi2 __bswapdi2)
-
# Defined in aclocal.m4.
grub_PROG_TARGET_CC
if test "x$TARGET_APPLE_CC" != x1 ; then
diff --git a/include/grub/powerpc/libgcc.h b/include/grub/powerpc/libgcc.h
index acdd146..bed9377 100644
--- a/include/grub/powerpc/libgcc.h
+++ b/include/grub/powerpc/libgcc.h
@@ -16,8 +16,8 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
-void EXPORT_FUNC (memset) (void);
-void EXPORT_FUNC (__ashldi3) (void);
-void EXPORT_FUNC (__lshrdi3) (void);
-void EXPORT_FUNC (__trampoline_setup) (void);
-void EXPORT_FUNC (__ucmpdi2) (void);
+void EXPORT_FUNC (memset) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__ashldi3) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__lshrdi3) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__trampoline_setup) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__ucmpdi2) (void) __attribute__ ((weak));
diff --git a/include/grub/sparc64/libgcc.h b/include/grub/sparc64/libgcc.h
index 4a6b619..5d18c5c 100644
--- a/include/grub/sparc64/libgcc.h
+++ b/include/grub/sparc64/libgcc.h
@@ -20,12 +20,8 @@
void EXPORT_FUNC (memset) (void);
-#ifdef HAVE___BSWAPSI2
typedef int SItype __attribute__ ((mode (SI)));
-SItype EXPORT_FUNC (__bswapsi2) (SItype);
-#endif
+SItype EXPORT_FUNC (__bswapsi2) (SItype) __attribute__ ((weak));
-#ifdef HAVE___BSWAPDI2
typedef int DItype __attribute__ ((mode (DI)));
-DItype EXPORT_FUNC (__bswapdi2) (DItype);
-#endif
+DItype EXPORT_FUNC (__bswapdi2) (DItype) __attribute__ ((weak));
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
