arm darwin update

some stuff that got lost from the last batch

Change-Id: I13addcb4b1ff5b36830e190bcee70a504df98e46
Reviewed-on: http://gerrit.openafs.org/4064
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 4397159a1c84c890a4f2a84fa2282f0ab9b74154)
Reviewed-on: http://gerrit.openafs.org/4065

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 5421eca26dfde3070ab2773ee25bf1a55faff0cb..54483eb38a2593ec752252a7f1bd756703de36d8 100644 (file)
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -429,11 +429,9 @@ afsd_event_cleanup(int signo) {
 
     CFRunLoopRemoveSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode);
     CFRelease (source);
-#ifndef AFS_ARM_DARWIN_ENV
     IODeregisterForSystemPower(&iterator);
     IOServiceClose(root_port);
     IONotificationPortDestroy(notify);
-#endif
     exit(0);
 }
 
@@ -444,7 +442,6 @@ afsd_install_events(void)
     SCDynamicStoreContext ctx = {0};
     SCDynamicStoreRef store;
 
-#ifndef AFS_ARM_DARWIN_ENV
     root_port = IORegisterForSystemPower(0,&notify,afsd_sleep_callback,&iterator);
 
     if (root_port) {
@@ -491,7 +488,6 @@ afsd_install_events(void)
 
        CFRelease (store);
     }
-#endif
 
     if (source != NULL) {
        CFRunLoopAddSource (CFRunLoopGetCurrent(),
@@ -1462,7 +1458,7 @@ AfsdbLookupHandler(void)
     kernelMsg[1] = 0;
     acellName[0] = '\0';
 
-#ifdef AFS_DARWIN_ENV
+#if defined(AFS_DARWIN_ENV) && !defined(AFS_ARM_DARWIN_ENV)
     /* Fork the event handler also. */
     code = fork();
     if (code == 0) {

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 32fef3d397fc31dcdf6be182df52ecfbe32db5db..6405b24c95a7a2f719897f793b5968dd75b6e2e5 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -466,6 +466,26 @@ case $AFS_SYSNAME in
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
+       arm_darwin_100)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+               MT_LIBS="${LIB_AFSDB} -framework CoreFoundation"
+               KROOT=
+               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
+               LD="cc"
+               KERN_OPTMZ="-Os"
+               LWP_OPTMZ="-Os"
+               OPTMZ="-Os"
+               PAM_LIBS="-lpam"
+               REGEX_OBJ="regex.o"
+               TXLIBS="-lncurses"
+               EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
+               ;;
+
        *_darwin_100)
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'

diff --git a/src/config/param.arm_darwin_100.h b/src/config/param.arm_darwin_100.h
index b5726ad51d45e52413657cff0aa37a78711e2140..444fc1dcfdebc825ccfe7c41fc55194972781327 100644 (file)
--- a/src/config/param.arm_darwin_100.h
+++ b/src/config/param.arm_darwin_100.h
@@ -105,6 +105,9 @@
 #define AFS_GCPAGS               0
 #define RXK_LISTENER_ENV         1
 
+
+#ifndef IGNORE_STDS_H
+/* a dodge to avoid including this in lwp process.s */
 #define RTM_NEWADDR     0xc     /* address being added to iface */
 #define RTM_IFINFO      0xe     /* iface going up/down etc. */
 #define RTAX_NETMASK    2       /* netmask sockaddr present */
@@ -115,6 +118,8 @@ struct rt_addrinfo {
     int     rti_addrs;
     struct  sockaddr *rti_info[RTAX_MAX];
 };
+#endif
+
 #ifdef KERNEL
 #undef MACRO_BEGIN
 #undef MACRO_END

diff --git a/src/libafs/afs.arm_darwin_100.plist.in b/src/libafs/afs.arm_darwin_100.plist.in
new file mode 100644 (file)
index 0000000..a138571
--- /dev/null
+++ b/src/libafs/afs.arm_darwin_100.plist.in
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleExecutable</key>
+       <string>afs</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.openafs.filesystems.afs</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>8.0</string>
+       <key>CFBundleName</key>
+       <string>afs</string>
+       <key>CFBundlePackageType</key>
+       <string>KEXT</string>
+       <key>CFBundleShortVersionString</key>
+       <string>@MACOS_VERSION@</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleVersion</key>
+       <string>@MACOS_VERSION@</string>
+       <key>OSBundleLibraries</key>
+       <dict>
+               <key>com.apple.kpi.bsd</key>
+               <string>8.0.0</string>
+               <key>com.apple.kpi.mach</key>
+               <string>8.0.0</string>
+               <key>com.apple.kpi.libkern</key>
+               <string>8.0</string>
+       </dict>
+</dict>
+</plist>

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index f7a6fe89fcfc5b4bba7fec1cbb40ae5a8e8ae0af..7db4ab88287ed8c156c6eabe6f9aa83a540f706e 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -375,6 +375,9 @@ syscall.o: ${SYS}/syscall.s
                $(PATH_CPP)  ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
+        arm_darwin_* ) \
+               touch syscall.c ; \
+               ${CC} ${AFS_CFLAGS} -c syscall.c;; \
         sgi_* | *_darwin_* ) \
                 ${CC} ${CFLAGS} -c ${SYS}/syscall.s;;          \
         alpha_dux?? ) \
@@ -382,7 +385,8 @@ syscall.o: ${SYS}/syscall.s
                ${AS} -o syscall.o syscall.i; \
                $(RM) -f syscall.ss syscall.i;; \
         *bsd* ) \
-               touch syscall.o ;; \
+               touch syscall.c ; \
+               ${CC} ${AFS_CFLAGS} -c syscall.c;; \
         *) \
                $(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
                as -o syscall.o syscall.ss;             \

diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index 108031d8cef3296eaab8c9682311c02c0f398268..2c7741e5d0ef9650ee64c2500469a2117e069921 100644 (file)
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -9,7 +9,7 @@
 #
 
 SHELL=/bin/sh
-INCLUDE=  -I. -I/usr/include -I${TOP_OBJDIR}/src/config
+INCLUDE=  -I. -I${ISYSROOT}/usr/include -I${TOP_OBJDIR}/src/config
 UOBJ   =../UAFS
 JUAFS  =../JUAFS
 WEBOBJ=../AFSWEB
@@ -1504,14 +1504,14 @@ AFSWEB:
 
 setup_common:
        -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi afsd
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net 
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
+       -ln -s ${ISYSROOT}/usr/include/sys h
+       -ln -s ${ISYSROOT}/usr/include/net net
+       -ln -s ${ISYSROOT}/usr/include/netinet netinet
+       -ln -s ${ISYSROOT}/usr/include/rpc rpc
+       -ln -s ${ISYSROOT}/usr/include/sys sys
+       -ln -s ${ISYSROOT}/usr/include/nfs nfs
+       -ln -s ${ISYSROOT}/usr/include/inet inet
+       -ln -s ${ISYSROOT}/usr/include/ufs ufs
        -ln -s $(TOP_SRCDIR)/afsd afsd
        -ln -s $(NS_INCL) nsapi
 

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 19b24f59b4f989e7b3ff8706a761ae712c5e4c08..3e22ce39b6b43719497e49ef23c129f2711f5614 100644 (file)
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -87,7 +87,7 @@ process.o     : process.s process.i386.s process.c lwp.o
                        fi ; \
                fi ; \
                if [ -n "$${arm}" ] ; then \
-                       $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c -arch armv6 -I${TOP_INCDIR} ${srcdir}/process.c -o "$${arm}" ; \
+                       $(CC) -x assembler-with-cpp -c -arch armv6 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.s -o "$${arm}" ; \
                        if [ -z "$${i386}" -a -z "$${amd64}" -a -z "$${ppc}" ] ; then \
                                ${MV} "$${arm}" process.o ; \
                        fi ; \

diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c
index 2e53d0dd2f5b66cb9f4c49b87da33b15573886c1..0b3f80b9c0f60b023365c5def587d0ec15e3f37c 100644 (file)
--- a/src/lwp/lwp.c
+++ b/src/lwp/lwp.c
@@ -376,7 +376,7 @@ LWP_CreateProcess(void *(*ep) (void *), int stacksize, int priority, void *parm,
        Initialize_PCB(temp, priority, stackmemory, stacksize, ep, parm, name);
        insert(temp, &runnable[priority]);
        temp2 = lwp_cpptr;
-#ifndef AFS_ARM_LINUX20_ENV
+#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
        if (PRE_Block != 0)
            Abort_LWP("PRE_Block not 0");
 
@@ -471,7 +471,7 @@ LWP_CreateProcess2(void *(*ep) (void *), int stacksize, int priority, void *parm
        Initialize_PCB(temp, priority, stackptr, stacksize, ep, parm, name);
        insert(temp, &runnable[priority]);
        temp2 = lwp_cpptr;
-#ifndef AFS_ARM_LINUX20_ENV
+#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
        if (PRE_Block != 0)
            Abort_LWP("PRE_Block not 0");
 
@@ -970,7 +970,7 @@ Dispatcher(void)
        printf("Dispatch %d [PCB at 0x%x] \"%s\"\n", ++dispatch_count,
               runnable[i].head, runnable[i].head->name);
 #endif
-#ifndef AFS_ARM_LINUX20_ENV
+#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
     if (PRE_Block != 1)
        Abort_LWP("PRE_Block not 1");
 #endif

diff --git a/src/lwp/process.s b/src/lwp/process.s
index 5d26c8779b67b4739c654f820dd57593fd6ca98f..dda0e5dd3816c9b54d1a3fea55392f1b35ab2c5a 100644 (file)
--- a/src/lwp/process.s
+++ b/src/lwp/process.s
@@ -11,13 +11,15 @@
 #include <afs/param.h>
 
 #if defined(__arm32__) || defined(__arm__)
-       /* register definitions */
+#ifndef AFS_ARM_DARWIN_ENV
+       /* register definitions */
        fp      .req    r11
        ip      .req    r12
        sp      .req    r13
        lp      .req    r14
        pc      .req    r15
-       
+#endif
+
        /*
           savecontext(f, area1, newsp)
                int (*f)()#if defined(RIOS);
@@ -29,24 +31,30 @@
 
        .text
        .align  0
+#ifndef AFS_ARM_DARWIN_ENV
        .globl  savecontext
        .type   savecontext, #function
 savecontext:
-       @ build the frame
-       mov     ip, sp
-       stmfd   sp!, {fp, ip, lr, pc}
-       sub     fp, ip, #4
-       @ stack r0 - r10, current fp
-       stmfd   sp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, fp}
-       str     sp, [r1, #0]
-       @ check if newsp is zero
-       movs    r2, r2
-       movne   sp, r2
-       @ call function ...
-       mov     pc, r0
-
-       /*      should never get here ... */
-       /*      bl      EXT(abort) */
+#else
+       .globl  _savecontext
+_savecontext:
+#endif
+       @ build the frame
+       mov     ip, sp
+       stmfd   sp!, {fp, ip, lr, pc}
+       sub     fp, ip, #4
+       @ stack r0 - r10, current fp
+       stmfd   sp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, fp}
+       str     sp, [r1, #0]
+       @ check if newsp is zero
+       movs    r2, r2
+       movne   sp, r2
+       @ call function ...
+#ifdef AFS_ARM_DARWIN_ENV
+       bx      r0
+#else
+       mov     pc, r0
+#endif
 
        /*
          returnto(area2)
@@ -55,9 +63,14 @@ savecontext:
 
        /* area2 is in r0. */
 
+#ifndef AFS_ARM_DARWIN_ENV
        .globl returnto
        .type  returnto, #function
 returnto:
+#else
+       .globl _returnto
+_returnto:
+#endif
        @ restore r0-r10, fp
        ldr     r0, [r0, #0]
        ldmfd   r0, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, fp}

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 70da4914ae84179eb25aa748b1e8aa3da52bfdfc..51d3d9f20b9cd961503477f683e5c6b17390c7a3 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -390,6 +390,9 @@ syscall.o: ${SYS}/syscall.s
                $(PATH_CPP)  ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
+        arm_darwin_* ) \
+               touch syscall.c ; \
+               ${CC} ${AFS_CFLAGS} -c syscall.c;; \
         sgi_* | *_darwin_* ) \
                 ${CC} ${CFLAGS} -c ${SYS}/syscall.s;;          \
         alpha_dux?? ) \

diff --git a/src/vol/devname.c b/src/vol/devname.c
index e884ecb67fa16acaccf1f872cca08787b7d16459..e7f014761829b85792d04fa00ed429a3641088fb 100644 (file)
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -33,7 +33,7 @@
 #endif
 #endif
 #else /* AFS_VFSINCL_ENV */
-#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_XBSD_ENV)
+#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_ARM_DARWIN_ENV)
 #include <sys/fs.h>
 #endif
 #endif /* AFS_VFSINCL_ENV */

diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c
index af864ae9a75d0cef59f7b843d0d5e023b7670711..ddf4fbe8217f349f1ea90edd204ed93617fb4a81 100644 (file)
--- a/src/vol/salvaged.c
+++ b/src/vol/salvaged.c
@@ -59,7 +59,7 @@
 #ifdef AFS_OSF_ENV
 #include <ufs/inode.h>
 #else /* AFS_OSF_ENV */
-#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV)
+#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_ARM_DARWIN_ENV)
 #include <sys/inode.h>
 #endif
 #endif

diff --git a/src/vol/salvager.c b/src/vol/salvager.c
index 2b22302c9d391d40e6d51a27a0831b63e570dad7..a9ec7a86fe09cddc4fa81c39d171189175b4ef17 100644 (file)
--- a/src/vol/salvager.c
+++ b/src/vol/salvager.c
@@ -61,7 +61,7 @@
 #ifdef AFS_OSF_ENV
 #include <ufs/inode.h>
 #else /* AFS_OSF_ENV */
-#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV)
+#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_ARM_DARWIN_ENV)
 #include <sys/inode.h>
 #endif
 #endif

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 8010094230f5f37137b44bb56294119f6ad9876e..4bd87363aaf9b63a24d61d970e52aa45d04f32af 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -128,7 +128,7 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 #ifdef AFS_OSF_ENV
 #include <ufs/inode.h>
 #else /* AFS_OSF_ENV */
-#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV)
+#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_ARM_DARWIN_ENV)
 #include <sys/inode.h>
 #endif
 #endif

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 6feaef81cda2f6f09f33f4d2b410d83f1e08f261..bc379e60c71501386b1609431a1e960dd326d8e0 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -45,7 +45,7 @@
 #endif
 #endif
 #else /* AFS_VFSINCL_ENV */
-#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV)
+#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_ARM_DARWIN_ENV)
 #include <sys/fs.h>
 #endif
 #endif /* AFS_VFSINCL_ENV */