diff --git a/bin/package b/bin/package
index 1e7b8309b..d7f880dc7 100755
--- a/bin/package
+++ b/bin/package
@@ -2487,7 +2487,7 @@ int b() { return 0; }
 			;;
 		*)	case $bits in
 			'')	case `file /bin/sh 2>/dev/null` in
-				*universal*64*)
+				*universal*64* | *64-bit* | *x86[_-]64*)
 					pwd=`pwd`
 					cd ${TMPDIR:-/tmp}
 					tmp=hi$$
diff --git a/src/cmd/INIT/cc.darwin b/src/cmd/INIT/cc.darwin
index 081bd43b5..ef081a0b4 100755
--- a/src/cmd/INIT/cc.darwin
+++ b/src/cmd/INIT/cc.darwin
@@ -1,4 +1,4 @@
-: unix wrapper for mac osx cc : 2012-01-20 :
+: unix wrapper for macOS cc : 2020-05-13 :
 
 HOSTTYPE=darwin.generic
 
@@ -45,29 +45,11 @@ init)	echo "cc: arguments expected" >&2
 	;;
 cpp)	$CC -E "$@"
 	;;
-cc)	$CC -DCLK_TCK=100 "$@"
+cc)	$CC -DSHOPT_SPAWN=0 -D_ast_int8_t=int64_t -D_lib_memccpy \
+		-Wno-unused-value -Wno-parentheses "$@"
 	;;
-dll)	# what a compatibility mess -- surely they can get the apis to play nice
-	tmp=/tmp/cc.${USER:-$LOGNAME}.$$.err
-	trap "rm -f $tmp" EXIT
-	case `MACOSX_DEPLOYMENT_TARGET=10.3 ld -undefined dynamic_lookup 2>&1` in
-	*undefined*dynamic_lookup*)
-		ld -m -flat_namespace -undefined suppress -dylib -dynamic \
-			-ldylib1.o "$@" -lcc_dynamic -framework System >$tmp 2>&1
-		status=$?
-		;;
-	*)	MACOSX_DEPLOYMENT_TARGET=10.3 $CC -Wl,-flat_namespace -dynamiclib -undefined dynamic_lookup "$@" >$tmp 2>&1
-		status=$?
-		;;
-	esac
-	egrep -v ' (warning .*multiple definitions|definition) of ' $tmp >&2
-	exit $status
+dll)	$CC -Wl,-flat_namespace -dynamiclib -undefined dynamic_lookup "$@"
 	;;
-ld)	tmp=/tmp/cc.${USER:-$LOGNAME}.$$.err
-	trap "rm -f $tmp" EXIT
-	$CC -Wl,-m -DCLK_TCK=100 "$@" >$tmp 2>&1
-	status=$?
-	egrep -v ' (warning .*multiple definitions of|definition of|as lazy binding|not from earlier dynamic) ' $tmp >&2
-	exit $status
+ld)	$CC -Wl,-search_paths_first "$@"
 	;;
 esac
diff --git a/src/cmd/INIT/cc.darwin.i386 b/src/cmd/INIT/cc.darwin.i386
deleted file mode 100755
index 9afde8dd1..000000000
--- a/src/cmd/INIT/cc.darwin.i386
+++ /dev/null
@@ -1,73 +0,0 @@
-: unix wrapper for mac osx cc : 2012-02-29 :
-
-HOSTTYPE=darwin.i386
-
-case " $* " in
-*" -dumpmachine "*) echo $HOSTTYPE; exit ;;
-esac
-
-CC='/usr/bin/cc -m32'
-op=init
-for arg
-do	case $op in
-	init)	op=ld
-		set ''
-		;;
-	esac
-	case $arg in
-	-c)	op=cc
-		;;
-	-E)	op=cpp
-		continue
-		;;
-	-G)	op=dll
-		continue
-		;;
-	-lc)	continue
-		;;
-	-lm)	continue
-		;;
-	-O)	continue
-		;;
-	esac
-	set "$@" "$arg"
-done
-case $# in
-0)	;;
-*)	shift ;;
-esac
-case $* in
--v)	$CC "$@"; exit ;;
-esac
-case $op in
-init)	echo "cc: arguments expected" >&2
-	exit 1
-	;;
-cpp)	$CC -E "$@"
-	;;
-cc)	$CC -DCLK_TCK=100 "$@"
-	;;
-dll)	# what a compatibility mess -- surely they can get the apis to play nice
-	tmp=/tmp/cc.${USER:-$LOGNAME}.$$.err
-	trap "rm -f $tmp" EXIT
-	case `MACOSX_DEPLOYMENT_TARGET=10.3 ld -undefined dynamic_lookup 2>&1` in
-	*undefined*dynamic_lookup*)
-		ld -m -flat_namespace -undefined suppress -dylib -dynamic \
-			-ldylib1.o "$@" -lcc_dynamic -framework System >$tmp 2>&1
-		status=$?
-		;;
-	*)	MACOSX_DEPLOYMENT_TARGET=10.3 $CC -Wl,-flat_namespace -dynamiclib -undefined dynamic_lookup "$@" >$tmp 2>&1
-		status=$?
-		;;
-	esac
-	egrep -v ' (warning .*multiple definitions|definition) of ' $tmp >&2
-	exit $status
-	;;
-ld)	tmp=/tmp/cc.${USER:-$LOGNAME}.$$.err
-	trap "rm -f $tmp" EXIT
-	$CC -Wl,-m -DCLK_TCK=100 "$@" >$tmp 2>&1
-	status=$?
-	egrep -v ' (warning .*multiple definitions of|definition of|as lazy binding|not from earlier dynamic) ' $tmp >&2
-	exit $status
-	;;
-esac
diff --git a/src/cmd/INIT/cc.darwin.i386-64 b/src/cmd/INIT/cc.darwin.i386-64
deleted file mode 100755
index 9010d96b2..000000000
--- a/src/cmd/INIT/cc.darwin.i386-64
+++ /dev/null
@@ -1,73 +0,0 @@
-: unix wrapper for mac osx cc : 2012-02-29 :
-
-HOSTTYPE=darwin.i386-64
-
-case " $* " in
-*" -dumpmachine "*) echo $HOSTTYPE; exit ;;
-esac
-
-CC=/usr/bin/cc
-op=init
-for arg
-do	case $op in
-	init)	op=ld
-		set ''
-		;;
-	esac
-	case $arg in
-	-c)	op=cc
-		;;
-	-E)	op=cpp
-		continue
-		;;
-	-G)	op=dll
-		continue
-		;;
-	-lc)	continue
-		;;
-	-lm)	continue
-		;;
-	-O)	continue
-		;;
-	esac
-	set "$@" "$arg"
-done
-case $# in
-0)	;;
-*)	shift ;;
-esac
-case $* in
--v)	$CC "$@"; exit ;;
-esac
-case $op in
-init)	echo "cc: arguments expected" >&2
-	exit 1
-	;;
-cpp)	$CC -E "$@"
-	;;
-cc)	$CC -DCLK_TCK=100 "$@"
-	;;
-dll)	# what a compatibility mess -- surely they can get the apis to play nice
-	tmp=/tmp/cc.${USER:-$LOGNAME}.$$.err
-	trap "rm -f $tmp" EXIT
-	case `MACOSX_DEPLOYMENT_TARGET=10.3 ld -undefined dynamic_lookup 2>&1` in
-	*undefined*dynamic_lookup*)
-		ld -m -flat_namespace -undefined suppress -dylib -dynamic \
-			-ldylib1.o "$@" -lcc_dynamic -framework System >$tmp 2>&1
-		status=$?
-		;;
-	*)	MACOSX_DEPLOYMENT_TARGET=10.3 $CC -Wl,-flat_namespace -dynamiclib -undefined dynamic_lookup "$@" >$tmp 2>&1
-		status=$?
-		;;
-	esac
-	egrep -v ' (warning .*multiple definitions|definition) of ' $tmp >&2
-	exit $status
-	;;
-ld)	tmp=/tmp/cc.${USER:-$LOGNAME}.$$.err
-	trap "rm -f $tmp" EXIT
-	$CC -Wl,-m -DCLK_TCK=100 "$@" >$tmp 2>&1
-	status=$?
-	egrep -v ' (warning .*multiple definitions of|definition of|as lazy binding|not from earlier dynamic) ' $tmp >&2
-	exit $status
-	;;
-esac
diff --git a/src/cmd/INIT/package.sh b/src/cmd/INIT/package.sh
index 42c1ebab3..ca116b56d 100644
--- a/src/cmd/INIT/package.sh
+++ b/src/cmd/INIT/package.sh
@@ -2486,7 +2486,7 @@ int b() { return 0; }
 			;;
 		*)	case $bits in
 			'')	case `file /bin/sh 2>/dev/null` in
-				*universal*64*)
+				*universal*64* | *64-bit* | *x86[_-]64*)
 					pwd=`pwd`
 					cd ${TMPDIR:-/tmp}
 					tmp=hi$$