Index: head/contrib/jemalloc/include/jemalloc/internal/spin.h
===================================================================
--- head/contrib/jemalloc/include/jemalloc/internal/spin.h	(revision 322331)
+++ head/contrib/jemalloc/include/jemalloc/internal/spin.h	(revision 322332)
@@ -1,36 +1,30 @@
 #ifndef JEMALLOC_INTERNAL_SPIN_H
 #define JEMALLOC_INTERNAL_SPIN_H
 
-#ifdef JEMALLOC_SPIN_C_
-#  define SPIN_INLINE extern inline
-#else
-#  define SPIN_INLINE inline
-#endif
-
 #define SPIN_INITIALIZER {0U}
 
 typedef struct {
 	unsigned iteration;
 } spin_t;
 
-SPIN_INLINE void
+static inline void
 spin_adaptive(spin_t *spin) {
 	volatile uint32_t i;
 
 	if (spin->iteration < 5) {
 		for (i = 0; i < (1U << spin->iteration); i++) {
 			CPU_SPINWAIT;
 		}
 		spin->iteration++;
 	} else {
 #ifdef _WIN32
 		SwitchToThread();
 #else
 		sched_yield();
 #endif
 	}
 }
 
 #undef SPIN_INLINE
 
 #endif /* JEMALLOC_INTERNAL_SPIN_H */
Index: head/contrib/jemalloc/src/spin.c
===================================================================
--- head/contrib/jemalloc/src/spin.c	(revision 322331)
+++ head/contrib/jemalloc/src/spin.c	(nonexistent)
@@ -1,4 +0,0 @@
-#define JEMALLOC_SPIN_C_
-#include "jemalloc/internal/jemalloc_preamble.h"
-
-#include "jemalloc/internal/spin.h"

Property changes on: head/contrib/jemalloc/src/spin.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lib/libc/stdlib/jemalloc/Makefile.inc
===================================================================
--- head/lib/libc/stdlib/jemalloc/Makefile.inc	(revision 322331)
+++ head/lib/libc/stdlib/jemalloc/Makefile.inc	(revision 322332)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 .PATH: ${LIBC_SRCTOP}/stdlib/jemalloc
 
 JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bitmap.c ckh.c \
 	ctl.c extent.c extent_dss.c extent_mmap.c hash.c hooks.c large.c \
 	malloc_io.c mutex.c mutex_pool.c nstime.c pages.c prng.c prof.c \
-	rtree.c spin.c stats.c sz.c tcache.c ticker.c tsd.c witness.c
+	rtree.c stats.c sz.c tcache.c ticker.c tsd.c witness.c
 
 SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map
 
 CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include
 
 .for src in ${JEMALLOCSRCS}
 MISRCS+=jemalloc_${src}
 CLEANFILES+=jemalloc_${src}
 jemalloc_${src}: ${SRCTOP}/contrib/jemalloc/src/${src} .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
 
 MAN+=jemalloc.3
 CLEANFILES+=jemalloc.3
 jemalloc.3: ${SRCTOP}/contrib/jemalloc/doc/jemalloc.3 .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 MLINKS+= \
 	jemalloc.3 malloc.3 \
 	jemalloc.3 calloc.3 \
 	jemalloc.3 posix_memalign.3 \
 	jemalloc.3 aligned_alloc.3 \
 	jemalloc.3 realloc.3 \
 	jemalloc.3 free.3 \
 	jemalloc.3 malloc_usable_size.3 \
 	jemalloc.3 malloc_stats_print.3 \
 	jemalloc.3 mallctl.3 \
 	jemalloc.3 mallctlnametomib.3 \
 	jemalloc.3 mallctlbymib.3 \
 	jemalloc.3 mallocx.3 \
 	jemalloc.3 rallocx.3 \
 	jemalloc.3 xallocx.3 \
 	jemalloc.3 sallocx.3 \
 	jemalloc.3 dallocx.3 \
 	jemalloc.3 sdallocx.3 \
 	jemalloc.3 nallocx.3 \
 	jemalloc.3 malloc.conf.5
 
 .if defined(MALLOC_PRODUCTION)
 CFLAGS+=	-DMALLOC_PRODUCTION
 .endif