Remove mips_attributes.

mips_attributes was introduced to work around clang problems with
-msoft-float. Those problems are now fixed and moreover .gnu_attributes
itself is unportable and creates problem with clang.

Revert "mips: Fix soft-float handling."

This partially reverts commit 6a4ecd276ed39f66be0ad6ff0f8ff67598098605.

diff --git a/grub-core/boot/mips/startup_raw.S b/grub-core/boot/mips/startup_raw.S
index fd95c3134ca2a495754b12f439885f6c9b73b43c..ca3413bbe09960f5857f330f37b42a7c82105096 100644 (file)
--- a/grub-core/boot/mips/startup_raw.S
+++ b/grub-core/boot/mips/startup_raw.S
@@ -21,7 +21,6 @@
 #include <grub/offsets.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/kernel.h>
-#include <grub/cpu/kernel.h>
 #include <grub/offsets.h>
 
 #define BASE_ADDR 8
@@ -33,7 +32,6 @@
        .globl __start, _start, start
        .set noreorder
        .set nomacro
-       mips_attributes
 __start:
 _start:
 start:         

diff --git a/grub-core/kern/mips/cache.S b/grub-core/kern/mips/cache.S
index e83960fccda4079d5e080bed6183b3e18b98a81b..fa6897e1434f565ddd177b3a4eb2df5cf44fb173 100644 (file)
--- a/grub-core/kern/mips/cache.S
+++ b/grub-core/kern/mips/cache.S
@@ -1,10 +1,8 @@
 
 #include <grub/symbol.h>
-#include <grub/cpu/kernel.h>
 
        .set noreorder
        .set nomacro
-       mips_attributes
 
 FUNCTION (grub_arch_sync_caches)
 #include "cache_flush.S"

diff --git a/grub-core/kern/mips/startup.S b/grub-core/kern/mips/startup.S
index 337aca91440190573c208eccc2fac6f3972f4db6..339ab337e507837d289e82591b967d9c7157666f 100644 (file)
--- a/grub-core/kern/mips/startup.S
+++ b/grub-core/kern/mips/startup.S
@@ -21,7 +21,6 @@
 #include <grub/offsets.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/kernel.h>
-#include <grub/cpu/kernel.h>
 #include <grub/offsets.h>
 
 #define BASE_ADDR 8    
@@ -29,7 +28,6 @@
        .globl __start, _start, start
        .set noreorder
        .set nomacro
-       mips_attributes
 __start:
 _start:
 start:         

diff --git a/grub-core/lib/mips/relocator_asm.S b/grub-core/lib/mips/relocator_asm.S
index 959893ca923063dd306c419087e02cb99064be6e..1d142a4f355b4961edb22b324b05bb941ba88137 100644 (file)
--- a/grub-core/lib/mips/relocator_asm.S
+++ b/grub-core/lib/mips/relocator_asm.S
@@ -17,13 +17,11 @@
  */
 
 #include <grub/symbol.h>
-#include <grub/cpu/kernel.h>
        
        .p2align        4       /* force 16-byte alignment */
 
        .set noreorder
        .set nomacro
-       mips_attributes
 
 VARIABLE (grub_relocator_forward_start)
        move $a0, $9

diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index d0e09ddc66bd0357199c73731b151ee8fcaeb56e..07b08848d8268617fe0722e16d757ad4c1ed3dd4 100644 (file)
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -21,8 +21,4 @@
 
 #include <grub/symbol.h>
 
-#ifdef ASM_FILE
-#define mips_attributes .gnu_attribute 4, 3
-#endif
-
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */