[2289] 2009-06-10 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 2289
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2289
Author:   proski
Date:     2009-06-10 18:26:50 +0000 (Wed, 10 Jun 2009)
Log Message:
-----------
2009-06-10  Pavel Roskin  <address@hidden>

        * configure.ac: Remove checks for __bswapsi2 and __bswapdi2,
        they fail without libc headers for the target.
        * include/grub/powerpc/libgcc.h: Use weak attribute for all
        exports.
        * include/grub/sparc64/libgcc.h: Likewise.  Don't use
        preprocessor conditionals.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/configure.ac
    trunk/grub2/include/grub/powerpc/libgcc.h
    trunk/grub2/include/grub/sparc64/libgcc.h

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-10 17:02:15 UTC (rev 2288)
+++ trunk/grub2/ChangeLog       2009-06-10 18:26:50 UTC (rev 2289)
@@ -1,5 +1,12 @@
 2009-06-10  Pavel Roskin  <address@hidden>
 
+       * configure.ac: Remove checks for __bswapsi2 and __bswapdi2,
+       they fail without libc headers for the target.
+       * include/grub/powerpc/libgcc.h: Use weak attribute for all
+       exports.
+       * include/grub/sparc64/libgcc.h: Likewise.  Don't use
+       preprocessor conditionals.
+
        * conf/common.rmk: Compile tar.mod from tar.c, not cpio.c.  The
        build system doesn't need to be aware of the tar.c internals.
 

Modified: trunk/grub2/configure.ac
===================================================================
--- trunk/grub2/configure.ac    2009-06-10 17:02:15 UTC (rev 2288)
+++ trunk/grub2/configure.ac    2009-06-10 18:26:50 UTC (rev 2289)
@@ -409,9 +409,6 @@
 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

Modified: trunk/grub2/include/grub/powerpc/libgcc.h
===================================================================
--- trunk/grub2/include/grub/powerpc/libgcc.h   2009-06-10 17:02:15 UTC (rev 
2288)
+++ trunk/grub2/include/grub/powerpc/libgcc.h   2009-06-10 18:26:50 UTC (rev 
2289)
@@ -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));

Modified: trunk/grub2/include/grub/sparc64/libgcc.h
===================================================================
--- trunk/grub2/include/grub/sparc64/libgcc.h   2009-06-10 17:02:15 UTC (rev 
2288)
+++ trunk/grub2/include/grub/sparc64/libgcc.h   2009-06-10 18:26:50 UTC (rev 
2289)
@@ -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));