X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=assembler%2Fscanner.l;h=346cbe6c1d81bbe402f279bdf73ab09164898b41;hb=1a0b297432349ca1ad02461f962dc805da1e6949;hp=34559c67c15e56cb6d60035369747b969b59c79f;hpb=b9e19faa25ad9e1b24f08dc77267760df1b98504;p=b43-tools.git

diff --git a/assembler/scanner.l b/assembler/scanner.l
index 34559c6..346cbe6 100644
--- a/assembler/scanner.l
+++ b/assembler/scanner.l
@@ -143,9 +143,6 @@ shm32			{ update_lineinfo(); return IVAL_SHM32; }
 0x[0-9a-fA-F]+		{ update_lineinfo(); return HEXNUM; }
 -?[0-9]+		{ update_lineinfo(); return DECNUM; }
 
-bcm43xx_newworld	{ update_lineinfo(); return ARCH_NEWWORLD; }
-bcm43xx_oldworld	{ update_lineinfo(); return ARCH_OLDWORLD; }
-
 {IDENTIFIER}:		{ update_lineinfo(); return LABEL; }
 {IDENTIFIER}		{ update_lineinfo(); return IDENT; }
 
@@ -196,9 +193,6 @@ static void interpret_cppinfo(const char *str)
 	       min(sizeof(cur_lineinfo.file) - 1,
 		   (int)(found - str)));
 
-	if (strcmp(cur_lineinfo.file, "<stdin>") == 0)
-		strcpy(cur_lineinfo.file, "Input File");
-
 	return;
 error:
 	fprintf(stderr, "Invalid CPP line directive:  %s\n", orig);