Changeset 15829


Ignore:
Timestamp:
May 28, 2013, 9:33:21 PM (8 years ago)
Author:
gb
Message:

In level-0/ARM/arm-utils.lisp
kernel-import: address returned may not fit in a fixnum, especially

if we have no control over where the kernel is loaded.

In lisp-kernel/androidarm/Makefile
don't pass the .so through "fixlib", since Android has dropped support
for "prelinked" shared libraries (presumably because they were useful.)

With these changes, the Android port sorta kinda runs on Android 4.2.2
(though there are a number of problems.)

Location:
trunk/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-0/ARM/arm-utils.lisp

    r15790 r15829  
    455455  (ref-global imm0 kernel-imports)
    456456  (ldr imm0 (:@ imm0 (:asr arg_z (:$ arm::fixnumshift))))
    457   (box-fixnum arg_z imm0)
    458   (bx lr))
     457  ;; May not fit in a fixnum.  We'd really rather not CONS
     458  ;; here, but it won't kill us to do so.
     459  (spjump .SPmakeu32))
    459460
    460461(defarmlapfunction %get-unboxed-ptr ((macptr arg_z))
  • trunk/source/lisp-kernel/androidarm/Makefile

    r15524 r15829  
    103103../../libaarmcl.so:     $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) ./armandroid.x ./fixlib
    104104        $(LD) --shared -Bdynamic -dynamic-linker /system/bin/linker -nostdlib -z nocopyreloc  -o ../../libaarmcl.so  -L $(NDKLIB) pad.o arm-spentry.o  pmcl-kernel.o gc-common.o arm-gc.o bits.o arm-exceptions.o image.o thread_manager.o lisp-debug.o memory.o unix-calls.o arm-asmutils.o imports.o lispdcmd.o plprint.o plsym.o albt.o arm_print.o android_native_app_glue.o --no-as-needed $(OSLIBS) -T ./armandroid.x
    105         ./fixlib $(LIBBASE) >> ../../libaarmcl.so
     105#       ./fixlib $(LIBBASE) >> ../../libaarmcl.so
    106106
    107107../../aarmcl:   aarmcl.o
Note: See TracChangeset for help on using the changeset viewer.