[PATCH 07/21] MIPS: Override assembler target architecture for octeon.

To:	linux-mips@linux-mips.org
Subject:	[PATCH 07/21] MIPS: Override assembler target architecture for octeon.
From:	David Daney <ddaney@caviumnetworks.com>
Date:	Wed, 3 Dec 2008 15:44:17 -0800
Cc:	David Daney <ddaney@caviumnetworks.com>
In-reply-to:	<493718EA.40703@caviumnetworks.com>
Original-recipient:	rfc822;linux-mips@linux-mips.org
References:	<493718EA.40703@caviumnetworks.com>
Sender:	linux-mips-bounce@linux-mips.org

Gas from binutils 2.19 fails to compile some cop1 instructions with
-march=octeon.  Since the cop1 instructions are present in mips1, use
that arch instead.  This will be fixed in binutils 2.20.

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

diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 207d098..0417516 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -1028,6 +1028,8 @@ 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 757d48f..fb6f731 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -385,10 +385,14 @@ 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.5

<Prev in Thread]	Current Thread	[Next in Thread>
[PATCH 00/21] Add Cavium OCTEON processor support (v5)., David Daney [PATCH 03/21] MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon., David Daney [PATCH 02/21] MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon/executive and asm/octeon., David Daney [PATCH 01/21] MIPS: Add Cavium OCTEON processor CSR definitions, David Daney [PATCH 04/21] MIPS: For Cavium OCTEON handle hazards as per the R10000 handling., David Daney [PATCH 06/21] MIPS: Add Cavium OCTEON specific register definitions to mipsregs.h, David Daney [PATCH 05/21] MIPS: For Cavium OCTEON set hwrena and lazily restore CP2 state., David Daney [PATCH 09/21] MIPS: Hook Cavium OCTEON cache init into cache.c, David Daney [PATCH 07/21] MIPS: Override assembler target architecture for octeon., David Daney <= [PATCH 08/21] MIPS: Add Cavium OCTEON processor constants and CPU probe., David Daney [PATCH 12/21] MIPS: Add Cavium OCTEON cop2/cvmseg state entries to processor.h., David Daney [PATCH 11/21] MIPS: Modify core io.h macros to account for the Octeon Errata Core-301., David Daney [PATCH 10/21] MIPS: Hook up Cavium OCTEON in arch/mips., David Daney [PATCH 15/21] MIPS: Cavium OCTEON multiplier state preservation., David Daney [PATCH 13/21] MIPS: Add Cavium OCTEON specific registers to ptrace.h and asm-offsets.c, David Daney [PATCH 14/21] MIPS: Add SMP_ICACHE_FLUSH for the Cavium CPU family., David Daney [PATCH 17/21] MIPS: Compute branch returns for Cavium OCTEON specific branch instructions., David Daney [PATCH 18/21] MIPS: Add Cavium OCTEON slot into proper tlb category., David Daney [PATCH 16/21] MIPS: Add Cavium OCTEON irq hazard in asmmacro.h., David Daney

<Prev in Thread]

Current Thread

[Next in Thread>

Previous by Date:	[PATCH 09/21] MIPS: Hook Cavium OCTEON cache init into cache.c, David Daney
Next by Date:	[PATCH 08/21] MIPS: Add Cavium OCTEON processor constants and CPU probe., David Daney
Previous by Thread:	[PATCH 09/21] MIPS: Hook Cavium OCTEON cache init into cache.c, David Daney
Next by Thread:	[PATCH 08/21] MIPS: Add Cavium OCTEON processor constants and CPU probe., David Daney
Indexes:	[Date] [Thread] [Top] [All Lists]

Previous by Date:

[PATCH 09/21] MIPS: Hook Cavium OCTEON cache init into cache.c, David Daney

Next by Date:

[PATCH 08/21] MIPS: Add Cavium OCTEON processor constants and CPU probe., David Daney

Previous by Thread:

[PATCH 09/21] MIPS: Hook Cavium OCTEON cache init into cache.c, David Daney

Next by Thread:

[PATCH 08/21] MIPS: Add Cavium OCTEON processor constants and CPU probe., David Daney

Indexes:

[Date] [Thread] [Top] [All Lists]