Index: /trunk/android-headers/libc/C/populate.sh
===================================================================
--- /trunk/android-headers/libc/C/populate.sh	(revision 15205)
+++ /trunk/android-headers/libc/C/populate.sh	(revision 15206)
@@ -1,5 +1,6 @@
 #!/bin/sh
+htoffi=xarm-h-to-ffi.sh
 NDK=/usr/local/android-ndk-r7
-CCL=/usr/local/src/ccl
+CCL=/usr/local/src/ccl-dev
 ANDROIDVERSION=android-9
 HEADERS=${NDK}/platforms/${ANDROIDVERSION}/arch-arm/usr/include
@@ -9,54 +10,54 @@
 
 #h-to-ffi.sh ${HEADERS}/alloca.h
-h-to-ffi.sh ${HEADERS}/android/api-level.h
+${htoffi} ${HEADERS}/android/api-level.h
 #h-to-ffi.sh ${HEADERS}/android/asset_manager.h
-h-to-ffi.sh ${HEADERS}/android/asset_manager_jni.h
-h-to-ffi.sh ${HEADERS}/android/bitmap.h
-h-to-ffi.sh ${HEADERS}/android/configuration.h
-h-to-ffi.sh ${HEADERS}/android/input.h
-h-to-ffi.sh ${HEADERS}/android/keycodes.h
-h-to-ffi.sh ${HEADERS}/android/log.h
-h-to-ffi.sh ${HEADERS}/android/looper.h
-h-to-ffi.sh ${HEADERS}/android/native_activity.h
-h-to-ffi.sh ${HEADERS}/android/native_window.h
-h-to-ffi.sh ${HEADERS}/android/native_window_jni.h
-h-to-ffi.sh ${HEADERS}/android/obb.h
-h-to-ffi.sh ${HEADERS}/android/rect.h
-h-to-ffi.sh ${HEADERS}/android/sensor.h
-h-to-ffi.sh ${HEADERS}/android/storage_manager.h
-h-to-ffi.sh ${HEADERS}/android/window.h
-h-to-ffi.sh ${HEADERS}/arpa/inet.h
-h-to-ffi.sh ${HEADERS}/arpa/nameser.h
-h-to-ffi.sh ${HEADERS}/arpa/telnet.h
-h-to-ffi.sh ${HEADERS}/assert.h
-h-to-ffi.sh ${HEADERS}/byteswap.h
-h-to-ffi.sh ${HEADERS}/ctype.h
-h-to-ffi.sh ${HEADERS}/dirent.h
-h-to-ffi.sh ${HEADERS}/dlfcn.h
-h-to-ffi.sh -include ${HEADERS}/EGL/egl.h ${HEADERS}/EGL/eglext.h
+${htoffi} ${HEADERS}/android/asset_manager_jni.h
+${htoffi} ${HEADERS}/android/bitmap.h
+${htoffi} ${HEADERS}/android/configuration.h
+${htoffi} ${HEADERS}/android/input.h
+${htoffi} ${HEADERS}/android/keycodes.h
+${htoffi} ${HEADERS}/android/log.h
+${htoffi} ${HEADERS}/android/looper.h
+${htoffi} ${HEADERS}/android/native_activity.h
+${htoffi} ${HEADERS}/android/native_window.h
+${htoffi} ${HEADERS}/android/native_window_jni.h
+${htoffi} ${HEADERS}/android/obb.h
+${htoffi} ${HEADERS}/android/rect.h
+${htoffi} ${HEADERS}/android/sensor.h
+${htoffi} ${HEADERS}/android/storage_manager.h
+${htoffi} ${HEADERS}/android/window.h
+${htoffi} ${HEADERS}/arpa/inet.h
+${htoffi} ${HEADERS}/arpa/nameser.h
+${htoffi} ${HEADERS}/arpa/telnet.h
+${htoffi} ${HEADERS}/assert.h
+${htoffi} ${HEADERS}/byteswap.h
+${htoffi} ${HEADERS}/ctype.h
+${htoffi} ${HEADERS}/dirent.h
+${htoffi} ${HEADERS}/dlfcn.h
+${htoffi} -include ${HEADERS}/EGL/egl.h ${HEADERS}/EGL/eglext.h
 #h-to-ffi.sh ${HEADERS}/EGL/egl.h
 #h-to-ffi.sh ${HEADERS}/EGL/eglplatform.h
-h-to-ffi.sh ${HEADERS}/elf.h
-h-to-ffi.sh ${HEADERS}/endian.h
-h-to-ffi.sh ${HEADERS}/err.h
-h-to-ffi.sh ${HEADERS}/errno.h
-h-to-ffi.sh ${HEADERS}/fcntl.h
-h-to-ffi.sh ${HEADERS}/features.h
-h-to-ffi.sh ${HEADERS}/fenv.h
-h-to-ffi.sh ${HEADERS}/fnmatch.h
-h-to-ffi.sh ${HEADERS}/fts.h
-h-to-ffi.sh ${HEADERS}/getopt.h
-h-to-ffi.sh -include ${HEADERS}/GLES2/gl2.h   ${HEADERS}/GLES2/gl2ext.h
+${htoffi} ${HEADERS}/elf.h
+${htoffi} ${HEADERS}/endian.h
+${htoffi} ${HEADERS}/err.h
+${htoffi} ${HEADERS}/errno.h
+${htoffi} ${HEADERS}/fcntl.h
+${htoffi} ${HEADERS}/features.h
+${htoffi} ${HEADERS}/fenv.h
+${htoffi} ${HEADERS}/fnmatch.h
+${htoffi} ${HEADERS}/fts.h
+${htoffi} ${HEADERS}/getopt.h
+${htoffi} -include ${HEADERS}/GLES2/gl2.h   ${HEADERS}/GLES2/gl2ext.h
 #h-to-ffi.sh ${HEADERS}/GLES2/gl2.h
 #h-to-ffi.sh ${HEADERS}/GLES2/gl2platform.h
-h-to-ffi.sh -include ${HEADERS}/GLES/gl.h ${HEADERS}/GLES/glext.h
+${htoffi} -include ${HEADERS}/GLES/gl.h ${HEADERS}/GLES/glext.h
 #h-to-ffi.sh ${HEADERS}/GLES/gl.h
 #h-to-ffi.sh ${HEADERS}/GLES/glplatform.h
-h-to-ffi.sh ${HEADERS}/grp.h
-h-to-ffi.sh ${HEADERS}/inttypes.h
-h-to-ffi.sh ${HEADERS}/KHR/khrplatform.h
-h-to-ffi.sh ${HEADERS}/lastlog.h
-h-to-ffi.sh ${HEADERS}/libgen.h
-h-to-ffi.sh ${HEADERS}/limits.h
+${htoffi} ${HEADERS}/grp.h
+${htoffi} ${HEADERS}/inttypes.h
+${htoffi} ${HEADERS}/KHR/khrplatform.h
+${htoffi} ${HEADERS}/lastlog.h
+${htoffi} ${HEADERS}/libgen.h
+${htoffi} ${HEADERS}/limits.h
 #h-to-ffi.sh ${HEADERS}/linux/aio_abi.h
 #h-to-ffi.sh ${HEADERS}/linux/akm8976.h
@@ -491,133 +492,135 @@
 #h-to-ffi.sh ${HEADERS}/linux/zlib.h
 #h-to-ffi.sh ${HEADERS}/linux/zorro_ids.h
-h-to-ffi.sh ${HEADERS}/locale.h
-h-to-ffi.sh ${HEADERS}/machine/asm.h
-h-to-ffi.sh ${HEADERS}/machine/cdefs.h
-h-to-ffi.sh ${HEADERS}/machine/cpu-features.h
-h-to-ffi.sh ${HEADERS}/machine/exec.h
-h-to-ffi.sh ${HEADERS}/machine/ieee.h
-h-to-ffi.sh ${HEADERS}/machine/internal_types.h
-h-to-ffi.sh ${HEADERS}/machine/kernel.h
-h-to-ffi.sh ${HEADERS}/machine/limits.h
-h-to-ffi.sh ${HEADERS}/machine/setjmp.h
-h-to-ffi.sh ${HEADERS}/machine/_types.h
-h-to-ffi.sh ${HEADERS}/malloc.h
-h-to-ffi.sh ${HEADERS}/math.h
-h-to-ffi.sh ${HEADERS}/memory.h
-h-to-ffi.sh ${HEADERS}/mntent.h
-h-to-ffi.sh ${HEADERS}/mtd/mtd-abi.h
-h-to-ffi.sh ${HEADERS}/mtd/mtd-user.h
-h-to-ffi.sh ${HEADERS}/netdb.h
-h-to-ffi.sh ${HEADERS}/net/ethertypes.h
-h-to-ffi.sh ${HEADERS}/net/if_arp.h
-h-to-ffi.sh ${HEADERS}/net/if_dl.h
-h-to-ffi.sh ${HEADERS}/net/if_ether.h
-h-to-ffi.sh ${HEADERS}/net/if.h
-h-to-ffi.sh ${HEADERS}/net/if_ieee1394.h
-h-to-ffi.sh ${HEADERS}/net/if_packet.h
-h-to-ffi.sh ${HEADERS}/net/if_types.h
-h-to-ffi.sh ${HEADERS}/netinet/ether.h
-h-to-ffi.sh ${HEADERS}/netinet/if_ether.h
-h-to-ffi.sh ${HEADERS}/netinet/in6.h
-h-to-ffi.sh ${HEADERS}/netinet/in.h
-h-to-ffi.sh ${HEADERS}/netinet/in_systm.h
-h-to-ffi.sh ${HEADERS}/netinet/ip.h
-h-to-ffi.sh ${HEADERS}/netinet/ip_icmp.h
-h-to-ffi.sh ${HEADERS}/netinet/tcp.h
-h-to-ffi.sh ${HEADERS}/netinet/udp.h
-h-to-ffi.sh ${HEADERS}/netpacket/packet.h
-h-to-ffi.sh ${HEADERS}/net/route.h
-h-to-ffi.sh ${HEADERS}/nsswitch.h
-h-to-ffi.sh ${HEADERS}/pathconf.h
-h-to-ffi.sh ${HEADERS}/paths.h
-h-to-ffi.sh ${HEADERS}/poll.h
-h-to-ffi.sh ${HEADERS}/pthread.h
-h-to-ffi.sh ${HEADERS}/pwd.h
-h-to-ffi.sh ${HEADERS}/regex.h
-h-to-ffi.sh ${HEADERS}/resolv.h
-h-to-ffi.sh ${HEADERS}/sched.h
-h-to-ffi.sh ${HEADERS}/semaphore.h
-h-to-ffi.sh ${HEADERS}/setjmp.h
-h-to-ffi.sh ${HEADERS}/sgtty.h
-h-to-ffi.sh ${HEADERS}/sha1.h
-h-to-ffi.sh ${HEADERS}/signal.h
-h-to-ffi.sh ${HEADERS}/SLES/OpenSLES_AndroidConfiguration.h
-h-to-ffi.sh -include ${HEADERS}/SLES/OpenSLES.h -include ${HEADERS}/SLES/OpenSLES_Platform.h ${HEADERS}/SLES/OpenSLES_Android.h
+${htoffi} ${HEADERS}/locale.h
+${htoffi} ${HEADERS}/machine/asm.h
+${htoffi} ${HEADERS}/machine/cdefs.h
+${htoffi} ${HEADERS}/machine/cpu-features.h
+${htoffi} ${HEADERS}/machine/exec.h
+${htoffi} ${HEADERS}/machine/ieee.h
+${htoffi} ${HEADERS}/machine/internal_types.h
+${htoffi} ${HEADERS}/machine/kernel.h
+${htoffi} ${HEADERS}/machine/limits.h
+${htoffi} ${HEADERS}/machine/setjmp.h
+${htoffi} ${HEADERS}/machine/_types.h
+${htoffi} ${HEADERS}/malloc.h
+${htoffi} ${HEADERS}/math.h
+${htoffi} ${HEADERS}/memory.h
+${htoffi} ${HEADERS}/mntent.h
+${htoffi} ${HEADERS}/mtd/mtd-abi.h
+${htoffi} ${HEADERS}/mtd/mtd-user.h
+${htoffi} ${HEADERS}/netdb.h
+${htoffi} ${HEADERS}/net/ethertypes.h
+${htoffi} ${HEADERS}/net/if_arp.h
+${htoffi} ${HEADERS}/net/if_dl.h
+${htoffi} ${HEADERS}/net/if_ether.h
+${htoffi} ${HEADERS}/net/if.h
+${htoffi} ${HEADERS}/net/if_ieee1394.h
+${htoffi} ${HEADERS}/net/if_packet.h
+${htoffi} ${HEADERS}/net/if_types.h
+${htoffi} ${HEADERS}/netinet/ether.h
+${htoffi} ${HEADERS}/netinet/if_ether.h
+${htoffi} ${HEADERS}/netinet/in6.h
+${htoffi} ${HEADERS}/netinet/in.h
+${htoffi} ${HEADERS}/netinet/in_systm.h
+${htoffi} ${HEADERS}/netinet/ip.h
+${htoffi} ${HEADERS}/netinet/ip_icmp.h
+${htoffi} ${HEADERS}/netinet/tcp.h
+${htoffi} ${HEADERS}/netinet/udp.h
+${htoffi} ${HEADERS}/netpacket/packet.h
+${htoffi} ${HEADERS}/net/route.h
+${htoffi} ${HEADERS}/nsswitch.h
+${htoffi} ${HEADERS}/pathconf.h
+${htoffi} ${HEADERS}/paths.h
+${htoffi} ${HEADERS}/poll.h
+${htoffi} ${HEADERS}/pthread.h
+${htoffi} ${HEADERS}/pwd.h
+${htoffi} ${HEADERS}/regex.h
+${htoffi} ${HEADERS}/resolv.h
+${htoffi} ${HEADERS}/sched.h
+${htoffi} ${HEADERS}/semaphore.h
+${htoffi} ${HEADERS}/setjmp.h
+${htoffi} ${HEADERS}/sgtty.h
+${htoffi} ${HEADERS}/sha1.h
+${htoffi} ${HEADERS}/signal.h
+${htoffi} ${HEADERS}/SLES/OpenSLES_AndroidConfiguration.h
+${htoffi} -include ${HEADERS}/SLES/OpenSLES.h -include ${HEADERS}/SLES/OpenSLES_Platform.h ${HEADERS}/SLES/OpenSLES_Android.h
 #h-to-ffi.sh ${HEADERS}/SLES/OpenSLES.h
 #h-to-ffi.sh ${HEADERS}/SLES/OpenSLES_Platform.h
-h-to-ffi.sh ${HEADERS}/stdint.h
-h-to-ffi.sh ${HEADERS}/stdio.h
-h-to-ffi.sh ${HEADERS}/stdlib.h
-h-to-ffi.sh ${HEADERS}/string.h
-h-to-ffi.sh ${HEADERS}/strings.h
-h-to-ffi.sh ${HEADERS}/sys/atomics.h
-h-to-ffi.sh ${HEADERS}/sys/cdefs_elf.h
-h-to-ffi.sh ${HEADERS}/sys/cdefs.h
-h-to-ffi.sh ${HEADERS}/sys/dirent.h
-h-to-ffi.sh ${HEADERS}/sys/endian.h
-h-to-ffi.sh ${HEADERS}/sys/epoll.h
+${htoffi} ${HEADERS}/stdint.h
+${htoffi} ${HEADERS}/stdio.h
+${htoffi} ${HEADERS}/stdlib.h
+${htoffi} ${HEADERS}/string.h
+${htoffi} ${HEADERS}/strings.h
+${htoffi} ${HEADERS}/sys/atomics.h
+${htoffi} ${HEADERS}/sys/cdefs_elf.h
+${htoffi} ${HEADERS}/sys/cdefs.h
+${htoffi} ${HEADERS}/sys/dirent.h
+${htoffi} ${HEADERS}/sys/endian.h
+${htoffi} ${HEADERS}/sys/epoll.h
 #h-to-ffi.sh ${HEADERS}/sys/_errdefs.h
-h-to-ffi.sh ${HEADERS}/sys/errno.h
-h-to-ffi.sh ${HEADERS}/sys/exec_elf.h
-h-to-ffi.sh ${HEADERS}/sys/file.h
-h-to-ffi.sh ${HEADERS}/sys/fsuid.h
-h-to-ffi.sh ${HEADERS}/sys/inotify.h
-h-to-ffi.sh ${HEADERS}/sys/ioctl_compat.h
-h-to-ffi.sh ${HEADERS}/sys/ioctl.h
-h-to-ffi.sh ${HEADERS}/sys/ipc.h
-h-to-ffi.sh ${HEADERS}/sys/klog.h
-h-to-ffi.sh ${HEADERS}/sys/limits.h
-h-to-ffi.sh ${HEADERS}/sys/linux-syscalls.h
+${htoffi} ${HEADERS}/sys/errno.h
+${htoffi} ${HEADERS}/sys/exec_elf.h
+${htoffi} ${HEADERS}/sys/file.h
+${htoffi} ${HEADERS}/sys/fsuid.h
+${htoffi} ${HEADERS}/sys/inotify.h
+${htoffi} ${HEADERS}/sys/ioctl_compat.h
+${htoffi} ${HEADERS}/sys/ioctl.h
+${htoffi} ${HEADERS}/sys/ipc.h
+${htoffi} ${HEADERS}/sys/klog.h
+${htoffi} ${HEADERS}/sys/limits.h
+${htoffi} ${HEADERS}/sys/linux-syscalls.h
 #h-to-ffi.sh ${HEADERS}/sys/linux-unistd.h
-h-to-ffi.sh ${HEADERS}/syslog.h
-h-to-ffi.sh ${HEADERS}/sys/mman.h
-h-to-ffi.sh ${HEADERS}/sys/mount.h
-h-to-ffi.sh ${HEADERS}/sys/param.h
-h-to-ffi.sh ${HEADERS}/sys/poll.h
-h-to-ffi.sh ${HEADERS}/sys/prctl.h
-h-to-ffi.sh ${HEADERS}/sys/ptrace.h
-h-to-ffi.sh ${HEADERS}/sys/queue.h
-h-to-ffi.sh ${HEADERS}/sys/reboot.h
-h-to-ffi.sh ${HEADERS}/sys/resource.h
-h-to-ffi.sh ${HEADERS}/sys/select.h
-h-to-ffi.sh ${HEADERS}/sys/sendfile.h
+${htoffi} ${HEADERS}/syslog.h
+${htoffi} ${HEADERS}/sys/mman.h
+${htoffi} ${HEADERS}/sys/mount.h
+${htoffi} ${HEADERS}/sys/param.h
+${htoffi} ${HEADERS}/sys/poll.h
+${htoffi} ${HEADERS}/sys/prctl.h
+${htoffi} ${HEADERS}/sys/ptrace.h
+${htoffi} ${HEADERS}/sys/queue.h
+${htoffi} ${HEADERS}/sys/reboot.h
+${htoffi} ${HEADERS}/sys/resource.h
+${htoffi} ${HEADERS}/sys/select.h
+${htoffi} ${HEADERS}/sys/sendfile.h
 #h-to-ffi.sh ${HEADERS}/sys/_sigdefs.h
-h-to-ffi.sh ${HEADERS}/sys/socketcalls.h
-h-to-ffi.sh ${HEADERS}/sys/socket.h
-h-to-ffi.sh ${HEADERS}/sys/statfs.h
-h-to-ffi.sh ${HEADERS}/sys/stat.h
-h-to-ffi.sh ${HEADERS}/sys/syscall.h
-h-to-ffi.sh ${HEADERS}/sys/sysconf.h
-h-to-ffi.sh ${HEADERS}/sys/sysinfo.h
-h-to-ffi.sh ${HEADERS}/sys/syslimits.h
-h-to-ffi.sh ${HEADERS}/sys/sysmacros.h
+${htoffi} ${HEADERS}/sys/socketcalls.h
+${htoffi} ${HEADERS}/sys/socket.h
+${htoffi} ${HEADERS}/sys/statfs.h
+${htoffi} ${HEADERS}/sys/stat.h
+${htoffi} ${HEADERS}/sys/syscall.h
+${htoffi} ${HEADERS}/sys/sysconf.h
+${htoffi} ${HEADERS}/sys/sysinfo.h
+${htoffi} ${HEADERS}/sys/syslimits.h
+${htoffi} ${HEADERS}/sys/sysmacros.h
 #h-to-ffi.sh ${HEADERS}/sys/_system_properties.h
-h-to-ffi.sh ${HEADERS}/sys/system_properties.h
-h-to-ffi.sh ${HEADERS}/sys/timeb.h
-h-to-ffi.sh ${HEADERS}/sys/time.h
-h-to-ffi.sh ${HEADERS}/sys/times.h
-h-to-ffi.sh ${HEADERS}/sys/ttychars.h
-h-to-ffi.sh ${HEADERS}/sys/ttydev.h
-h-to-ffi.sh ${HEADERS}/sys/_types.h
+${htoffi} ${HEADERS}/sys/system_properties.h
+${htoffi} ${HEADERS}/sys/timeb.h
+${htoffi} ${HEADERS}/sys/time.h
+${htoffi} ${HEADERS}/sys/times.h
+${htoffi} ${HEADERS}/sys/ttychars.h
+${htoffi} ${HEADERS}/sys/ttydev.h
+${htoffi} ${HEADERS}/sys/_types.h
 #h-to-ffi.sh ${HEADERS}/sys/types.h
-h-to-ffi.sh ${HEADERS}/sys/uio.h
-h-to-ffi.sh -include ${HEADERS}/linux/socket.h ${HEADERS}/sys/un.h
-h-to-ffi.sh ${HEADERS}/sys/utime.h
-h-to-ffi.sh ${HEADERS}/sys/utsname.h
-h-to-ffi.sh ${HEADERS}/sys/vfs.h
-h-to-ffi.sh ${HEADERS}/sys/vt.h
-h-to-ffi.sh ${HEADERS}/sys/wait.h
-h-to-ffi.sh ${HEADERS}/termio.h
-h-to-ffi.sh ${HEADERS}/termios.h
-h-to-ffi.sh ${HEADERS}/thread_db.h
-h-to-ffi.sh ${HEADERS}/time64.h
-h-to-ffi.sh ${HEADERS}/time.h
-h-to-ffi.sh ${HEADERS}/unistd.h
-h-to-ffi.sh ${HEADERS}/util.h
-h-to-ffi.sh ${HEADERS}/utime.h
-h-to-ffi.sh ${HEADERS}/utmp.h
-h-to-ffi.sh ${HEADERS}/wchar.h
-h-to-ffi.sh ${HEADERS}/wctype.h
-h-to-ffi.sh ${HEADERS}/zconf.h
-h-to-ffi.sh ${HEADERS}/zlib.h
-h-to-ffi.sh ${CCL}/lisp-kernel/androidarm/linker.h
+${htoffi} ${HEADERS}/sys/uio.h
+${htoffi} -include ${HEADERS}/linux/socket.h ${HEADERS}/sys/un.h
+${htoffi} ${HEADERS}/sys/utime.h
+${htoffi} ${HEADERS}/sys/utsname.h
+${htoffi} ${HEADERS}/sys/vfs.h
+${htoffi} ${HEADERS}/sys/vt.h
+${htoffi} ${HEADERS}/sys/wait.h
+${htoffi} ${HEADERS}/termio.h
+${htoffi} ${HEADERS}/termios.h
+${htoffi} ${HEADERS}/thread_db.h
+${htoffi} ${HEADERS}/time64.h
+${htoffi} ${HEADERS}/time.h
+${htoffi} ${HEADERS}/unistd.h
+${htoffi} ${HEADERS}/util.h
+${htoffi} ${HEADERS}/utime.h
+${htoffi} ${HEADERS}/utmp.h
+${htoffi} ${HEADERS}/wchar.h
+${htoffi} ${HEADERS}/wctype.h
+${htoffi} ${HEADERS}/zconf.h
+${htoffi} ${HEADERS}/zlib.h
+${htoffi} ${CCL}/lisp-kernel/androidarm/linker.h
+${htoffi} ${CCL}/lisp-kernel/androidarm/android_native_app_glue.h
+