Merge branch 'mainline' into mips

This commit is contained in:
phcoder 2009-10-18 16:12:53 +02:00
commit b78f2e6e10
13 changed files with 214 additions and 160 deletions

View file

@ -16,9 +16,9 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
void EXPORT_FUNC (memset) (void) __attribute__ ((weak));
void EXPORT_FUNC (__ashldi3) (void) __attribute__ ((weak));
void EXPORT_FUNC (__ashrdi3) (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));
void EXPORT_FUNC (memset) (void);
void EXPORT_FUNC (__ashldi3) (void);
void EXPORT_FUNC (__ashrdi3) (void);
void EXPORT_FUNC (__lshrdi3) (void);
void EXPORT_FUNC (__trampoline_setup) (void);
void EXPORT_FUNC (__ucmpdi2) (void);

View file

@ -20,8 +20,12 @@
void EXPORT_FUNC (memset) (void);
#ifdef HAVE___BSWAPSI2
typedef int SItype __attribute__ ((mode (SI)));
SItype EXPORT_FUNC (__bswapsi2) (SItype) __attribute__ ((weak));
SItype EXPORT_FUNC (__bswapsi2) (SItype);
#endif
#ifdef HAVE___BSWAPDI2
typedef int DItype __attribute__ ((mode (DI)));
DItype EXPORT_FUNC (__bswapdi2) (DItype) __attribute__ ((weak));
DItype EXPORT_FUNC (__bswapdi2) (DItype);
#endif