1
0

patch-kern_misc_c 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. --- grub-1.98.orig/kern/misc.c 2010-03-06 21:51:37.000000000 +0100
  2. +++ grub-1.98/kern/misc.c 2010-06-26 20:12:26.711214130 +0200
  3. @@ -64,23 +64,6 @@ grub_memmove (void *dest, const void *sr
  4. return dest;
  5. }
  6. -#ifndef APPLE_CC
  7. -void *memmove (void *dest, const void *src, grub_size_t n)
  8. - __attribute__ ((alias ("grub_memmove")));
  9. -/* GCC emits references to memcpy() for struct copies etc. */
  10. -void *memcpy (void *dest, const void *src, grub_size_t n)
  11. - __attribute__ ((alias ("grub_memmove")));
  12. -#else
  13. -void *memcpy (void *dest, const void *src, grub_size_t n)
  14. -{
  15. - return grub_memmove (dest, src, n);
  16. -}
  17. -void *memmove (void *dest, const void *src, grub_size_t n)
  18. -{
  19. - return grub_memmove (dest, src, n);
  20. -}
  21. -#endif
  22. -
  23. char *
  24. grub_strcpy (char *dest, const char *src)
  25. {
  26. @@ -516,15 +499,6 @@ grub_memset (void *s, int c, grub_size_t
  27. return s;
  28. }
  29. -#ifndef APPLE_CC
  30. -void *memset (void *s, int c, grub_size_t n)
  31. - __attribute__ ((alias ("grub_memset")));
  32. -#else
  33. -void *memset (void *s, int c, grub_size_t n)
  34. -{
  35. - return grub_memset (s, c, n);
  36. -}
  37. -#endif
  38. grub_size_t
  39. grub_strlen (const char *s)
  40. @@ -1053,11 +1027,6 @@ grub_abort (void)
  41. grub_exit ();
  42. }
  43. -#ifndef APPLE_CC
  44. -/* GCC emits references to abort(). */
  45. -void abort (void) __attribute__ ((alias ("grub_abort")));
  46. -#endif
  47. -
  48. #ifdef NEED_ENABLE_EXECUTE_STACK
  49. /* Some gcc versions generate a call to this function
  50. in trampolines for nested functions. */