From 69439fae6705a125047246c889384ed3aeb4d104 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 00:06:35 -0500
Subject: 9c: use -fcommon for clang

Fixes #469.
---
 bin/9c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/9c')

diff --git a/bin/9c b/bin/9c
index 59adda7f..9dfc082e 100755
--- a/bin/9c
+++ b/bin/9c
@@ -83,6 +83,7 @@ useclang()
 		-Wno-unneeded-internal-declaration \
 		-fsigned-char \
 		-fno-caret-diagnostics \
+		-fcommon \
 	"
 	cflags="$cflags -g"
 	cflags="$cflags $CC9FLAGS"
-- 
cgit v1.2.3


From 99dee78c2d44641ba56e5bb640d732f993b3dfa1 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 07:39:16 -0500
Subject: all: remove $OBJTYPE from build

Now that we assume pthreads, the only assembly
left is in libmp and libsec.
We only ever added assembly for 386.
The portable C code is fine for plan9port.
---
 bin/9c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'bin/9c')

diff --git a/bin/9c b/bin/9c
index 9dfc082e..4d488179 100755
--- a/bin/9c
+++ b/bin/9c
@@ -112,24 +112,14 @@ usexlc()
 	cflags="$cflags $CC9FLAGS"
 }
 
-tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}-${CC9:-cc}"
+tag="${SYSNAME:-`uname`}-${CC9:-cc}"
 case "$tag" in
 *DragonFly*gcc*|*BSD*gcc*)	usegcc ;;
 *DragonFly*clang|*BSD*clang*)	useclang ;;
-*Darwin-x86_64*)
+*Darwin*)
 		useclang
 		cflags="$cflags -g3 -m64"
 		;;
-*Darwin-arm64*)
-		useclang
-		cflags="$cflags -g3 -m64"
-		;;
-*Darwin*clang*)
-		useclang
-		cflags="$cflags -g3 -m32"
-		;;
-*Darwin*)	usegcc
-		cflags="$cflags -g3 -no-cpp-precomp -m32" ;;
 *HP-UX*)	cc=${CC9:-cc}; cflags="-g -O -c -Ae" ;;
 *Linux*)	usegcc
 		case "${CC9:-gcc}" in
-- 
cgit v1.2.3


From 4692dd4786f8847494d3f020bc3c05ba210adc0d Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 08:38:55 -0500
Subject: 9c: drop PLAN9PORT_ASAN

It is no longer special.
---
 bin/9c | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'bin/9c')

diff --git a/bin/9c b/bin/9c
index 4d488179..63840b19 100755
--- a/bin/9c
+++ b/bin/9c
@@ -26,10 +26,6 @@ usegcc()
 	# that option only works with gcc3+ it seems
 	cflags="$cflags -ggdb"
 	cflags="$cflags $CC9FLAGS"
-	case "$cflags" in
-	*sanitize=address*)
-		cflags="$cflags -DPLAN9PORT_ASAN"
-	esac
 }
 
 quiet()
@@ -87,11 +83,6 @@ useclang()
 	"
 	cflags="$cflags -g"
 	cflags="$cflags $CC9FLAGS"
-
-	case "$cflags" in
-	*sanitize=address*)
-		cflags="$cflags -DPLAN9PORT_ASAN"
-	esac
 }
 
 usexlc()
-- 
cgit v1.2.3