From 21c5eaa31f165e830dfd4720c0d0fbb7f63f1a77 Mon Sep 17 00:00:00 2001 From: Hartmut Reuter Date: Wed, 3 Sep 2003 17:47:15 +0000 Subject: [PATCH] aix52-support-20030903 AIX 5.2 support does not include param.h does not include deadlock fix for afs_vnop_remove.c --- src/afs/afs_vcache.c | 2 +- src/config/afs_sysnames.h | 1 + src/export/Makefile.in | 64 +++++++++++++++++++------------------ src/export/cfgexport.c | 2 +- src/libafsrpc/Makefile.in | 2 +- src/shlibafsrpc/Makefile.in | 2 +- src/sys/Makefile.in | 8 ++--- src/util/Makefile.in | 6 ++++ 8 files changed, 48 insertions(+), 39 deletions(-) diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index ab5d6d968..1c25cd85b 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -1408,7 +1408,7 @@ afs_SimpleVStat(register struct vcache *avc, #else if ((avc->execsOrWriters <= 0) && !afs_DirtyPages(avc)) { #endif -#ifdef AFS_64BIT_ClIENT +#ifdef AFS_64BIT_CLIENT FillInt64(length, astat->Length_hi, astat->Length); #else /* AFS_64BIT_CLIENT */ length = astat->Length; diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index d42e8826d..7f1c77f52 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -62,6 +62,7 @@ #define SYS_NAME_ID_rs_aix42 703 #define SYS_NAME_ID_rs_aix51 704 #define SYS_NAME_ID_rs_aix43 705 +#define SYS_NAME_ID_rs_aix52 706 #define SYS_NAME_ID_sun3_411 906 #define SYS_NAME_ID_sun3x_411 912 diff --git a/src/export/Makefile.in b/src/export/Makefile.in index 20891ebb8..1a3f41fb6 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -9,30 +9,31 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config EXPORTS = -bexport:export.exp - IMPORTS = /lib/kernex.exp /lib/syscalls.exp extras.exp + IMPORTS = /lib/kernex.exp /lib/syscalls.exp ${srcdir}/extras.exp KOBJ = export.o symtab.o include ../config/Makefile.version all: ${TOP_LIBDIR}/export.exp ${TOP_LIBDIR}/export64.exp ${TOP_LIBDIR}/extras.exp cfgexport cfgafs -all: ${TOP_LIBDIR}/export.exp ${TOP_LIBDIR}/extras.exp cfgexport cfgafs ${INSTALL} ${srcdir}/export.h ${KERNELDIR} - ${INSTALL} ${srcdir}/export.exp ${KERNELDIR} + ${INSTALL} export.exp ${KERNELDIR} + ${INSTALL} export64.exp ${KERNELDIR} ${INSTALL} ${srcdir}/export.h ${UKERNELDIR} - ${INSTALL} ${srcdir}/export.exp ${UKERNELDIR} + ${INSTALL} export64.exp ${UKERNELDIR} + ${INSTALL} export.exp ${UKERNELDIR} noversion system: install install: ${DESTDIR}${libdir}/afs/export.exp ${DESTDIR}${libdir}/afs/extras.exp -export.exp: export4.exp export5.exp +export.exp: ${srcdir}/export4.exp ${srcdir}/export5.exp case ${SYS_NAME} in \ rs_aix4* ) \ - cp -p export4.exp export.exp ; \ - cp -p export4-64.exp export64.exp ;; \ + cp -p ${srcdir}/export4.exp export.exp ; \ + cp -p ${srcdir}/export4-64.exp export64.exp ;; \ rs_aix5* ) \ - cp -p export5.exp export.exp ; \ - cp -p export5-64.exp export64.exp ;; \ + cp -p ${srcdir}/export5.exp export.exp ; \ + cp -p ${srcdir}/export5-64.exp export64.exp ;; \ esac export.ext: ${KOBJ} @@ -50,34 +51,34 @@ export64.ext.nonfs: export64.nonfs.o symtab64.o ${LD} -b64 -o export64.ext.nonfs -eexport ${IMPORTS} export64.nonfs.o \ symtab64.o -bexport:export64.exp -lcsys -symtab.o symtab64.o: symtab.c +symtab.o symtab64.o: ${srcdir}/symtab.c case ${SYS_NAME} in \ rs_aix4* ) \ - ${CC} ${CFLAGS} -c symtab.c ;; \ + ${CC} ${CFLAGS} -c ${srcdir}/symtab.c ;; \ rs_aix5* ) \ - ${CC} ${CFLAGS} -q64 -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV -c symtab.c ; \ + ${CC} ${CFLAGS} -q64 -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV -c ${srcdir}/symtab.c ; \ mv symtab.o symtab64.o ; \ - ${CC} ${CFLAGS} -DAFS_AIX51_ENV -c symtab.c ;; \ + ${CC} ${CFLAGS} -DAFS_AIX51_ENV -c ${srcdir}/symtab.c ;; \ esac -export.o export64.o: export.c +export.o export64.o: ${srcdir}/export.c case ${SYS_NAME} in \ rs_aix4* ) \ - ${CC} ${CFLAGS} -c export.c ;; \ + ${CC} ${CFLAGS} -c ${srcdir}/export.c ;; \ rs_aix5* ) \ - ${CC} ${CFLAGS} -q64 -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV -c export.c ; \ + ${CC} ${CFLAGS} -q64 -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV -c ${srcdir}/export.c ; \ mv export.o export64.o ; \ - ${CC} ${CFLAGS} -DAFS_AIX51_ENV -c export.c ;; \ + ${CC} ${CFLAGS} -DAFS_AIX51_ENV -c ${srcdir}/export.c ;; \ esac -export.nonfs.o export64.nonfs.o: export.c +export.nonfs.o export64.nonfs.o: ${srcdir}/export.c case ${SYS_NAME} in \ rs_aix4* ) \ - ${CC} ${INCS} -DAFS_NONFSTRANS -c export.c ;; \ + ${CC} ${INCS} -DAFS_NONFSTRANS -c ${srcdir}/export.c ;; \ rs_aix5* ) \ - ${CC} -q64 ${INCS} -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_NONFSTRANS -DAFS_AIX51_ENV -c export.c ; \ + ${CC} -q64 ${INCS} -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_NONFSTRANS -DAFS_AIX51_ENV -c ${srcdir}/export.c ; \ mv export.o export64.nonfs.o ; \ - ${CC} ${INCS} -DAFS_NONFSTRANS -DAFS_AIX51_ENV -c export.c ;; \ + ${CC} ${INCS} -DAFS_NONFSTRANS -DAFS_AIX51_ENV -c ${srcdir}/export.c ;; \ esac -mv export.o export.nonfs.o @@ -93,16 +94,17 @@ cfgafs: cfgafs.o cfgafs64: cfgafs64.o ${CC} -g ${INCS} -q64 -o cfgafs64 cfgafs64.o -cfgexport64.o: cfgexport.c AFS_component_version_number.c - ${CC} -g -q64 ${CFLAGS} -D__XCOFF64__ -c cfgexport.c -o cfgexport64.o +cfgexport64.o: ${srcdir}/cfgexport.c AFS_component_version_number.c + ${CC} -g -q64 ${CFLAGS} -D__XCOFF64__ -c ${srcdir}/cfgexport.c -o cfgexport64.o -cfgexport.o: cfgexport.c AFS_component_version_number.c -cfgafs.o: cfgafs.c AFS_component_version_number.c -cfgafs64.o: cfgafs.c AFS_component_version_number.c - ${CC} -q64 ${CFLAGS} -c cfgafs.c -o cfgafs64.o +cfgexport.o: ${srcdir}/cfgexport.c AFS_component_version_number.c +cfgafs.o: ${srcdir}/cfgafs.c AFS_component_version_number.c +cfgafs64.o: ${srcdir}/cfgafs.c AFS_component_version_number.c + ${CC} -q64 ${CFLAGS} -c ${srcdir}/cfgafs.c -o cfgafs64.o clean: - $(RM) -f *.o *.Zlst *.map *.out cfgexport cfgafs *.ext AFS_component_version_number.c export.exp + $(RM) -f *.o *.Zlst *.map *.out cfgexport cfgafs *.ext AFS_component_version_number.c export.exp export64.exp + ${DEST}/root.client/usr/vice/etc/dkload/export.ext: export.ext ${INSTALL} $? $@ @@ -133,14 +135,14 @@ ${TOP_LIBDIR}/export.exp: export.exp ${TOP_LIBDIR}/export64.exp: export64.exp ${INSTALL} $? $@ -${DEST}/lib/afs/extras.exp: extras.exp +${DEST}/lib/afs/extras.exp: ${srcdir}/extras.exp ${INSTALL} $? $@ -${DESTDIR}${libdir}/afs/extras.exp: extras.exp +${DESTDIR}${libdir}/afs/extras.exp: ${srcdir}/extras.exp ${INSTALL} $? $@ -${TOP_LIBDIR}/extras.exp: extras.exp +${TOP_LIBDIR}/extras.exp: ${srcdir}/extras.exp ${INSTALL} $? $@ diff --git a/src/export/cfgexport.c b/src/export/cfgexport.c index 652d5d09b..4acca1f7f 100644 --- a/src/export/cfgexport.c +++ b/src/export/cfgexport.c @@ -382,7 +382,7 @@ xlate_xtok(xp, kp, strp, szp) uint *szp; { register len; - static char *export_strings, *prev = ""; + static char *export_strings = NULL, *prev = ""; static left, offset, sz; if (!export_strings) { diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index 6f4d3b2a9..d3c77a218 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -130,7 +130,7 @@ libafsrpc.a: ${LIBOBJS} $(RANLIB) $@ case "${SYS_NAME}" in \ rs_aix*) \ - $(AR) crv $@ ${srcdir}/../sys/afsl.exp;; \ + $(AR) crv $@ ../sys/afsl.exp;; \ esac rx_event.o: ${RX}/rx_event.c diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in index 0e2ecc112..28370dd6f 100644 --- a/src/shlibafsrpc/Makefile.in +++ b/src/shlibafsrpc/Makefile.in @@ -135,7 +135,7 @@ ${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}: ${DEST}/lib/${LIBAFSRPC} ${LIBAFSRPC}: ${LIBOBJS} case ${SYS_NAME} in \ rs_aix4* | rs_aix5*) \ - ${SHLIB_LINKER} -o ${LIBAFSRPC} ${LIBOBJS} -bE:afsrpc.exp ${MT_LIBS};; \ + ${SHLIB_LINKER} -o ${LIBAFSRPC} ${LIBOBJS} -bE:${srcdir}/afsrpc.exp ${MT_LIBS};; \ sun*_5*) \ ${SHLIB_LINKER} -h ${LIBAFSRPC} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \ *) \ diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 29724bbc4..58fe2b8f5 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -36,7 +36,7 @@ libsys.a: ${OBJECTS} ${RMTOBJS} afsl.exp AFS_component_version_number.o $(RANLIB) $@ case "${SYS_NAME}" in \ rs_aix*) \ - $(AR) crv $@ ${srcdir}/afsl.exp;; \ + $(AR) crv $@ afsl.exp;; \ esac tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd @@ -67,7 +67,7 @@ afssyscalls.o: afssyscalls.c afssyscalls.h ${CC} ${CFLAGS} -c ${srcdir}/afssyscalls.c rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h -rmtsysd: AFS_component_version_number.o +rmtsysd: AFS_component_version_number.o afs.exp afsl.exp rmtsys.cs.c: rmtsys.xg ${RXGEN} -C -o $@ ${srcdir}/rmtsys.xg @@ -127,7 +127,7 @@ xfsinode: xfsinode.c AFS_component_version_number.c $(CC) -o xfsinode ${CFLAGS} ${srcdir}/xfsinode.c ${LIBS} esac -afs.exp: afs4.exp afs5.exp +afs.exp: ${srcdir}/afs4.exp ${srcdir}/afs5.exp case ${SYS_NAME} in \ rs_aix5* ) \ cp -p ${srcdir}/afs5.exp afs.exp ;; \ @@ -135,7 +135,7 @@ afs.exp: afs4.exp afs5.exp cp -p ${srcdir}/afs4.exp afs.exp ;; \ esac -afsl.exp: afsl4.exp afsl5.exp +afsl.exp: ${srcdir}/afsl4.exp ${srcdir}/afsl5.exp case ${SYS_NAME} in \ rs_aix5* ) \ cp -p ${srcdir}/afsl5.exp afsl.exp ;; \ diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 8a59f0619..924bae2c1 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -124,6 +124,12 @@ afs_atomlist.o: ${srcdir}/afs_atomlist.c ${includes} afs_lhash.o: ${srcdir}/afs_lhash.c ${includes} ${CC} ${CFLAGS} -c ${srcdir}/afs_lhash.c +strlcat.o: ${srcdir}/strlcat.c ${includes} + ${CC} ${CFLAGS} -c ${srcdir}/strlcat.c + +strlcpy.o: ${srcdir}/strlcpy.c ${includes} + ${CC} ${CFLAGS} -c ${srcdir}/strlcpy.c + # # Install targets # -- 2.39.5