Skip to contentSkip to conversation

parisc: Delete redundant register definitions in <asm/assembly.h>

PATCH Applied Ben Hutchings 2 participants 2 messages Jun 14, 2023 – Jun 17, 2023 PA-RISC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 parisc: Delete redundant register definitions in <asm/assembly.h>

From: Ben Hutchings <[email protected]>

We define sp and ipsw in <asm/asmregs.h> using ".reg", and when using current binutils (snapshot 2.40.50.20230611) the definitions in <asm/assembly.h> using "=" conflict with those:

arch/parisc/include/asm/assembly.h: Assembler messages:
arch/parisc/include/asm/assembly.h:93: Error: symbol sp' is already defined arch/parisc/include/asm/assembly.h:95: Error: symbol ipsw' is already defined

Delete the duplicate definitions in <asm/assembly.h>.

Also delete the definition of gp, which isn't used anywhere.

---
 arch/parisc/include/asm/assembly.h | 4 ----
 1 file changed, 4 deletions(-)
arch/parisc/include/asm/assembly.h +0 -4
index 0f0d4a496fef..75677b526b2b 100644
@@ -90,10 +90,6 @@
 #include <asm/asmregs.h>
 #include <asm/psw.h>
 
-	sp	=	30
-	gp	=	27
-	ipsw	=	22
-
 	/*
 	 * We provide two versions of each macro to convert from physical
 	 * to virtual and vice versa. The "_r1" versions take one argument
maintainer Applied
#1 lore raw
Quoted 10 lines · Ben Hutchings

From: Ben Hutchings <[email protected]>

We define sp and ipsw in <asm/asmregs.h> using ".reg", and when using current binutils (snapshot 2.40.50.20230611) the definitions in <asm/assembly.h> using "=" conflict with those:

arch/parisc/include/asm/assembly.h: Assembler messages:
arch/parisc/include/asm/assembly.h:93: Error: symbol sp' is already defined arch/parisc/include/asm/assembly.h:95: Error: symbol ipsw' is already defined

Quoted 5 lines

Delete the duplicate definitions in <asm/assembly.h>.

Also delete the definition of gp, which isn't used anywhere.

applied to parisc git tree.

Thank you, Ben!

Helge

Quoted 19 lines
---
  arch/parisc/include/asm/assembly.h | 4 ----
  1 file changed, 4 deletions(-)
arch/parisc/include/asm/assembly.h +0 -4
index 0f0d4a496fef..75677b526b2b 100644
@@ -90,10 +90,6 @@
  #include <asm/asmregs.h>
  #include <asm/psw.h>
 
-	sp	=	30
-	gp	=	27
-	ipsw	=	22
-
  	/*
  	 * We provide two versions of each macro to convert from physical
  	 * to virtual and vice versa. The "_r1" versions take one argument