Changeset 14516


Ignore:
Timestamp:
Dec 27, 2010, 3:47:38 AM (8 years ago)
Author:
gb
Message:

Build the android kernel using r5 of the ndk, which has a better
idea of what's actually implemented in android 2.2.

sigaltstack() and dladdr() are actually implemented in 2.2.

Location:
trunk/source/lisp-kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/lisp-kernel/albt.c

    r14276 r14516  
    152152    spname = "unknown ?";
    153153#ifndef STATIC
    154 #ifndef ANDROID
    155154    if (dladdr((void *)ptr_from_lispobj(rpc), &info)) {
    156155      spname = (char *)(info.dli_sname);
     
    161160#endif
    162161    }
    163 #endif
    164162#endif
    165163    Dprintf("(#x%08X) #x%08X : (subprimitive %s)", frame, rpc, spname);
  • trunk/source/lisp-kernel/androidarm/Makefile

    r14321 r14516  
    1414#   http://opensource.franz.com/preamble.html
    1515
    16 NDK = /usr/local/android-ndk-r4b
    17 HOST = linux-x86
     16NDK = /usr/local/android-ndk-r5
     17HOST = darwin-x86
    1818ANDROIDVERSION = android-8
    19 NDKLIB = $(NDK)/build/platforms/$(ANDROIDVERSION)/arch-arm/usr/lib
     19SYSROOT = $(NDK)/platforms/$(ANDROIDVERSION)/arch-arm
     20NDKLIB = $(SYSROOT)/usr/lib
     21NDKINC = $(SYSROOT)/usr/include
     22ABI = arm-linux-androideabi
     23NDKBIN = $(NDK)/toolchains/$(ABI)-4.4.3/prebuilt/$(HOST)/bin/$(ABI)-
    2024VPATH = ../
    2125RM = /bin/rm
    22 AS = $(NDK)/build/prebuilt/$(HOST)/arm-eabi-4.4.0/bin/arm-eabi-as
    23 CC = $(NDK)/build/prebuilt/$(HOST)/arm-eabi-4.4.0/bin/arm-eabi-gcc
    24 LD = $(NDK)/build/prebuilt/$(HOST)/arm-eabi-4.4.0/bin/arm-eabi-ld
     26AS = $(NDKBIN)as
     27CC = $(NDKBIN)gcc --sysroot $(SYSROOT)
     28LD = $(NDKBIN)ld
    2529M4 = m4
    26 ASFLAGS = -mfpu=vfpv2
     30ASFLAGS = -mfpu=vfp
    2731M4FLAGS = -DLINUX -DARM -DANDROID
    2832CDEFINES = -DLINUX -DARM -DANDROID -D_REENTRANT -D_GNU_SOURCE -DUSE_FUTEX
     
    5054        $(M4) $(M4FLAGS) -I../ $< | $(AS) $(ASFLAGS) -o $@
    5155.c.o:
    52         $(CC) -include ../$(PLATFORM_H) -I. -I$(NDK)/build/platforms/$(ANDROIDVERSION)/arch-arm/usr/include -c $<  $(CDEFINES) $(CDEBUG) $(COPT) -fpic  $(WFORMAT)  -o $@
     56        $(CC) -include ../$(PLATFORM_H) -I. -I$(NDKINC) -c $<  $(CDEFINES) $(CDEBUG) $(COPT) -fpic  $(WFORMAT)  -o $@
    5357
    5458# -nostdinc -isystem ${NDK}/usr/gcc-include -isystem $(NDK)/usr/include
     
    7377KSPOBJ = $(SPOBJ)
    7478all:    ../../aarmcl
    75 
    7679
    7780# No:
  • trunk/source/lisp-kernel/unix-calls.c

    r14295 r14516  
    146146}
    147147
    148 #ifdef ANDROID
     148#ifdef ANDROID_NEEDS_SIGALTSTACK
    149149/* I for one welcome our new Android overlords. */
    150150#ifndef __NR_sigaltstack
Note: See TracChangeset for help on using the changeset viewer.