From 7e1b1a2e0d6a70832ea993af71d130a0a8ff8239 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Wed, 10 Mar 2004 08:35:38 +0000 Subject: [PATCH] macos-build-update-20040310 make the head build again. --- acconfig.h | 1 + acinclude.m4 | 20 +++++- src/auth/cellconfig.c | 3 + src/cf/ressearch.m4 | 3 + src/libafs/MakefileProto.IRIX.in | 109 +++++++++++++++++++++---------- src/libuafs/linktest.c | 2 +- src/rxkad/rxkad_common.c | 4 +- 7 files changed, 104 insertions(+), 38 deletions(-) diff --git a/acconfig.h b/acconfig.h index a31cf2a31..47ec12f08 100644 --- a/acconfig.h +++ b/acconfig.h @@ -49,6 +49,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #undef STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK #undef ssize_t #undef HAVE_STRUCT_BUF +#undef HAVE_ARPA_NAMESER_COMPAT_H /* glue for RedHat kernel bug */ #undef ENABLE_REDHAT_BUILDSYS #if defined(ENABLE_REDHAT_BUILDSYS) && defined(KERNEL) && defined(REDHAT_FIX) diff --git a/acinclude.m4 b/acinclude.m4 index 86b20127f..5acd4d50d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -689,6 +689,24 @@ else done fi + dnl darwin wants it, aix hates it + AC_MSG_CHECKING(for the useability of arpa/nameser_compat.h) + AC_TRY_COMPILE([ + #include + #include + #include + #include + #include + #include + #include + #include + #include + ], [static int i; i = 0;], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_ARPA_NAMESER_COMPAT_H)], + [AC_MSG_RESULT(no) + ]) + openafs_save_libs="$LIBS" AC_MSG_CHECKING([for res_search]) AC_FUNC_RES_SEARCH @@ -817,7 +835,7 @@ AC_CHECK_HEADERS(stdlib.h string.h unistd.h fcntl.h sys/time.h sys/file.h) AC_CHECK_HEADERS(netinet/in.h netdb.h sys/fcntl.h sys/mnttab.h sys/mntent.h) AC_CHECK_HEADERS(mntent.h sys/vfs.h sys/param.h sys/fs_types.h sys/fstyp.h) AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h) -AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h) +AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h sys/user.h) AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h) if test "$ac_cv_header_security_pam_modules_h" = "yes"; then diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c index d782a8081..e4978d158 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -36,6 +36,9 @@ RCSID #include #ifdef AFS_AFSDB_ENV #include +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +#include +#endif #include #endif /* AFS_AFSDB_ENV */ #endif /* AFS_NT40_ENV */ diff --git a/src/cf/ressearch.m4 b/src/cf/ressearch.m4 index 53e237dd1..a0861dea2 100644 --- a/src/cf/ressearch.m4 +++ b/src/cf/ressearch.m4 @@ -4,6 +4,9 @@ AC_DEFUN(AC_FUNC_RES_SEARCH, [ #include #include #include +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +#include +#endif #include ], [ const char host[11]="openafs.org"; diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in index 2ec741a3f..92acedb0d 100644 --- a/src/libafs/MakefileProto.IRIX.in +++ b/src/libafs/MakefileProto.IRIX.in @@ -29,7 +29,7 @@ AFS_OS_NONFSOBJS = \ # System specific build commands and flags -DBUG=-g +DBUG=-g2 MPS=MP SP @@ -147,46 +147,77 @@ R10000_KDEFS = -DKONA -DIP27 -DIP27 -DDISCONTIG_PHYSMEM -DNUMA_BASE -DNUMA_PM \ # While -G 8 is recommended for space, we know that the table overflows when # both AFS and DFS are compiled into the kernel. For Irix 6.5, define MP # so we pick up locks. +# +# For cc flags see: +# http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=man&fname=/usr/share/catman/u_man/cat1/cc.z&srch=cc +# KDEFS= -I/usr/include -I/usr/include/sys -DSTATIC=static -DAFS_SGIMP_ENV \ -DMP -D_KERNEL -DMP_STREAMS -D_MP_NETLOCKS -DMRSP_AS_MR \ - -fullwarn -non_shared -G 0 \ + ${CPU_KDEFS} -fullwarn -non_shared -G 0 \ -TENV:kernel -OPT:space -OPT:Olimit=0 -CG:unique_exit=on \ -TENV:X=1 -OPT:IEEE_arithmetic=1 -OPT:roundoff=0 \ -OPT:wrap_around_unsafe_opt=off \ - ${CPU_KDEFS} -woff 1209,1196,1496 + -woff 1209,1196,1496 # 32 bit specific flags: KDEFS_32 = -n32 -D_PAGESZ=4096 -mips3 # 64 bit specific flags: KDEFS_64 = -64 -D_PAGESZ=16384 -D_MIPS3_ADDRSPACE -mips4 # CPU board specific flags: +# To get more help on all board/cpu combinations see http://sgistuff.g-lenerz.de/machines.html +# +#IP19 (Challenge DM/L/XL, Onyx) CPU's R4000, R4400 IP19_KDEFS = -DIP19 -DEVEREST -DMP -DR4000 \ - -mips3 -D_PAGESZ=16384 -D_MIPS3_ADDRSPACE -64 + -D_PAGESZ=16384 -D_MIPS3_ADDRSPACE -TARG:platform=ip19:processor=r4000 $(KDEFS_32) +#IP20 (Indigo) CPU's R4000 IP20_KDEFS = -DIP20 -DR4000 -DJUMP_WAR -DBADVA_WAR -DTRITON -DUSE_PCI_PIO \ - -D_R5000_CVT_WAR=1 -DCKPT -D_MTEXT_VFS $(KDEFS_32) -IP21_KDEFS = -DIP21 -DEVEREST -DMP -DTFP -TARG:processor=r8000 $(KDEFS_64) -IP25_KDEFS = -DIP25 -DEVEREST -DMP -DR10000 -TARG:processor=r10000 $(KDEFS_64) -IP26_KDEFS = -DIP26 -DTFP -TARG:sync=off -TARG:processor=r8000 $(KDEFS_64) + -D_R5000_CVT_WAR=1 -DCKPT -D_MTEXT_VFS -Ofast=ip20 $(KDEFS_32) +#IP21 (Power Challenge DM/L/XL, Power Onyx) R8000 +IP21_KDEFS = -DIP21 -DEVEREST -DMP -DTFP -TARG:processor=r8000 -Ofast=ip21 $(KDEFS_64) +#IP22 (Indigo 2, Challenge M) CPU's R4000, R4400, R4600 (and by bug in hinv(1) also Indy IP24 machines with R4x00) +# -Ofast=ip22_4k is same as -TARG:ip22_4k -O3 -IPA -OPT:roundoff=3:Olimit=0:div_split=on:alias=typed +# when -Ofast used on IP24 Indy, the STATIC.*/libafs*.a claims to be 64-bit and /etc/refuses to build the +# object in the kernel. +IP22_4K_KDEFS = -DIP20 -DR4000 -DJUMP_WAR -DBADVA_WAR -DTRITON -DUSE_PCI_PIO \ + -D_R5000_CVT_WAR=1 -DCKPT -D_MTEXT_VFS -TARG:platform=ip22_4k:processor=r4000 $(KDEFS_32) +IP22_5K_KDEFS = -DIP20 -DR4000 -DJUMP_WAR -DBADVA_WAR -DTRITON -DUSE_PCI_PIO \ + -D_R5000_CVT_WAR=1 -DCKPT -D_MTEXT_VFS -TARG:platform=ip22_5k:processor=r5000 $(KDEFS_32) +#IP24 (Indy, Challenge S) is reported by hinv(1) as IP22, CPU's R4000, R4400, R4600, R5000 +# therefore same as IP22 +#IP25 (Power Challenge L/XL, Power Onyx) CPU's R10000 +IP25_KDEFS = -DIP25 -DEVEREST -DMP -DR10000 -Ofast=ip25 -TARG:processor=r10000 $(KDEFS_64) +#IP26 (Power Challenge M, Power Indigo 2) CPU's R8000 +IP26_KDEFS = -DIP26 -DTFP -TARG:sync=off -Ofast=ip26 -TARG:processor=r8000 $(KDEFS_64) +#IP27 (Origin 200, Origin 2000, Onyx 2, Origin 3000) CPU's R10000, R12000 IP27_KDEFS = -DIP27 -DR10000 -DMP -DSN -DSN0 -DMAPPED_KERNEL \ -DLARGE_CPU_COUNT \ -DPTE_64BIT -DULI -DCKPT -DMIPS4_ISA -DR10K_LLSC_WAR -DNUMA_BASE \ -DNUMA_PM -DNUMA_TBORROW -DNUMA_MIGR_CONTROL -DNUMA_REPLICATION \ -DNUMA_REPL_CONTROL -DNUMA_SCHED -DCELL_PREPARE -DBHV_PREPARE \ - -TARG:processor=r10000 $(KDEFS_64) + -Ofast=ip27 -TARG:processor=r10000 $(KDEFS_64) +#IP28 (Indigo 2), CPU's R10000 IP28_KDEFS = -DIP28 -DR10000 -DSCACHE_SET_ASSOC=2 -D_NO_UNCACHED_MEM_WAR \ - -DR10000_SPECULATION_WAR -TARG:processor=r10000 \ + -DR10000_SPECULATION_WAR -Ofast=ip28 -TARG:processor=r10000 \ -TARG:t5_no_spec_stores $(KDEFS_64) +#IP30 (Octane and Octane 2) CPU's R10000, R12000, R14000 (and by bug also Indy IP24 with R5000) IP30_KDEFS = -DIP30 -DR10000 -DMP -DCELL_PREPARE -DBHV_PREPARE \ - -TARG:processor=r10000 $(KDEFS_64) + -Ofast=ip30 -TARG:processor=r10000 $(KDEFS_64) +#IP32 (O2 and O2+) CPU's R5000, R10000, R12000 +IP32_5K_KDEFS = -DIP20 -DR4000 -DJUMP_WAR -DBADVA_WAR -DTRITON -DUSE_PCI_PIO \ + -D_PAGESZ=16384 -D_MIPS3_ADDRSPACE -Ofast=ip32_5k $(KDEFS_64) +IP32_10K_KDEFS = -DIP20 -DR4000 -DJUMP_WAR -DBADVA_WAR -DTRITON -DUSE_PCI_PIO \ + -D_PAGESZ=16384 -D_MIPS3_ADDRSPACE -Ofast=ip32_10k $(KDEFS_64) +#IP35 (Fuel, Origin 3000) CPU's R14000, R16000 IP35_KDEFS = -DIP35 -DR10000 -DMP -DSN -DSN1 -DMAPPED_KERNEL \ -DLARGE_CPU_COUNT \ -DPTE_64BIT -DULI -DCKPT -DMIPS4_ISA -DNUMA_BASE \ -DNUMA_PM -DNUMA_TBORROW -DNUMA_MIGR_CONTROL -DNUMA_REPLICATION \ -DNUMA_REPL_CONTROL -DNUMA_SCHED -DCELL_PREPARE -DBHV_PREPARE \ - -TARG:processor=r10000 $(KDEFS_64) + -Ofast=ip35 $(KDEFS_64) +#IP53 (Tezro) CPU's R16000 # Loader flags -LDFLAGS_64 = -64 -LDFLAGS_32 = -n32 +LDFLAGS_64 = -64 -IPA +LDFLAGS_32 = -n32 -IPA @@ -212,7 +243,7 @@ PROCESSORS = R5000 R1000 PROCESSORS = R10000 -PROCESSORS = IP19 IP20 IP21 IP25 IP26 IP27 IP28 IP30 @IRIX_BUILD_IP35@ +PROCESSORS = IP19 IP20 IP21 IP22_4K IP22_5K IP25 IP26 IP27 IP28 IP30 IP32_5K IP32_10K @IRIX_BUILD_IP35@ KOBJ = STATIC MODLOAD @@ -261,7 +292,7 @@ setup: done; \ done - echo Setup compelete. + echo Setup complete. # Compile static and modload versions of the clients. @@ -287,7 +318,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: CPU_KDEFS="${R4000_32_KDEFS}"; \ LDFLAGS="${R4000_32_LDFLAGS}";; \ R5000) \ - CPUBOARD=IP32; \ + CPUBOARD=IP32_5K; \ CPU_KDEFS="${R5000_KDEFS}"; \ LDFLAGS="${R5000_LDFLAGS}";; \ R8000) \ @@ -298,7 +329,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: CPUBOARD=IP28; \ - CPUBOARD=IP32; \ + CPUBOARD=IP32_10K; \ CPUBOARD=IP27; \ @@ -325,18 +356,33 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: for t in ${KOBJ} ; do \ dir=$$t.$$p ; \ echo Building directory: $$dir; \ - LDFLAGS="${LDFLAGS_64}"; \ case $$p in \ - IP19) CPU_KDEFS="${IP19_KDEFS}";; \ + IP19) CPU_KDEFS="${IP19_KDEFS}"; \ + LDFLAGS="${LDFLAGS_32}";; \ IP20) CPU_KDEFS="${IP20_KDEFS}"; \ LDFLAGS="${LDFLAGS_32}";; \ - IP21) CPU_KDEFS="${IP21_KDEFS}";; \ - IP25) CPU_KDEFS="${IP25_KDEFS}";; \ - IP26) CPU_KDEFS="${IP26_KDEFS}";; \ - IP27) CPU_KDEFS="${IP27_KDEFS}";; \ - IP28) CPU_KDEFS="${IP28_KDEFS}";; \ - IP30) CPU_KDEFS="${IP30_KDEFS}";; \ - IP35) CPU_KDEFS="${IP35_KDEFS}";; \ + IP21) CPU_KDEFS="${IP21_KDEFS}"; \ + LDFLAGS="${LDFLAGS_64}";; \ + IP22_4K) CPU_KDEFS="${IP22_4K_KDEFS}"; \ + LDFLAGS="${LDFLAGS_32}";; \ + IP22_5K) CPU_KDEFS="${IP22_5K_KDEFS}"; \ + LDFLAGS="${LDFLAGS_32}";; \ + IP25) CPU_KDEFS="${IP25_KDEFS}"; \ + LDFLAGS="${LDFLAGS_64}";; \ + IP26) CPU_KDEFS="${IP26_KDEFS}"; \ + LDFLAGS="${LDFLAGS_64}";; \ + IP27) CPU_KDEFS="${IP27_KDEFS}"; \ + LDFLAGS="${LDFLAGS_64}";; \ + IP28) CPU_KDEFS="${IP28_KDEFS}"; \ + LDFLAGS="${LDFLAGS_64}";; \ + IP30) CPU_KDEFS="${IP30_KDEFS}"; \ + LDFLAGS="${LDFLAGS_64}";; \ + IP32_5K) CPU_KDEFS="${IP32_5K_KDEFS}"; \ + LDFLAGS="${LDFLAGS_32}";; \ + IP32_10K) CPU_KDEFS="${IP32_10K_KDEFS}"; \ + LDFLAGS="${LDFLAGS_64}";; \ + IP35) CPU_KDEFS="${IP35_KDEFS}"; \ + LDFLAGS="${LDFLAGS_64}";; \ *) echo Unknown IP number $$p ; exit 1 ;; \ esac ;\ case $$t in \ @@ -438,14 +484,7 @@ dest_COPYFILES: # If this changes, also change the kdump symlinks. install_LINKFILES: - ln -fs libafs.IP20.a ${DESTDIR}${afskerneldir}/libafs.IP22.a - ln -fs libafs.IP20.a ${DESTDIR}${afskerneldir}/libafs.IP32.a - ln -fs libafs.IP20.nonfs.a ${DESTDIR}${afskerneldir}/libafs.IP22.nonfs.a - ln -fs libafs.IP20.nonfs.a ${DESTDIR}${afskerneldir}/libafs.IP32.nonfs.a - ln -fs libafs.IP20.o ${DESTDIR}${afskerneldir}/libafs.IP22.o - ln -fs libafs.IP20.o ${DESTDIR}${afskerneldir}/libafs.IP32.o - ln -fs libafs.IP20.nonfs.o ${DESTDIR}${afskerneldir}/libafs.IP22.nonfs.o - ln -fs libafs.IP20.nonfs.o ${DESTDIR}${afskerneldir}/libafs.IP32.nonfs.o + echo "Now we support also IP22_4K, IP22_5K, IP32_5K, IP32_10K cpu boards." # Create symlinks to clients we don't need to build. diff --git a/src/libuafs/linktest.c b/src/libuafs/linktest.c index 37dba0f72..b25ba345a 100644 --- a/src/libuafs/linktest.c +++ b/src/libuafs/linktest.c @@ -22,8 +22,8 @@ RCSID #include #include -#include #include +#include #include void uafs_Shutdown(void); diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c index b9de6ccf4..590601c39 100644 --- a/src/rxkad/rxkad_common.c +++ b/src/rxkad/rxkad_common.c @@ -81,7 +81,9 @@ RCSID #ifndef KERNEL #define osi_Time() time(0) #endif -struct rxkad_stats rxkad_stats; +/* variable initialization for the benefit of darwin compiler; if it causes + problems elsewhere, conditionalize for darwin or fc_test compile breaks */ +struct rxkad_stats rxkad_stats = {0}; /* static prototypes */ static afs_int32 ComputeSum(struct rx_packet *apacket, -- 2.39.5