[K42-discussion] [PATCH] Fix branches which need to use new EXTC macro
Dilma DaSilva
dilma at watson.ibm.com
Wed Jan 17 14:23:30 EST 2007
Hi Donour,
I can't apply this patch. (Previous patches you sent were generated
with diff -ru, this one with diff -git, so maybe I just don't know how
to apply it).
When I run patch with --verbose I get:
Hmm... Looks like a unified diff to me...
The text leading up to this was:
<text deleted>
Patching file lib/libc/cobj/sys/arch/powerpc/defaultFuncs.S using Plan A...
Hunk #1 FAILED at 40.
1 out of 1 hunk FAILED -- saving rejects to file
lib/libc/cobj/sys/arch/powerpc/defaultFuncs.S.rej
And this Hunk failure with rej generation goes on for all patches in
the file.
dilma
Donour Sizemore writes:
> Signed-off-by: donour at cs.unm.edu <donour at cs.unm.edu>
> ---
> lib/libc/cobj/sys/arch/powerpc/defaultFuncs.S | 2 +
> lib/libc/cobj/sys/arch/powerpc/mediateMethods.S | 4 +-
> .../scheduler/arch/powerpc/DispatcherDefaultAsm.S | 40
> ++++++++++++-----------
> lib/libc/sync/arch/powerpc/BLockAsm.S | 8 ++--
> lib/libc/usr/arch/powerpc/entry.S | 2 +
> 5 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/lib/libc/cobj/sys/arch/powerpc/defaultFuncs.S
> b/lib/libc/cobj/sys/arch/powerpc/defaultFuncs.S
> index eb579ba..0a65427 100644
> --- a/lib/libc/cobj/sys/arch/powerpc/defaultFuncs.S
> +++ b/lib/libc/cobj/sys/arch/powerpc/defaultFuncs.S
> @@ -40,7 +40,7 @@ CODE_ENTRY(defaultFuncCommon)
> la r3,STK_PARAM0(r1) // first param: &this
> mr r4,r12 // second param: method number
> stdu r1,-(STK_SIZE+(13*8))(r1) // push frame
> - bl C_TEXT(GenericDefaultFunc) // call generic function
> + bl CXX_EXTC_TEXT(GenericDefaultFunc) // call generic function
> la r1,(STK_SIZE+(13*8))(r1) // pop frame
> ld r0,STK_LR(r1) // restore link register
> mtlr r0
[ rest deleted]
More information about the K42-discussion
mailing list