linux-mips
[Top] [All Lists]

[PATCH] MIPS: Revert 25c3000300163e2ebf68d94425088de35ead3d76

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH] MIPS: Revert 25c3000300163e2ebf68d94425088de35ead3d76
From: David Daney <ddaney@caviumnetworks.com>
Date: Tue, 24 Feb 2009 11:14:38 -0800
Cc: David Daney <ddaney@caviumnetworks.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Commit 25c3000300163e2ebf68d94425088de35ead3d76 added an ugly work
around for a bug in binutils 2.19 that was needed for Cavium Octeon
processor support.  Now binutils 2.19.1 have been released and the
work around is no longer necessary.

Since Cavium Octeon processor support has not yet been part of any
official kernel release, there is no need to maintain compatibility
with older toolchains.  We can simply say that only binutils 2.19.1 or
later is supported (instead of 2.19 or later as it was before).

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/include/asm/mipsregs.h |    2 --
 arch/mips/kernel/genex.S         |    4 ----
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 0417516..207d098 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -1028,8 +1028,6 @@ do {                                                      
                \
        __asm__ __volatile__(                                   \
        ".set\tpush\n\t"                                        \
        ".set\treorder\n\t"                                     \
-       /* gas fails to assemble cfc1 for some archs (octeon).*/ \
-       ".set\tmips1\n\t"                                       \
         "cfc1\t%0,"STR(source)"\n\t"                            \
        ".set\tpop"                                             \
         : "=r" (__res));                                        \
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 8882e57..4d49322 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -385,14 +385,10 @@ NESTED(nmi_handler, PT_SIZE, sp)
        .endm
 
        .macro  __build_clear_fpe
-       .set    push
-       /* gas fails to assemble cfc1 for some archs (octeon).*/ \
-       .set    mips1
        cfc1    a1, fcr31
        li      a2, ~(0x3f << 12)
        and     a2, a1
        ctc1    a2, fcr31
-       .set    pop
        TRACE_IRQS_ON
        STI
        .endm
-- 
1.5.6.6


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] MIPS: Revert 25c3000300163e2ebf68d94425088de35ead3d76, David Daney <=