diff options
author | Helge Deller <deller@gmx.de> | 2007-01-28 09:09:20 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@athena.road.mcmartin.ca> | 2007-02-17 01:17:13 -0500 |
commit | 513e7ecd695a4c0f95b9aa86c03ec9b7d2d09e03 (patch) | |
tree | 244b66b448f3de6bf772828c13955b786a960924 /include/asm-parisc/assembly.h | |
parent | a8f44e3889b686813926b288bd4e51a0cf17d2c7 (diff) |
[PARISC] convert to use CONFIG_64BIT instead of __LP64__
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc/assembly.h')
-rw-r--r-- | include/asm-parisc/assembly.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-parisc/assembly.h b/include/asm-parisc/assembly.h index 7e26fcbe56d6..5587f0023881 100644 --- a/include/asm-parisc/assembly.h +++ b/include/asm-parisc/assembly.h | |||
@@ -73,7 +73,7 @@ | |||
73 | 73 | ||
74 | #ifdef __ASSEMBLY__ | 74 | #ifdef __ASSEMBLY__ |
75 | 75 | ||
76 | #ifdef __LP64__ | 76 | #ifdef CONFIG_64BIT |
77 | /* the 64-bit pa gnu assembler unfortunately defaults to .level 1.1 or 2.0 so | 77 | /* the 64-bit pa gnu assembler unfortunately defaults to .level 1.1 or 2.0 so |
78 | * work around that for now... */ | 78 | * work around that for now... */ |
79 | .level 2.0w | 79 | .level 2.0w |
@@ -164,7 +164,7 @@ | |||
164 | .endm | 164 | .endm |
165 | 165 | ||
166 | .macro loadgp | 166 | .macro loadgp |
167 | #ifdef __LP64__ | 167 | #ifdef CONFIG_64BIT |
168 | ldil L%__gp, %r27 | 168 | ldil L%__gp, %r27 |
169 | ldo R%__gp(%r27), %r27 | 169 | ldo R%__gp(%r27), %r27 |
170 | #else | 170 | #else |
@@ -342,7 +342,7 @@ | |||
342 | fldd,mb -8(%r30), %fr12 | 342 | fldd,mb -8(%r30), %fr12 |
343 | .endm | 343 | .endm |
344 | 344 | ||
345 | #ifdef __LP64__ | 345 | #ifdef CONFIG_64BIT |
346 | .macro callee_save | 346 | .macro callee_save |
347 | std,ma %r3, CALLEE_REG_FRAME_SIZE(%r30) | 347 | std,ma %r3, CALLEE_REG_FRAME_SIZE(%r30) |
348 | mfctl %cr27, %r3 | 348 | mfctl %cr27, %r3 |
@@ -385,7 +385,7 @@ | |||
385 | ldd,mb -CALLEE_REG_FRAME_SIZE(%r30), %r3 | 385 | ldd,mb -CALLEE_REG_FRAME_SIZE(%r30), %r3 |
386 | .endm | 386 | .endm |
387 | 387 | ||
388 | #else /* ! __LP64__ */ | 388 | #else /* ! CONFIG_64BIT */ |
389 | 389 | ||
390 | .macro callee_save | 390 | .macro callee_save |
391 | stw,ma %r3, CALLEE_REG_FRAME_SIZE(%r30) | 391 | stw,ma %r3, CALLEE_REG_FRAME_SIZE(%r30) |
@@ -428,7 +428,7 @@ | |||
428 | mtctl %r3, %cr27 | 428 | mtctl %r3, %cr27 |
429 | ldw,mb -CALLEE_REG_FRAME_SIZE(%r30), %r3 | 429 | ldw,mb -CALLEE_REG_FRAME_SIZE(%r30), %r3 |
430 | .endm | 430 | .endm |
431 | #endif /* ! __LP64__ */ | 431 | #endif /* ! CONFIG_64BIT */ |
432 | 432 | ||
433 | .macro save_specials regs | 433 | .macro save_specials regs |
434 | 434 | ||
@@ -449,7 +449,7 @@ | |||
449 | mtctl %r0, %cr18 | 449 | mtctl %r0, %cr18 |
450 | SAVE_CR (%cr18, PT_IAOQ1(\regs)) | 450 | SAVE_CR (%cr18, PT_IAOQ1(\regs)) |
451 | 451 | ||
452 | #ifdef __LP64__ | 452 | #ifdef CONFIG_64BIT |
453 | /* cr11 (sar) is a funny one. 5 bits on PA1.1 and 6 bit on PA2.0 | 453 | /* cr11 (sar) is a funny one. 5 bits on PA1.1 and 6 bit on PA2.0 |
454 | * For PA2.0 mtsar or mtctl always write 6 bits, but mfctl only | 454 | * For PA2.0 mtsar or mtctl always write 6 bits, but mfctl only |
455 | * reads 5 bits. Use mfctl,w to read all six bits. Otherwise | 455 | * reads 5 bits. Use mfctl,w to read all six bits. Otherwise |