Quellcode durchsuchen

[build] Cope with oddities in the Fedora 10 assembler

The version of the GNU assembler shipped with Fedora 10
(2.18.50.0.9-8.fc10) complains about character literals in some of our
assembly code.  Changing $'x' to $( 'x' ) seems to fix the problem.
Yes, the whitespace is required; using just $('x') does not work.

Reported by Kevin O'Connor <kevin@koconnor.net>.
tags/v0.9.7
Michael Brown vor 15 Jahren
Ursprung
Commit
7bc4093e1a

+ 5
- 5
src/arch/i386/prefix/libprefix.S Datei anzeigen

@@ -179,14 +179,14 @@ print_pci_busdevfn:
179 179
 	xchgb	%al, %ah
180 180
 	call	print_hex_byte
181 181
 	/* Print ":" */
182
-	movb	$':', %al
182
+	movb	$( ':' ), %al
183 183
 	call	print_character
184 184
 	/* Print device */
185 185
 	movb	%ah, %al
186 186
 	shrb	$3, %al
187 187
 	call	print_hex_byte
188 188
 	/* Print "." */
189
-	movb	$'.', %al
189
+	movb	$( '.' ), %al
190 190
 	call	print_character
191 191
 	/* Print function */
192 192
 	movb	%ah, %al
@@ -214,15 +214,15 @@ print_kill_line:
214 214
 	pushw	%ax
215 215
 	pushw	%cx
216 216
 	/* Print CR */
217
-	movb	$'\r', %al
217
+	movb	$( '\r' ), %al
218 218
 	call	print_character
219 219
 	/* Print 79 spaces */
220
-	movb	$' ', %al
220
+	movb	$( ' ' ), %al
221 221
 	movw	$79, %cx
222 222
 1:	call	print_character
223 223
 	loop	1b
224 224
 	/* Print CR */
225
-	movb	$'\r', %al
225
+	movb	$( '\r' ), %al
226 226
 	call	print_character
227 227
 	/* Restore registers and return */
228 228
 	popw	%cx

+ 4
- 4
src/arch/i386/prefix/pxeprefix.S Datei anzeigen

@@ -65,7 +65,7 @@ detect_pxenv:
65 65
 	movw	$10f, %si
66 66
 	call	print_message
67 67
 	call	print_segoff
68
-	movb	$',', %al
68
+	movb	$( ',' ), %al
69 69
 	call	print_character
70 70
 	jmp	99f
71 71
 	.section ".prefix.data", "aw", @progbits
@@ -103,7 +103,7 @@ detect_ppxe:
103 103
 	movw	$10f, %si
104 104
 	call	print_message
105 105
 	call	print_segoff
106
-	movb	$',', %al
106
+	movb	$( ',' ), %al
107 107
 	call	print_character
108 108
 	jmp	99f
109 109
 	.section ".prefix.data", "aw", @progbits
@@ -191,7 +191,7 @@ print_structure_information:
191 191
 	call	print_message
192 192
 	movw	undi_fbms_start, %ax
193 193
 	call	print_word
194
-	movb	$'-', %al
194
+	movb	$( '-' ), %al
195 195
 	call	print_character
196 196
 	movw	undi_fbms_end, %ax
197 197
 	call	print_word
@@ -334,7 +334,7 @@ print_segoff:
334 334
 	/* Print "<segment>:offset" */
335 335
 	movw	%es, %ax
336 336
 	call	print_hex_word
337
-	movb	$':', %al
337
+	movb	$( ':' ), %al
338 338
 	call	print_character
339 339
 	movw	%bx, %ax
340 340
 	call	print_hex_word

+ 6
- 6
src/arch/i386/prefix/romprefix.S Datei anzeigen

@@ -175,10 +175,10 @@ init:
175 175
 	/* Fill in product name string, if possible */
176 176
 	movw	$prodstr_pci_id, %di
177 177
 	call	print_pci_busdevfn
178
-	movb	$' ', prodstr_separator
178
+	movb	$( ' ' ), prodstr_separator
179 179
 
180 180
 	/* Print segment address */
181
-	movb	$' ', %al
181
+	movb	$( ' ' ), %al
182 182
 	xorw	%di, %di
183 183
 	call	print_character
184 184
 	movw	%cs, %ax
@@ -201,7 +201,7 @@ init:
201 201
 	call	print_message
202 202
 	movb	%bh, %al
203 203
 	call	print_hex_nibble
204
-	movb	$'.', %al
204
+	movb	$( '.' ), %al
205 205
 	call	print_character
206 206
 	movb	%bl, %al
207 207
 	call	print_hex_byte
@@ -224,7 +224,7 @@ init:
224 224
 	cmpw	%bx, %ax
225 225
 	jbe	1f
226 226
 pci3_insane: /* PCI 3.0 with insane %gs value: print error and ignore %gs */
227
-	movb	$'!', %al
227
+	movb	$( '!' ), %al
228 228
 	call	print_character
229 229
 	movw	%gs, %ax
230 230
 	call	print_hex_word
@@ -332,7 +332,7 @@ got_pmm: /* PMM allocation succeeded */
332 332
 	movw	%dx, %ax
333 333
 	xorw	%di, %di
334 334
 	call	print_hex_word
335
-	movb	$'@', %al
335
+	movb	$( '@' ), %al
336 336
 	call	print_character
337 337
 	movw	%si, %ax
338 338
 	call	print_hex_byte
@@ -366,7 +366,7 @@ no_pmm:
366 366
 	 * loads us to a temporary location in low memory.  Will be a
367 367
 	 * no-op for lower PCI versions.
368 368
 	 */
369
-	movb	$' ', %al
369
+	movb	$( ' ' ), %al
370 370
 	xorw	%di, %di
371 371
 	call	print_character
372 372
 	movw	%gs, %ax

Laden…
Abbrechen
Speichern