From eecdbebc8416467c029ab05d1c457901c4701c26 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 22 Jul 2015 20:47:56 +0200
Subject: [PATCH] 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.
---
 grub-core/boot/mips/startup_raw.S  | 2 --
 grub-core/kern/mips/cache.S        | 2 --
 grub-core/kern/mips/startup.S      | 2 --
 grub-core/lib/mips/relocator_asm.S | 2 --
 include/grub/mips/kernel.h         | 4 ----
 5 files changed, 12 deletions(-)

diff --git a/grub-core/boot/mips/startup_raw.S b/grub-core/boot/mips/startup_raw.S
index fd95c3134..ca3413bbe 100644
--- 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 e83960fcc..fa6897e14 100644
--- 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 337aca914..339ab337e 100644
--- 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 959893ca9..1d142a4f3 100644
--- 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 d0e09ddc6..07b08848d 100644
--- 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 */