diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2010-05-27 11:52:24 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2010-05-27 11:52:24 +0000 |
| commit | bc256536b3299a36218efa412735c53d364d1f13 (patch) | |
| tree | b9d668f6c811fac3d144d260fc0d0a2ef78bed71 /sys/arch | |
| parent | e0da571438a4617b05bc83449a1a4b6266a54808 (diff) | |
Generate exported names using token pasting rather than a macro. Otherwise
without -traditional-cpp the trap name gets preprocessed to the defined
value rather than remaining as text.
ok kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/hppa/hppa/locore.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S index f8d87cba87b..0e1bcd8bbeb 100644 --- a/sys/arch/hppa/hppa/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.170 2010/05/19 13:10:24 jsing Exp $ */ +/* $OpenBSD: locore.S,v 1.171 2010/05/27 11:52:23 jsing Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -856,7 +856,6 @@ $syscall_end * interrupt vector table */ #define TLABEL(name) $trap$name -#define TELABEL(num) __CONCAT(trap_ep_,num) #define TRAP(name,num) \ mtctl r1, tr7 ! \ .call ! \ @@ -883,8 +882,8 @@ $syscall_end .label TLABEL(name)$num ! \ pre ! \ mtctl r1, tr7 ! \ - .export TELABEL(num), entry ! \ - .label TELABEL(num) ! \ + .export trap_ep_##num, entry ! \ + .label trap_ep_##num ! \ .call ! \ b __CONCAT($name,_l) ! \ ldi num, r1 ! \ |