8 files changed, 48 insertions, 23 deletions

diff --git a/misc/rump/Makefile b/misc/rump/Makefile
index a704f850aae7..39c86c21a0e5 100644
--- a/misc/rump/Makefile
+++ b/misc/rump/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Virtualized NetBSD kernel components in userspace
 
 LICENSE=	BSD2CLAUSE
 
-NOT_FOR_ARCHS=	aarch64 armv6 mips mips64 powerpc powerpc64 sparc64
+NOT_FOR_ARCHS=	armv6 mips mips64 powerpc powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	not yet ported to FreeBSD on this architecture
 
 USE_GITHUB=	yes
@@ -23,6 +23,12 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+PLIST_SUB+= 	X8664=""
+.else
+PLIST_SUB+= 	X8664="@comment "
+.endif
+
 .if ${OSVERSION} >= 1100121
 CFLAGS+=	-Wno-address-of-packed-member
 .endif
diff --git a/misc/rump/files/patch-buildrump.sh b/misc/rump/files/patch-buildrump.sh
index 573a93960b54..e07922b0f0ee 100644
--- a/misc/rump/files/patch-buildrump.sh
+++ b/misc/rump/files/patch-buildrump.sh
@@ -1,6 +1,25 @@
 --- buildrump.sh.orig	2017-03-28 02:35:28 UTC
 +++ buildrump.sh
-@@ -1059,6 +1059,7 @@ evaltoolchain ()
+@@ -177,6 +177,9 @@ probeld ()
+ 	elif echo ${linkervers} | grep -q 'GNU gold' ; then
+ 		LD_FLAVOR=gold
+ 		LD_AS_NEEDED='-Wl,--no-as-needed'
++	elif echo ${linkervers} | grep -q 'LLD' ; then
++		LD_FLAVOR=GNU
++		LD_AS_NEEDED='-Wl,--no-as-needed'
+ 	elif echo ${linkervers} | grep -q 'Solaris Link Editor' ; then
+ 		LD_FLAVOR=sun
+ 		SHLIB_MKMAP=no
+@@ -788,6 +791,8 @@ makebuild ()
+ 	     -o ${MACHINE#evbearm} != ${MACHINE} \
+ 	     -o ${MACHINE#evbppc} != ${MACHINE} ]; then
+ 		DIRS_emul=sys/rump/kern/lib/libsys_linux
++	else
++		DIRS_emul=
+ 	fi
+ 	${SYS_SUNOS} && appendvar DIRS_emul sys/rump/kern/lib/libsys_sunos
+ 	if ${HIJACK}; then
+@@ -1059,6 +1064,7 @@ evaltoolchain ()
  		;;
  	*-freebsd*)
  		RUMPKERN_UNDEF='-U__FreeBSD__'
diff --git a/misc/rump/files/patch-src_sys_net_agr_if__agr.c b/misc/rump/files/patch-src_sys_net_agr_if__agr.c
index 335693928fe2..28a5c0b5cd99 100644
--- a/misc/rump/files/patch-src_sys_net_agr_if__agr.c
+++ b/misc/rump/files/patch-src_sys_net_agr_if__agr.c
@@ -1,6 +1,6 @@
 --- src/sys/net/agr/if_agr.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/net/agr/if_agr.c
-@@ -317,6 +317,7 @@ agr_clone_create(struct if_clone *ifc, i
+@@ -317,6 +317,7 @@ agr_clone_create(struct if_clone *ifc, int unit)
  {
  	struct agr_softc *sc;
  	struct ifnet *ifp;
@@ -8,7 +8,7 @@
  
  	sc = agr_alloc_softc();
  	TAILQ_INIT(&sc->sc_ports);
-@@ -330,7 +331,7 @@ agr_clone_create(struct if_clone *ifc, i
+@@ -330,7 +331,7 @@ agr_clone_create(struct if_clone *ifc, int unit)
  	    ifc->ifc_name, unit);
  
  	ifp->if_softc = sc;
diff --git a/misc/rump/files/patch-src_sys_net_if__pppoe.c b/misc/rump/files/patch-src_sys_net_if__pppoe.c
index 378145ad06af..411f6c6271f3 100644
--- a/misc/rump/files/patch-src_sys_net_if__pppoe.c
+++ b/misc/rump/files/patch-src_sys_net_if__pppoe.c
@@ -1,6 +1,6 @@
 --- src/sys/net/if_pppoe.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/net/if_pppoe.c
-@@ -227,7 +227,8 @@ pppoe_clone_create(struct if_clone *ifc,
+@@ -227,7 +227,8 @@ pppoe_clone_create(struct if_clone *ifc, int unit)
  	if_initname(&sc->sc_sppp.pp_if, "pppoe", unit);
  	sc->sc_sppp.pp_if.if_softc = sc;
  	sc->sc_sppp.pp_if.if_mtu = PPPOE_MAXMTU;
diff --git a/misc/rump/files/patch-src_sys_net_if__tap.c b/misc/rump/files/patch-src_sys_net_if__tap.c
index c7033561b685..e54bddc79500 100644
--- a/misc/rump/files/patch-src_sys_net_if__tap.c
+++ b/misc/rump/files/patch-src_sys_net_if__tap.c
@@ -1,6 +1,6 @@
 --- src/sys/net/if_tap.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/net/if_tap.c
-@@ -332,7 +332,8 @@ tap_attach(device_t parent, device_t sel
+@@ -332,7 +332,8 @@ tap_attach(device_t parent, device_t self, void *aux)
  	ifp = &sc->sc_ec.ec_if;
  	strcpy(ifp->if_xname, device_xname(self));
  	ifp->if_softc	= sc;
diff --git a/misc/rump/files/patch-src_sys_netinet_in__offload.c b/misc/rump/files/patch-src_sys_netinet_in__offload.c
index ff108ad0f591..6f00f22659ec 100644
--- a/misc/rump/files/patch-src_sys_netinet_in__offload.c
+++ b/misc/rump/files/patch-src_sys_netinet_in__offload.c
@@ -1,6 +1,6 @@
 --- src/sys/netinet/in_offload.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/netinet/in_offload.c
-@@ -210,9 +210,10 @@ ip_undefer_csum(struct mbuf *m, size_t h
+@@ -210,9 +210,10 @@ ip_undefer_csum(struct mbuf *m, size_t hdrlen, int csu
  
  	if (__predict_true(hdrlen + sizeof(struct ip) <= m->m_len)) {
  		struct ip *ip = (struct ip *)(mtod(m, uint8_t *) + hdrlen);
diff --git a/misc/rump/files/patch-src_sys_netinet_ip__carp.c b/misc/rump/files/patch-src_sys_netinet_ip__carp.c
index 2e46aa27a7db..958cf65cf55b 100644
--- a/misc/rump/files/patch-src_sys_netinet_ip__carp.c
+++ b/misc/rump/files/patch-src_sys_netinet_ip__carp.c
@@ -1,6 +1,6 @@
 --- src/sys/netinet/ip_carp.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/netinet/ip_carp.c
-@@ -827,7 +827,8 @@ carp_clone_create(struct if_clone *ifc, 
+@@ -827,7 +827,8 @@ carp_clone_create(struct if_clone *ifc, int unit)
  	ifp->if_softc = sc;
  	snprintf(ifp->if_xname, sizeof ifp->if_xname, "%s%d", ifc->ifc_name,
  	    unit);
diff --git a/misc/rump/pkg-plist b/misc/rump/pkg-plist
index bd30ecb87078..18f68aed7d0c 100644
--- a/misc/rump/pkg-plist
+++ b/misc/rump/pkg-plist
@@ -281,16 +281,16 @@ lib/librumpkern_crypto.so
 lib/librumpkern_crypto.so.0
 lib/librumpkern_crypto.so.0.0
 lib/librumpkern_crypto_pic.a
-lib/librumpkern_sljit.a
-lib/librumpkern_sljit.so
-lib/librumpkern_sljit.so.0
-lib/librumpkern_sljit.so.0.0
-lib/librumpkern_sljit_pic.a
-lib/librumpkern_sys_linux.a
-lib/librumpkern_sys_linux.so
-lib/librumpkern_sys_linux.so.0
-lib/librumpkern_sys_linux.so.0.0
-lib/librumpkern_sys_linux_pic.a
+%%X8664%%lib/librumpkern_sljit.a
+%%X8664%%lib/librumpkern_sljit.so
+%%X8664%%lib/librumpkern_sljit.so.0
+%%X8664%%lib/librumpkern_sljit.so.0.0
+%%X8664%%lib/librumpkern_sljit_pic.a
+%%X8664%%lib/librumpkern_sys_linux.a
+%%X8664%%lib/librumpkern_sys_linux.so
+%%X8664%%lib/librumpkern_sys_linux.so.0
+%%X8664%%lib/librumpkern_sys_linux.so.0.0
+%%X8664%%lib/librumpkern_sys_linux_pic.a
 lib/librumpkern_sysproxy.a
 lib/librumpkern_sysproxy.so
 lib/librumpkern_sysproxy.so.0
@@ -315,11 +315,11 @@ lib/librumpnet_agr.so
 lib/librumpnet_agr.so.0
 lib/librumpnet_agr.so.0.0
 lib/librumpnet_agr_pic.a
-lib/librumpnet_bpfjit.a
-lib/librumpnet_bpfjit.so
-lib/librumpnet_bpfjit.so.0
-lib/librumpnet_bpfjit.so.0.0
-lib/librumpnet_bpfjit_pic.a
+%%X8664%%lib/librumpnet_bpfjit.a
+%%X8664%%lib/librumpnet_bpfjit.so
+%%X8664%%lib/librumpnet_bpfjit.so.0
+%%X8664%%lib/librumpnet_bpfjit.so.0.0
+%%X8664%%lib/librumpnet_bpfjit_pic.a
 lib/librumpnet_bridge.a
 lib/librumpnet_bridge.so
 lib/librumpnet_bridge.so.0