Author: mturk Date: Wed Mar 27 06:42:53 2013 New Revision: 1461424 URL: http://svn.apache.org/r1461424 Log: Further improove hpux support
Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461424&r1=1461423&r2=1461424&view=diff ============================================================================== --- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 (original) +++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 Wed Mar 27 06:42:53 2013 @@ -45,11 +45,13 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ sysv) CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN" LIBS="$LIBS -ldl" + supported_os="sysv" ;; sysv4) CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread" LDFLAGS="-Kthread $LDFLAGS" LIBS="$LIBS -ldl" + supported_os="sysv4" ;; freebsd*) CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread" @@ -59,52 +61,16 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ osf5*) CFLAGS="$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED" LDFLAGS="$LDFLAGS -pthread" - ;; - hpux32) - if test "x$GCC" = "xyes" - then - CFLAGS="$CFLAGS -pthread -milp32" - LDFLAGS="$LDFLAGS -pthread -milp32" - else - CFLAGS="$CFLAGS -mt +DD32" - LDFLAGS="$LDFLAGS -mt +DD32" - fi - CFLAGS="$CFLAGS -DOS_HPUX -DDSO_DLFCN" - supported_os="hp-ux" - if test "$host_cpu" = "ia64" - then - host_cpu="ia64n" - else - host_cpu="hppa2.0n" - fi - ;; - hpux64) - if test "x$GCC" = "xyes" - then - CFLAGS="$CFLAGS -pthread -mlp64" - LDFLAGS="$LDFLAGS -pthread -mlp64" - else - CFLAGS="$CFLAGS -mt +DD64" - LDFLAGS="$LDFLAGS -mt +DD64" - fi - CFLAGS="$CFLAGS -DOS_HPUX -DDSO_DLFCN" - supported_os="hp-ux" - if test "$host_cpu" = "ia64" - then - host_cpu="ia64w" - else - host_cpu="hppa2.0w" - fi + supported_os="osf5" ;; hpux*) - CFLAGS="$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN" - LDFLAGS="$LDFLAGS -pthread" - LIBS="$LIBS -lpthread" - supported_os="hp-ux" + CFLAGS="$CFLAGS -DOS_HPUX -DDSO_DLFCN" + supported_os="hpux" ;; aix5*) CFLAGS="$CFLAGS -DOS_AIX -DDSO_DLFCN" LDFLAGS="$LDFLAGS -ldl" + supported_os="aix5" ;; *) AC_MSG_RESULT([failed]) @@ -114,77 +80,123 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ case $host_cpu in powerpc) CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" - HOST_CPU=$host_cpu;; + HOST_CPU=$host_cpu + ;; sparc*) CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" - HOST_CPU=$host_cpu;; + HOST_CPU=$host_cpu + ;; i?86|x86) CFLAGS="$CFLAGS -DCPU=\\\"i386\\\"" - HOST_CPU=i386;; + HOST_CPU=i386 + ;; x86_64 | amd64) CFLAGS="$CFLAGS -DCPU=\\\"amd64\\\"" - HOST_CPU=amd64;; + HOST_CPU=amd64 + ;; bs2000) CFLAGS="$CFLAGS -DCPU=\\\"osd\\\" -DCHARSET_EBCDIC -DOSD_POSIX" supported_os="osd" LDFLAGS="-Kno_link_stdlibs -B llm4" LIBS="$LIBS -lBLSLIB" LDCMD="/opt/C/bin/cc" - HOST_CPU=osd;; + HOST_CPU=osd + ;; mips) CFLAGS="$CFLAGS -DCPU=\\\"mips\\\"" supported_os="mips" - HOST_CPU=mips;; + HOST_CPU=mips + ;; alpha*) CFLAGS="$CFLAGS -DCPU=\\\"alpha\\\"" supported_os="alpha" - HOST_CPU=alpha;; + HOST_CPU=alpha + ;; hppa2.0w|hppa64) CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0W\\\" -DSO_EXT=\\\"sl\\\"" - HOST_CPU=PA_RISC2.0W;; + host_cpu=hppa2.0w + HOST_CPU=PA_RISC2.0W + ;; hppa2.0n) CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0N\\\" -DSO_EXT=\\\"sl\\\"" - HOST_CPU=PA_RISC2.0N;; + HOST_CPU=PA_RISC2.0N + ;; hppa2.0) - CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0\\\" -DSO_EXT=\\\"sl\\\"" - HOST_CPU=PA_RISC2.0;; + if test "$supported_os" = "hpux" + then + host_cpu=hppa2.0w + HOST_CPU=PA_RISC2.0W + else + HOST_CPU=PA_RISC2.0 + fi + CFLAGS="$CFLAGS -DCPU=\\\"$HOST_CPU\\\" -DSO_EXT=\\\"sl\\\"" + ;; mipsel) CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\"" supported_os="mipsel" - HOST_CPU=mipsel;; + HOST_CPU=mipsel + ;; ia64w) - if test "$supported_os" = "hp-ux" + CFLAGS="$CFLAGS -DCPU=\\\"IA64W\\\" -DSO_EXT=\\\"so\\\"" + HOST_CPU=IA64W + ;; + ia64n) + CFLAGS="$CFLAGS -DCPU=\\\"IA64N\\\" -DSO_EXT=\\\"so\\\"" + HOST_CPU=IA64N + ;; + ia64) + if test "$supported_os" = "hpux" then CFLAGS="$CFLAGS -DCPU=\\\"IA64W\\\" -DSO_EXT=\\\"so\\\"" + host_cpu=ia64w HOST_CPU=IA64W else CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\"" HOST_CPU=ia64 fi - ;; - ia64|ia64n) - if test "$supported_os" = "hp-ux" - then - CFLAGS="$CFLAGS -DCPU=\\\"IA64N\\\" -DSO_EXT=\\\"so\\\"" - HOST_CPU=IA64N - else - CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\"" - HOST_CPU=ia64 - fi ;; s390) CFLAGS="$CFLAGS -DCPU=\\\"s390\\\"" supported_os="s390" - HOST_CPU=s390;; + HOST_CPU=s390 + ;; arm*) CFLAGS="$CFLAGS -DCPU=\\\"arm\\\"" supported_os="arm" - HOST_CPU=arm;; + HOST_CPU=arm + ;; *) AC_MSG_RESULT([failed]) AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);; esac + case $supported_os-$host_cpu in + hpux-ia64n|hpux-hppa2.0n) + if test "x$GCC" = "xyes" + then + CFLAGS="-milp32 -pthread $CFLAGS" + LDFLAGS="-milp32 -pthread $LDFLAGS" + LIBS="$LIBS -lpthread" + else + CFLAGS="+DD32 -mt $CFLAGS" + LDFLAGS="+DD32 -mt $CFLAGS" + fi + ;; + hpux-ia64w|hpux-hppa2.0w) + if test "x$GCC" = "xyes" + then + CFLAGS="-mlp64 -pthread $CFLAGS" + LDFLAGS="-mlp64 -pthread $LDFLAGS" + LIBS="$LIBS -lpthread" + else + CFLAGS="+DD64 -mt $CFLAGS" + LDFLAGS="+DD64 -mt $CFLAGS" + fi + ;; + *) + ;; + esac + AC_MSG_RESULT([ok]) AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub?rev=1461424&r1=1461423&r2=1461424&view=diff ============================================================================== --- commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub (original) +++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/config.sub Wed Mar 27 06:42:53 2013 @@ -263,7 +263,7 @@ case $basic_machine in | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia64 | ia64[nw] \ | ip2k | iq2000 \ | le32 | le64 \ | lm32 \ @@ -379,7 +379,7 @@ case $basic_machine in | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia64-* | ia64[nw]-* \ | ip2k-* | iq2000-* \ | le32-* | le64-* \ | lm32-* \