narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>.
pull/1/head
Michael Brown 2009-02-16 03:53:25 +00:00
parent b08e255ef1
commit 7bc4093e1a
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/arch/i386/prefix/libprefix.S
View File

@ -179,14 +179,14 @@ print_pci_busdevfn:
xchgb %al, %ah xchgb %al, %ah
call print_hex_byte call print_hex_byte
/* Print ":" */ /* Print ":" */
movb $':', %al movb $( ':' ), %al
call print_character call print_character
/* Print device */ /* Print device */
movb %ah, %al movb %ah, %al
shrb $3, %al shrb $3, %al
call print_hex_byte call print_hex_byte
/* Print "." */ /* Print "." */
movb $'.', %al movb $( '.' ), %al
call print_character call print_character
/* Print function */ /* Print function */
movb %ah, %al movb %ah, %al
@ -214,15 +214,15 @@ print_kill_line:
pushw %ax pushw %ax
pushw %cx pushw %cx
/* Print CR */ /* Print CR */
movb $'\r', %al movb $( '\r' ), %al
call print_character call print_character
/* Print 79 spaces */ /* Print 79 spaces */
movb $' ', %al movb $( ' ' ), %al
movw $79, %cx movw $79, %cx
1: call print_character 1: call print_character
loop 1b loop 1b
/* Print CR */ /* Print CR */
movb $'\r', %al movb $( '\r' ), %al
call print_character call print_character
/* Restore registers and return */ /* Restore registers and return */
popw %cx popw %cx

8
src/arch/i386/prefix/pxeprefix.S
View File

@ -65,7 +65,7 @@ detect_pxenv:
movw $10f, %si movw $10f, %si
call print_message call print_message
call print_segoff call print_segoff
movb $',', %al movb $( ',' ), %al
call print_character call print_character
jmp 99f jmp 99f
.section ".prefix.data", "aw", @progbits .section ".prefix.data", "aw", @progbits
@ -103,7 +103,7 @@ detect_ppxe:
movw $10f, %si movw $10f, %si
call print_message call print_message
call print_segoff call print_segoff
movb $',', %al movb $( ',' ), %al
call print_character call print_character
jmp 99f jmp 99f
.section ".prefix.data", "aw", @progbits .section ".prefix.data", "aw", @progbits
@ -191,7 +191,7 @@ print_structure_information:
call print_message call print_message
movw undi_fbms_start, %ax movw undi_fbms_start, %ax
call print_word call print_word
movb $'-', %al movb $( '-' ), %al
call print_character call print_character
movw undi_fbms_end, %ax movw undi_fbms_end, %ax
call print_word call print_word
@ -334,7 +334,7 @@ print_segoff:
/* Print "<segment>:offset" */ /* Print "<segment>:offset" */
movw %es, %ax movw %es, %ax
call print_hex_word call print_hex_word
movb $':', %al movb $( ':' ), %al
call print_character call print_character
movw %bx, %ax movw %bx, %ax
call print_hex_word call print_hex_word

12
src/arch/i386/prefix/romprefix.S
View File

@ -175,10 +175,10 @@ init:
/* Fill in product name string, if possible */ /* Fill in product name string, if possible */
movw $prodstr_pci_id, %di movw $prodstr_pci_id, %di
call print_pci_busdevfn call print_pci_busdevfn
movb $' ', prodstr_separator movb $( ' ' ), prodstr_separator
/* Print segment address */ /* Print segment address */
movb $' ', %al movb $( ' ' ), %al
xorw %di, %di xorw %di, %di
call print_character call print_character
movw %cs, %ax movw %cs, %ax
@ -201,7 +201,7 @@ init:
call print_message call print_message
movb %bh, %al movb %bh, %al
call print_hex_nibble call print_hex_nibble
movb $'.', %al movb $( '.' ), %al
call print_character call print_character
movb %bl, %al movb %bl, %al
call print_hex_byte call print_hex_byte
@ -224,7 +224,7 @@ init:
cmpw %bx, %ax cmpw %bx, %ax
jbe 1f jbe 1f
pci3_insane: /* PCI 3.0 with insane %gs value: print error and ignore %gs */ pci3_insane: /* PCI 3.0 with insane %gs value: print error and ignore %gs */
movb $'!', %al movb $( '!' ), %al
call print_character call print_character
movw %gs, %ax movw %gs, %ax
call print_hex_word call print_hex_word
@ -332,7 +332,7 @@ got_pmm: /* PMM allocation succeeded */
movw %dx, %ax movw %dx, %ax
xorw %di, %di xorw %di, %di
call print_hex_word call print_hex_word
movb $'@', %al movb $( '@' ), %al
call print_character call print_character
movw %si, %ax movw %si, %ax
call print_hex_byte call print_hex_byte
@ -366,7 +366,7 @@ no_pmm:
* loads us to a temporary location in low memory. Will be a * loads us to a temporary location in low memory. Will be a
* no-op for lower PCI versions. * no-op for lower PCI versions.
*/ */
movb $' ', %al movb $( ' ' ), %al
xorw %di, %di xorw %di, %di
call print_character call print_character
movw %gs, %ax movw %gs, %ax