Skip to contentSkip to conversation

s390 build fix.

PATCH Dave Jones 2 participants 3 messages Aug 21, 2005 s390

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

{standard input}: Assembler messages:
{standard input}:397: Error: symbol .Litfits' is already defined {standard input}:585: Error: symbol .Litfits' is already defined

Newer gcc's inline this it seems, which blows up.

arch/s390/kernel/cpcmd.c renamed from arch/s390/kernel/cpcmd.c~ +4 -4
@@ -46,9 +46,9 @@ int  __cpcmd(const char *cmd, char *resp
 				"lra	3,0(%4)\n"
 				"lr	5,%5\n"
 				"diag	2,4,0x8\n"
-				"brc	8, .Litfits\n"
+				"brc	8, .Litfits%=\n"
 				"ar	5, %5\n"
-				".Litfits: \n"
+				".Litfits%=: \n"
 				"lr	%0,4\n"
 				"lr	%1,5\n"
 				: "=d" (return_code), "=d" (return_len)
@@ -64,9 +64,9 @@ int  __cpcmd(const char *cmd, char *resp
 				"sam31\n"
 				"diag	2,4,0x8\n"
 				"sam64\n"
-				"brc	8, .Litfits\n"
+				"brc	8, .Litfits%=\n"
 				"agr	5, %5\n"
-				".Litfits: \n"
+				".Litfits%=: \n"
 				"lgr	%0,4\n"
 				"lgr	%1,5\n"
 				: "=d" (return_code), "=d" (return_len)
#1 lore raw
Quoted 5 lines · Dave Jones

{standard input}: Assembler messages:
{standard input}:397: Error: symbol .Litfits' is already defined {standard input}:585: Error: symbol .Litfits' is already defined

Newer gcc's inline this it seems, which blows up.

Eeek... Much easier (and already sent to Linus):

arch/s390/kernel/cpcmd.c +4 -4
diff -urN RC13-rc6-git2-arm-float/arch/s390/kernel/cpcmd.c RC13-rc6-git2-s390/arch/s390/kernel/cpcmd.c
@@ -46,9 +46,9 @@
 				"lra	3,0(%4)\n"
 				"lr	5,%5\n"
 				"diag	2,4,0x8\n"
-				"brc	8, .Litfits\n"
+				"brc	8, 1f\n"
 				"ar	5, %5\n"
-				".Litfits: \n"
+				"1: \n"
 				"lr	%0,4\n"
 				"lr	%1,5\n"
 				: "=d" (return_code), "=d" (return_len)
@@ -64,9 +64,9 @@
 				"sam31\n"
 				"diag	2,4,0x8\n"
 				"sam64\n"
-				"brc	8, .Litfits\n"
+				"brc	8, 1f\n"
 				"agr	5, %5\n"
-				".Litfits: \n"
+				"1: \n"
 				"lgr	%0,4\n"
 				"lgr	%1,5\n"
 				: "=d" (return_code), "=d" (return_len)
author
#2 lore raw
Quoted 8 lines · Al Viro
Quoted 5 lines · Dave Jones

{standard input}: Assembler messages:
{standard input}:397: Error: symbol .Litfits' is already defined {standard input}:585: Error: symbol .Litfits' is already defined

Newer gcc's inline this it seems, which blows up.

Eeek... Much easier (and already sent to Linus):

Sure, that works for me too.

Dave