* grub-core/lib/reed_solomon.c (grub_reed_solomon_recover): Add

	missing attribute.
	* grub-core/gdb/cstub.c (grub_gdb_trap): Likewise.

diff --git a/ChangeLog b/ChangeLog
index b55f5faa71c8d7e2a6615881ea63d9e18b29fd01..35847a14cb47d86f15b69e441e03c0740172dd84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/reed_solomon.c (grub_reed_solomon_recover): Add
+       missing attribute.
+       * grub-core/gdb/cstub.c (grub_gdb_trap): Likewise.
+
 2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/misc.c (grub_divmod64): Don't fallback to

diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c
index 470fa917a1f1e2c975cb0e5541471b4f204fb8eb..c94411b109fd3cc4d7c87fa741789773d314d341 100644 (file)
--- a/grub-core/gdb/cstub.c
+++ b/grub-core/gdb/cstub.c
@@ -201,7 +201,7 @@ grub_gdb_hex2int (char **ptr, grub_uint64_t *int_value)
 }
 
 /* This function does all command procesing for interfacing to gdb.  */
-void
+void __attribute__ ((regparm(3)))
 grub_gdb_trap (int trap_no)
 {
   unsigned int sig_no;

diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
index 04a27161905e1baacdc07e03b2fe2038b2331e7c..ab1b4e59e43d65e66408759b37590ecc4bb9e979 100644 (file)
--- a/grub-core/lib/reed_solomon.c
+++ b/grub-core/lib/reed_solomon.c
@@ -52,12 +52,16 @@ typedef unsigned char grub_uint8_t;
 #include <grub/types.h>
 #include <grub/misc.h>
 #endif
-void
-grub_reed_solomon_recover (void *ptr_, grub_size_t s, grub_size_t rs)
 #ifdef __i386__
-  __attribute__ ((regparm(3)))
+#define REED_SOLOMON_ATTRIBUTE  __attribute__ ((regparm(3)))
+#else
+#define REED_SOLOMON_ATTRIBUTE
 #endif
-  ;
+void
+grub_reed_solomon_recover (void *ptr_, grub_size_t s, grub_size_t rs)
+  REED_SOLOMON_ATTRIBUTE;
+#else
+#define REED_SOLOMON_ATTRIBUTE
 #endif
 
 #define GF_SIZE 8
@@ -381,7 +385,7 @@ grub_reed_solomon_add_redundancy (void *buffer, grub_size_t data_size,
 }
 #endif
 
-void
+void REED_SOLOMON_ATTRIBUTE
 grub_reed_solomon_recover (void *ptr_, grub_size_t s, grub_size_t rs)
 {
   gf_single_t *ptr = ptr_;