correcting merge issues
This commit is contained in:
parent
0d92fe0961
commit
f3afee28e9
|
@ -59,7 +59,7 @@ for (param in params) {
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
)
|
)
|
||||||
(fprintf op "RUNTIME.trampoline(MACHINE, ~a); })"
|
(fprintf op "MACHINE.trampoline(~a); })"
|
||||||
(assemble-label (make-Label (BasicBlock-name (first basic-blocks))))))
|
(assemble-label (make-Label (BasicBlock-name (first basic-blocks))))))
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user