svn commit: r277153 - in user/dchagin/lemul: contrib/compiler-rt/lib/builtins contrib/elftoolchain/libdwarf contrib/ofed/libmlx4/src contrib/unbound contrib/unbound/daemon contrib/unbound/doc contr...

Dmitry Chagin dchagin at FreeBSD.org
Tue Jan 13 22:21:23 UTC 2015 

Author: dchagin
Date: Tue Jan 13 22:21:20 2015
New Revision: 277153
URL: https://svnweb.freebsd.org/changeset/base/277153

Log:
  MFC.

Added:
  user/dchagin/lemul/lib/libc/gen/trivial-getcontextx.c
     - copied unchanged from r277152, head/lib/libc/gen/trivial-getcontextx.c
  user/dchagin/lemul/share/man/man4/cc_dctcp.4
     - copied unchanged from r277152, head/share/man/man4/cc_dctcp.4
  user/dchagin/lemul/sys/arm/ti/am335x/am335x_rtc.c
     - copied unchanged from r277152, head/sys/arm/ti/am335x/am335x_rtc.c
  user/dchagin/lemul/sys/arm/ti/am335x/am335x_rtcreg.h
     - copied unchanged from r277152, head/sys/arm/ti/am335x/am335x_rtcreg.h
  user/dchagin/lemul/sys/arm/ti/am335x/am335x_rtcvar.h
     - copied unchanged from r277152, head/sys/arm/ti/am335x/am335x_rtcvar.h
  user/dchagin/lemul/sys/dev/usb/template/usb_template_serialnet.c
     - copied unchanged from r277152, head/sys/dev/usb/template/usb_template_serialnet.c
  user/dchagin/lemul/sys/modules/cc/cc_dctcp/
     - copied from r277152, head/sys/modules/cc/cc_dctcp/
  user/dchagin/lemul/sys/netinet/cc/cc_dctcp.c
     - copied unchanged from r277152, head/sys/netinet/cc/cc_dctcp.c
Deleted:
  user/dchagin/lemul/lib/libc/arm/gen/getcontextx.c
  user/dchagin/lemul/lib/libc/mips/gen/getcontextx.c
  user/dchagin/lemul/lib/libc/powerpc/gen/getcontextx.c
  user/dchagin/lemul/lib/libc/powerpc64/gen/getcontextx.c
  user/dchagin/lemul/lib/libc/sparc64/gen/getcontextx.c
Modified:
  user/dchagin/lemul/contrib/compiler-rt/lib/builtins/clear_cache.c
  user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_attrval.c
  user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4-abi.h
  user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4.c
  user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4.h
  user/dchagin/lemul/contrib/unbound/config.h
  user/dchagin/lemul/contrib/unbound/config.h.in
  user/dchagin/lemul/contrib/unbound/configure
  user/dchagin/lemul/contrib/unbound/configure.ac
  user/dchagin/lemul/contrib/unbound/daemon/remote.c
  user/dchagin/lemul/contrib/unbound/daemon/unbound.c
  user/dchagin/lemul/contrib/unbound/doc/Changelog
  user/dchagin/lemul/contrib/unbound/doc/unbound.conf.5
  user/dchagin/lemul/contrib/unbound/doc/unbound.conf.5.in
  user/dchagin/lemul/contrib/unbound/services/listen_dnsport.c
  user/dchagin/lemul/contrib/unbound/services/listen_dnsport.h
  user/dchagin/lemul/contrib/unbound/smallapp/unbound-control.c
  user/dchagin/lemul/contrib/unbound/util/config_file.c
  user/dchagin/lemul/contrib/unbound/util/config_file.h
  user/dchagin/lemul/etc/mtree/BSD.debug.dist
  user/dchagin/lemul/etc/mtree/BSD.usr.dist
  user/dchagin/lemul/lib/Makefile
  user/dchagin/lemul/lib/libc/arm/gen/Makefile.inc
  user/dchagin/lemul/lib/libc/compat-43/Symbol.map
  user/dchagin/lemul/lib/libc/compat-43/creat.c
  user/dchagin/lemul/lib/libc/gen/Symbol.map
  user/dchagin/lemul/lib/libc/gen/pause.c
  user/dchagin/lemul/lib/libc/gen/raise.c
  user/dchagin/lemul/lib/libc/gen/sleep.c
  user/dchagin/lemul/lib/libc/gen/usleep.c
  user/dchagin/lemul/lib/libc/gen/wait.c
  user/dchagin/lemul/lib/libc/gen/wait3.c
  user/dchagin/lemul/lib/libc/gen/waitpid.c
  user/dchagin/lemul/lib/libc/include/libc_private.h
  user/dchagin/lemul/lib/libc/mips/gen/Makefile.inc
  user/dchagin/lemul/lib/libc/powerpc/gen/Makefile.inc
  user/dchagin/lemul/lib/libc/powerpc64/gen/Makefile.inc
  user/dchagin/lemul/lib/libc/sparc64/gen/Makefile.inc
  user/dchagin/lemul/lib/libc/sys/interposing_table.c
  user/dchagin/lemul/lib/libc/sys/open.c
  user/dchagin/lemul/lib/libclang_rt/Makefile
  user/dchagin/lemul/lib/libmagic/config.h
  user/dchagin/lemul/lib/libthr/thread/thr_private.h
  user/dchagin/lemul/lib/libthr/thread/thr_sig.c
  user/dchagin/lemul/lib/libthr/thread/thr_syscalls.c
  user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/dchagin/lemul/release/doc/share/xml/sponsor.ent
  user/dchagin/lemul/share/man/man4/Makefile
  user/dchagin/lemul/share/man/man4/mod_cc.4
  user/dchagin/lemul/share/man/man4/ng_iface.4
  user/dchagin/lemul/share/man/man7/crypto.7
  user/dchagin/lemul/share/man/man9/netisr.9
  user/dchagin/lemul/sys/amd64/amd64/initcpu.c
  user/dchagin/lemul/sys/amd64/amd64/mem.c
  user/dchagin/lemul/sys/amd64/amd64/trap.c
  user/dchagin/lemul/sys/amd64/include/md_var.h
  user/dchagin/lemul/sys/amd64/include/vmm.h   (contents, props changed)
  user/dchagin/lemul/sys/amd64/include/vmm_dev.h   (contents, props changed)
  user/dchagin/lemul/sys/amd64/include/vmparam.h
  user/dchagin/lemul/sys/amd64/vmm/amd/svm.c
  user/dchagin/lemul/sys/amd64/vmm/intel/vmx.c
  user/dchagin/lemul/sys/amd64/vmm/vmm.c
  user/dchagin/lemul/sys/amd64/vmm/vmm_dev.c
  user/dchagin/lemul/sys/arm/allwinner/a20/a20_mp.c
  user/dchagin/lemul/sys/arm/altera/socfpga/socfpga_mp.c
  user/dchagin/lemul/sys/arm/arm/cpufunc.c
  user/dchagin/lemul/sys/arm/arm/gic.c
  user/dchagin/lemul/sys/arm/arm/identcpu.c
  user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  user/dchagin/lemul/sys/arm/conf/BEAGLEBONE
  user/dchagin/lemul/sys/arm/conf/RPI-B
  user/dchagin/lemul/sys/arm/freescale/imx/imx6_mp.c
  user/dchagin/lemul/sys/arm/include/armreg.h
  user/dchagin/lemul/sys/arm/include/intr.h
  user/dchagin/lemul/sys/arm/rockchip/rk30xx_mp.c
  user/dchagin/lemul/sys/arm/samsung/exynos/exynos5_mp.c
  user/dchagin/lemul/sys/arm/samsung/exynos/exynos_uart.c
  user/dchagin/lemul/sys/arm/ti/am335x/am335x_pmic.c
  user/dchagin/lemul/sys/arm/ti/am335x/am335x_prcm.c
  user/dchagin/lemul/sys/arm/ti/am335x/files.am335x
  user/dchagin/lemul/sys/arm/ti/omap4/omap4_mp.c
  user/dchagin/lemul/sys/arm/ti/ti_prcm.h
  user/dchagin/lemul/sys/arm/xilinx/zy7_mp.c
  user/dchagin/lemul/sys/boot/fdt/dts/arm/am335x.dtsi
  user/dchagin/lemul/sys/boot/usb/usbcore.mk
  user/dchagin/lemul/sys/cam/ata/ata_da.c
  user/dchagin/lemul/sys/cam/scsi/scsi_da.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  user/dchagin/lemul/sys/conf/files
  user/dchagin/lemul/sys/dev/ahci/ahci.h
  user/dchagin/lemul/sys/dev/ahci/ahci_pci.c
  user/dchagin/lemul/sys/dev/cxgbe/iw_cxgbe/cm.c
  user/dchagin/lemul/sys/dev/fdt/simplebus.c
  user/dchagin/lemul/sys/dev/ixl/i40e_adminq.c
  user/dchagin/lemul/sys/dev/ixl/i40e_adminq.h
  user/dchagin/lemul/sys/dev/ixl/i40e_adminq_cmd.h
  user/dchagin/lemul/sys/dev/ixl/i40e_common.c
  user/dchagin/lemul/sys/dev/ixl/i40e_lan_hmc.c
  user/dchagin/lemul/sys/dev/ixl/i40e_nvm.c
  user/dchagin/lemul/sys/dev/ixl/i40e_prototype.h
  user/dchagin/lemul/sys/dev/ixl/i40e_register.h
  user/dchagin/lemul/sys/dev/ixl/i40e_type.h
  user/dchagin/lemul/sys/dev/ixl/i40e_virtchnl.h
  user/dchagin/lemul/sys/dev/ixl/if_ixl.c
  user/dchagin/lemul/sys/dev/ixl/if_ixlv.c
  user/dchagin/lemul/sys/dev/ixl/ixl.h
  user/dchagin/lemul/sys/dev/ixl/ixl_txrx.c
  user/dchagin/lemul/sys/dev/mii/brgphy.c
  user/dchagin/lemul/sys/dev/mii/ciphy.c
  user/dchagin/lemul/sys/dev/mii/e1000phy.c
  user/dchagin/lemul/sys/dev/mii/ip1000phy.c
  user/dchagin/lemul/sys/dev/mii/jmphy.c
  user/dchagin/lemul/sys/dev/mii/mii.c
  user/dchagin/lemul/sys/dev/mii/miivar.h
  user/dchagin/lemul/sys/dev/mii/mlphy.c
  user/dchagin/lemul/sys/dev/mii/nsphy.c
  user/dchagin/lemul/sys/dev/mii/rgephy.c
  user/dchagin/lemul/sys/dev/mii/rlphy.c
  user/dchagin/lemul/sys/dev/mii/tlphy.c
  user/dchagin/lemul/sys/dev/mmc/mmcsd.c
  user/dchagin/lemul/sys/dev/nge/if_nge.c
  user/dchagin/lemul/sys/dev/ofw/ofw_bus_subr.c
  user/dchagin/lemul/sys/dev/ofw/ofw_bus_subr.h
  user/dchagin/lemul/sys/dev/ofw/ofwbus.c
  user/dchagin/lemul/sys/dev/sdhci/sdhci.c
  user/dchagin/lemul/sys/dev/sis/if_sis.c
  user/dchagin/lemul/sys/dev/uart/uart.h
  user/dchagin/lemul/sys/dev/uart/uart_bus_fdt.c
  user/dchagin/lemul/sys/dev/uart/uart_bus_pci.c
  user/dchagin/lemul/sys/dev/usb/controller/usb_controller.c
  user/dchagin/lemul/sys/dev/usb/template/usb_template.c
  user/dchagin/lemul/sys/dev/usb/template/usb_template.h
  user/dchagin/lemul/sys/dev/usb/usb_bus.h
  user/dchagin/lemul/sys/dev/usb/usb_dev.c
  user/dchagin/lemul/sys/dev/usb/usb_device.c
  user/dchagin/lemul/sys/dev/usb/usb_device.h
  user/dchagin/lemul/sys/dev/usb/usb_freebsd.h
  user/dchagin/lemul/sys/dev/usb/usb_freebsd_loader.h
  user/dchagin/lemul/sys/dev/usb/usb_ioctl.h
  user/dchagin/lemul/sys/dev/usb/usb_msctest.c
  user/dchagin/lemul/sys/dev/xen/netback/netback.c
  user/dchagin/lemul/sys/dev/xen/netfront/netfront.c
  user/dchagin/lemul/sys/fs/cuse/cuse.c
  user/dchagin/lemul/sys/fs/msdosfs/msdosfs_conv.c
  user/dchagin/lemul/sys/fs/msdosfs/msdosfs_fat.c
  user/dchagin/lemul/sys/fs/msdosfs/msdosfs_lookup.c
  user/dchagin/lemul/sys/i386/i386/initcpu.c
  user/dchagin/lemul/sys/i386/include/md_var.h
  user/dchagin/lemul/sys/kern/kern_time.c
  user/dchagin/lemul/sys/kern/subr_trap.c
  user/dchagin/lemul/sys/modules/cc/Makefile
  user/dchagin/lemul/sys/modules/ixl/Makefile
  user/dchagin/lemul/sys/modules/ixlv/Makefile
  user/dchagin/lemul/sys/modules/usb/template/Makefile
  user/dchagin/lemul/sys/net80211/ieee80211_ratectl.h
  user/dchagin/lemul/sys/netgraph/ng_iface.c
  user/dchagin/lemul/sys/netinet/cc.h
  user/dchagin/lemul/sys/netinet/ip_fastfwd.c
  user/dchagin/lemul/sys/netinet/sctp_asconf.c
  user/dchagin/lemul/sys/netinet/sctp_input.c
  user/dchagin/lemul/sys/netinet/sctp_output.c
  user/dchagin/lemul/sys/netinet/sctp_pcb.c
  user/dchagin/lemul/sys/netinet/sctputil.c
  user/dchagin/lemul/sys/netinet/tcp_input.c
  user/dchagin/lemul/sys/netinet6/ip6_output.c
  user/dchagin/lemul/sys/sys/mbuf.h
  user/dchagin/lemul/sys/sys/proc.h
  user/dchagin/lemul/sys/vm/vm_fault.c
  user/dchagin/lemul/sys/x86/iommu/intel_ctx.c
  user/dchagin/lemul/sys/x86/iommu/intel_dmar.h
  user/dchagin/lemul/sys/x86/iommu/intel_idpgtbl.c
  user/dchagin/lemul/sys/x86/iommu/intel_utils.c
  user/dchagin/lemul/sys/x86/x86/identcpu.c
  user/dchagin/lemul/tools/build/mk/OptionalObsoleteFiles.inc
  user/dchagin/lemul/usr.bin/sed/process.c
  user/dchagin/lemul/usr.sbin/fstyp/ext2fs.c
  user/dchagin/lemul/usr.sbin/makefs/ffs.c
Directory Properties:
  user/dchagin/lemul/   (props changed)
  user/dchagin/lemul/contrib/compiler-rt/   (props changed)
  user/dchagin/lemul/contrib/elftoolchain/   (props changed)
  user/dchagin/lemul/contrib/unbound/   (props changed)
  user/dchagin/lemul/etc/   (props changed)
  user/dchagin/lemul/lib/libc/   (props changed)
  user/dchagin/lemul/share/   (props changed)
  user/dchagin/lemul/share/man/man4/   (props changed)
  user/dchagin/lemul/sys/   (props changed)
  user/dchagin/lemul/sys/amd64/vmm/   (props changed)
  user/dchagin/lemul/sys/boot/   (props changed)
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/   (props changed)
  user/dchagin/lemul/sys/conf/   (props changed)

Modified: user/dchagin/lemul/contrib/compiler-rt/lib/builtins/clear_cache.c
==============================================================================
--- user/dchagin/lemul/contrib/compiler-rt/lib/builtins/clear_cache.c	Tue Jan 13 22:16:55 2015	(r277152)
+++ user/dchagin/lemul/contrib/compiler-rt/lib/builtins/clear_cache.c	Tue Jan 13 22:21:20 2015	(r277153)
@@ -13,6 +13,11 @@
 #if __APPLE__
   #include <libkern/OSCacheControl.h>
 #endif
+#if defined(__FreeBSD__) && defined(__arm__)
+  #include <sys/types.h>
+  #include <machine/sysarch.h>
+#endif
+
 #if defined(__NetBSD__) && defined(__arm__)
   #include <machine/sysarch.h>
 #endif
@@ -39,7 +44,7 @@ void __clear_cache(void *start, void *en
  * so there is nothing to do
  */
 #elif defined(__arm__) && !defined(__APPLE__)
-    #if defined(__NetBSD__)
+    #if defined(__FreeBSD__) || defined(__NetBSD__)
         struct arm_sync_icache_args arg;
 
         arg.addr = (uintptr_t)start;

Modified: user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_attrval.c
==============================================================================
--- user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_attrval.c	Tue Jan 13 22:16:55 2015	(r277152)
+++ user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_attrval.c	Tue Jan 13 22:21:20 2015	(r277153)
@@ -125,6 +125,7 @@ dwarf_attrval_signed(Dwarf_Die die, Dwar
 		break;
 	case DW_FORM_data4:
 		*valp = (int32_t) at->u[0].s64;
+		break;
 	case DW_FORM_data8:
 	case DW_FORM_sdata:
 		*valp = at->u[0].s64;

Modified: user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4-abi.h
==============================================================================
--- user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4-abi.h	Tue Jan 13 22:16:55 2015	(r277152)
+++ user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4-abi.h	Tue Jan 13 22:21:20 2015	(r277153)
@@ -38,6 +38,13 @@
 #define MLX4_UVERBS_MIN_ABI_VERSION	2
 #define MLX4_UVERBS_MAX_ABI_VERSION	4
 
+struct mlx4_alloc_ucontext_resp_v3 {
+	struct ibv_get_context_resp	ibv_resp;
+	__u32				qp_tab_size;
+	__u16				bf_reg_size;
+	__u16				bf_regs_per_page;
+};
+
 struct mlx4_alloc_ucontext_resp {
 	struct ibv_get_context_resp	ibv_resp;
 	__u32				dev_caps;

Modified: user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4.c
==============================================================================
--- user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4.c	Tue Jan 13 22:16:55 2015	(r277152)
+++ user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4.c	Tue Jan 13 22:21:20 2015	(r277153)
@@ -142,8 +142,10 @@ static struct ibv_context *mlx4_alloc_co
 	struct mlx4_context	       *context;
 	struct ibv_get_context		cmd;
 	struct mlx4_alloc_ucontext_resp resp;
+	struct mlx4_alloc_ucontext_resp_v3 resp_v3;
 	int				i;
 	struct ibv_device_attr		dev_attrs;
+	unsigned int			bf_reg_size;
 
 	context = calloc(1, sizeof *context);
 	if (!context)
@@ -151,11 +153,26 @@ static struct ibv_context *mlx4_alloc_co
 
 	context->ibv_ctx.cmd_fd = cmd_fd;
 
-	if (ibv_cmd_get_context(&context->ibv_ctx, &cmd, sizeof cmd,
-				&resp.ibv_resp, sizeof resp))
-		goto err_free;
+	if (to_mdev(ibdev)->driver_abi_ver > 3) {
+		if (ibv_cmd_get_context(&context->ibv_ctx, &cmd, sizeof cmd,
+					&resp.ibv_resp, sizeof resp))
+			goto err_free;
+
+		context->num_qps	= resp.qp_tab_size;
+		context->num_xrc_srqs	= resp.qp_tab_size;
+		bf_reg_size		= resp.bf_reg_size;
+		context->cqe_size	= resp.cqe_size;
+	} else {
+		if (ibv_cmd_get_context(&context->ibv_ctx, &cmd, sizeof cmd,
+					&resp_v3.ibv_resp, sizeof resp_v3))
+			goto err_free;
+
+		context->num_qps	= resp_v3.qp_tab_size;
+		context->num_xrc_srqs	= resp_v3.qp_tab_size;
+		bf_reg_size		= resp_v3.bf_reg_size;
+		context->cqe_size	= 32;
+	}
 
-	context->num_qps	= resp.qp_tab_size;
 	context->qp_table_shift = ffs(context->num_qps) - 1 - MLX4_QP_TABLE_BITS;
 	context->qp_table_mask	= (1 << context->qp_table_shift) - 1;
 
@@ -163,7 +180,6 @@ static struct ibv_context *mlx4_alloc_co
 	for (i = 0; i < MLX4_QP_TABLE_SIZE; ++i)
 		context->qp_table[i].refcnt = 0;
 
-	context->num_xrc_srqs = resp.qp_tab_size;
 	context->xrc_srq_table_shift = ffs(context->num_xrc_srqs) - 1
 				       - MLX4_XRC_SRQ_TABLE_BITS;
 	context->xrc_srq_table_mask = (1 << context->xrc_srq_table_shift) - 1;
@@ -182,7 +198,7 @@ static struct ibv_context *mlx4_alloc_co
 	if (context->uar == MAP_FAILED)
 		goto err_free;
 
-	if (resp.bf_reg_size) {
+	if (bf_reg_size) {
 		context->bf_page = mmap(NULL, to_mdev(ibdev)->page_size,
 					PROT_WRITE, MAP_SHARED, cmd_fd,
 					to_mdev(ibdev)->page_size);
@@ -192,7 +208,7 @@ static struct ibv_context *mlx4_alloc_co
 				context->bf_page     = NULL;
 				context->bf_buf_size = 0;
 		} else {
-			context->bf_buf_size = resp.bf_reg_size / 2;
+			context->bf_buf_size = bf_reg_size / 2;
 			context->bf_offset   = 0;
 			pthread_spin_init(&context->bf_lock, PTHREAD_PROCESS_PRIVATE);
 		}
@@ -201,7 +217,6 @@ static struct ibv_context *mlx4_alloc_co
 		context->bf_buf_size = 0;
 	}
 
-	context->cqe_size = resp.cqe_size;
 	pthread_spin_init(&context->uar_lock, PTHREAD_PROCESS_PRIVATE);
 
 	context->ibv_ctx.ops = mlx4_ctx_ops;
@@ -294,6 +309,7 @@ found:
 
 	dev->ibv_dev.ops = mlx4_dev_ops;
 	dev->page_size   = sysconf(_SC_PAGESIZE);
+	dev->driver_abi_ver = abi_version;
 
 	return &dev->ibv_dev;
 }

Modified: user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4.h
==============================================================================
--- user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4.h	Tue Jan 13 22:16:55 2015	(r277152)
+++ user/dchagin/lemul/contrib/ofed/libmlx4/src/mlx4.h	Tue Jan 13 22:21:20 2015	(r277153)
@@ -162,6 +162,7 @@ enum {
 struct mlx4_device {
 	struct ibv_device		ibv_dev;
 	int				page_size;
+	int				driver_abi_ver;
 };
 
 struct mlx4_db_page;

Modified: user/dchagin/lemul/contrib/unbound/config.h
==============================================================================
--- user/dchagin/lemul/contrib/unbound/config.h	Tue Jan 13 22:16:55 2015	(r277152)
+++ user/dchagin/lemul/contrib/unbound/config.h	Tue Jan 13 22:21:20 2015	(r277153)
@@ -351,6 +351,9 @@
 /* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */
 /* #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST */
 
+/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */
+#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1
+
 /* Define if you have Swig libraries and header files. */
 /* #undef HAVE_SWIG */
 

Modified: user/dchagin/lemul/contrib/unbound/config.h.in
==============================================================================
--- user/dchagin/lemul/contrib/unbound/config.h.in	Tue Jan 13 22:16:55 2015	(r277152)
+++ user/dchagin/lemul/contrib/unbound/config.h.in	Tue Jan 13 22:21:20 2015	(r277153)
@@ -350,6 +350,9 @@
 /* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */
 #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST
 
+/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */
+#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
+
 /* Define if you have Swig libraries and header files. */
 #undef HAVE_SWIG
 

Modified: user/dchagin/lemul/contrib/unbound/configure
==============================================================================
--- user/dchagin/lemul/contrib/unbound/configure	Tue Jan 13 22:16:55 2015	(r277152)
+++ user/dchagin/lemul/contrib/unbound/configure	Tue Jan 13 22:21:20 2015	(r277153)
@@ -1516,8 +1516,8 @@ Optional Packages:
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
-                          compiler's sysroot if not specified).
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
   --with-pthreads         use pthreads library, or --without-pthreads to
                           disable threading support.
   --with-solaris-threads  use solaris native thread library.
@@ -6555,8 +6555,8 @@ esac
 
 
 
-macro_version='2.4.2.418'
-macro_revision='2.4.2.418'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -6570,7 +6570,7 @@ macro_revision='2.4.2.418'
 
 
 
-ltmain=$ac_aux_dir/ltmain.sh
+ltmain="$ac_aux_dir/ltmain.sh"
 
 # Backslashify metacharacters that are still active within
 # double-quoted strings.
@@ -6619,7 +6619,7 @@ func_echo_all ()
     $ECHO ""
 }
 
-case $ECHO in
+case "$ECHO" in
   printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
 $as_echo "printf" >&6; } ;;
   print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -6812,19 +6812,19 @@ test -z "$GREP" && GREP=grep
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test yes = "$GCC"; then
+if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
+    # gcc leaves a trailing carriage return which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -6838,7 +6838,7 @@ $as_echo_n "checking for ld used by $CC.
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      test -z "$LD" && LD=$ac_prog
+      test -z "$LD" && LD="$ac_prog"
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -6849,7 +6849,7 @@ $as_echo_n "checking for ld used by $CC.
     with_gnu_ld=unknown
     ;;
   esac
-elif test yes = "$with_gnu_ld"; then
+elif test "$with_gnu_ld" = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
@@ -6860,32 +6860,32 @@ if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
+      lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
+	test "$with_gnu_ld" != no && break
 	;;
       *)
-	test yes != "$with_gnu_ld" && break
+	test "$with_gnu_ld" != yes && break
 	;;
       esac
     fi
   done
-  IFS=$lt_save_ifs
+  IFS="$lt_save_ifs"
 else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD=$lt_cv_path_LD
+LD="$lt_cv_path_LD"
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -6928,33 +6928,33 @@ if ${lt_cv_path_NM+:} false; then :
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM=$NM
+  lt_cv_path_NM="$NM"
 else
-  lt_nm_to_check=${ac_tool_prefix}nm
+  lt_nm_to_check="${ac_tool_prefix}nm"
   if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
+      IFS="$lt_save_ifs"
       test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
 	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
 	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
 	*/dev/null* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
+	  break
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
+	    break
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -6965,15 +6965,15 @@ else
 	esac
       fi
     done
-    IFS=$lt_save_ifs
+    IFS="$lt_save_ifs"
   done
   : ${lt_cv_path_NM=no}
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
   if test -n "$DUMPBIN"; then :
@@ -7079,9 +7079,9 @@ esac
   fi
 fi
 
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
     *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
+      DUMPBIN="$DUMPBIN -symbols"
       ;;
     *)
       DUMPBIN=:
@@ -7089,8 +7089,8 @@ fi
     esac
   fi
 
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
   fi
 fi
 test -z "$NM" && NM=nm
@@ -7141,7 +7141,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; the
   $as_echo_n "(cached) " >&6
 else
     i=0
-  teststring=ABCD
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -7181,7 +7181,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -7231,23 +7231,22 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
+      for i in 1 2 3 4 5 6 7 8 ; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
+	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -7265,7 +7264,7 @@ else
 
 fi
 
-if test -n "$lt_cv_sys_max_cmd_len"; then
+if test -n $lt_cv_sys_max_cmd_len ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
@@ -7283,6 +7282,30 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
@@ -7405,13 +7428,13 @@ esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
+    if test "$GCC" != yes; then
       reload_cmds=false
     fi
     ;;
   darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -7539,13 +7562,13 @@ lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
+# `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic [[regex]]' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix[4-9]*)
@@ -7572,7 +7595,8 @@ mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
@@ -7608,6 +7632,10 @@ freebsd* | dragonfly*)
   fi
   ;;
 
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7646,7 +7674,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -7668,8 +7696,8 @@ newos6*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -7879,8 +7907,8 @@ else
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
   case `$DLLTOOL --help 2>&1` in
   *--identify-strict*)
     lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -7892,7 +7920,7 @@ cygwin* | mingw* | pw32* | cegcc*)
   ;;
 *)
   # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
   ;;
 esac
 
@@ -8046,7 +8074,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      if test 0 -eq "$ac_status"; then
+      if test "$ac_status" -eq 0; then
 	# Ensure the archiver fails upon bogus file names.
 	rm -f conftest.$ac_objext libconftest.a
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -8054,7 +8082,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	if test 0 -ne "$ac_status"; then
+	if test "$ac_status" -ne 0; then
           lt_cv_ar_at_file=@
         fi
       fi
@@ -8067,7 +8095,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 $as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test no = "$lt_cv_ar_at_file"; then
+if test "x$lt_cv_ar_at_file" = xno; then
   archiver_list_spec=
 else
   archiver_list_spec=$lt_cv_ar_at_file
@@ -8284,7 +8312,7 @@ old_postuninstall_cmds=
 
 if test -n "$RANLIB"; then
   case $host_os in
-  bitrig* | openbsd*)
+  openbsd*)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
@@ -8416,7 +8444,7 @@ cygwin* | mingw* | pw32* | cegcc*)
   symcode='[ABCDGISTW]'
   ;;
 hpux*)
-  if test ia64 = "$host_cpu"; then
+  if test "$host_cpu" = ia64; then
     symcode='[ABCDEGRST]'
   fi
   ;;
@@ -8449,44 +8477,14 @@ case `$NM -V 2>&1` in
   symcode='[ABCDGIRSTW]' ;;
 esac
 
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
-$lt_c_name_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -8504,24 +8502,21 @@ for ac_symprfx in "" "_"; do
 
   # Write the raw and C identifiers.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 "     {if(hide[section]) next};"\
-"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
-"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -8569,11 +8564,11 @@ _LT_EOF
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
-#elif defined __osf__
+#elif defined(__osf__)
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
@@ -8599,7 +8594,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] =
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -8619,13 +8614,13 @@ _LT_EOF
 	  mv conftest.$ac_objext conftstm.$ac_objext
 	  lt_globsym_save_LIBS=$LIBS
 	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
+	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
 	  LIBS=$lt_globsym_save_LIBS
@@ -8646,7 +8641,7 @@ _LT_EOF
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
+  if test "$pipe_works" = yes; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -8699,16 +8694,6 @@ fi
 
 
 
-
-
-
-
-
-
-
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 $as_echo_n "checking for sysroot... " >&6; }
 
@@ -8721,9 +8706,9 @@ fi
 
 
 lt_sysroot=
-case $with_sysroot in #(
+case ${with_sysroot} in #(
  yes)
-   if test yes = "$GCC"; then
+   if test "$GCC" = yes; then
      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
    fi
    ;; #(
@@ -8733,8 +8718,8 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "$with_sysroot" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
@@ -8751,14 +8736,13 @@ if test "${enable_libtool_lock+set}" = s
   enableval=$enable_libtool_lock;
 fi
 
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
 ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
+  # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -8767,25 +8751,24 @@ ia64-*-hpux*)
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
-	HPUX_IA64_MODE=32
+	HPUX_IA64_MODE="32"
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE=64
+	HPUX_IA64_MODE="64"
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
+  # Find out which ABI we are using.
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -8814,50 +8797,9 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
 x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
+  # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -8871,14 +8813,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
+	    LD="${LD-ld} -m elf_i386"
 	    ;;
 	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
@@ -8923,7 +8858,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
+  SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -8963,14 +8898,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test yes != "$lt_cv_cc_needs_belf"; then
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
+    CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
 *-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
+  # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -8982,7 +8916,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
       case $lt_cv_prog_gnu_ld in
       yes*)
         case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
+        i?86-*-solaris*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
         sparc*-*-solaris*)
@@ -8991,7 +8925,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
         esac
         # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
         if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
+          LD="${LD-ld}_sol2"
         fi
         ;;
       *)
@@ -9007,7 +8941,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
   ;;
 esac
 
-need_locks=$enable_libtool_lock
+need_locks="$enable_libtool_lock"
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -9118,7 +9052,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 $as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test yes != "$lt_cv_path_mainfest_tool"; then
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
   MANIFEST_TOOL=:
 fi
 
@@ -9621,7 +9555,7 @@ if ${lt_cv_apple_cc_single_mod+:} false;
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
+      if test -z "${LT_MULTI_MODULE}"; then
 	# By default we will add the -single_module flag. You can override
 	# by either setting the environment variable LT_MULTI_MODULE
 	# non-empty at configure time, or by adding -multi_module to the
@@ -9639,7 +9573,7 @@ else
 	  cat conftest.err >&5
 	# Otherwise, if the output was created with a 0 exit code from
 	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -9678,7 +9612,7 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS=$save_LDFLAGS
+	LDFLAGS="$save_LDFLAGS"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -9707,7 +9641,7 @@ _LT_EOF
       _lt_result=$?
       if test -s conftest.err && $GREP force_load conftest.err; then
 	cat conftest.err >&5
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -9720,32 +9654,32 @@ fi
 $as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
       # target defaults to 10.4. Don't you love it?

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list