From 4982d4ebc3bd4924d73f2f2ad584309e9ec97435 Mon Sep 17 00:00:00 2001
From: Ben Huntsman <BHuntsman@mail2.cu-portland.edu>
Date: Mon, 4 May 2020 19:52:02 -0700
Subject: all: update build scripts to fix AIX XL/C compatibility

---
 bin/9l | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'bin/9l')

diff --git a/bin/9l b/bin/9l
index a10aab72..398adbd8 100755
--- a/bin/9l
+++ b/bin/9l
@@ -61,8 +61,9 @@ case "$tag" in
 	esac
 	;;
 *AIX*)
-	ld=${CC9:-gcc}
-	nmflags="-B"
+	ld="${CC9:-xlc_r} -g -O0"
+	nmflags="-A -B"
+	extralibs="$extralibs -lpthread"
 	;;
 *)
 	echo do not know how to link on "$tag" 1>&2
@@ -113,8 +114,8 @@ then
 	then
 		a=`
 			nm $nmflags $ofiles |
-			grep '__p9l_autolib_[a-zA-Z0-9+-]*$' |
-			sed 's/.*__p9l_autolib_//' |
+			grep '__p9l_autolib_[a-zA-Z0-9+-]*' |
+			sed 's/.*__p9l_autolib_//; s/:.*//' |
 			sort -u
 		`
 		for i in $a
@@ -144,8 +145,8 @@ then
 			do
 				b=`
 					nm $lpath/lib$i.a 2>/dev/null |
-					grep '__p9l_autolib_[a-zA-Z0-9+-]*$' |
-					sed 's/.*__p9l_autolib_//' |
+					grep '__p9l_autolib_[a-zA-Z0-9+-]*' |
+					sed 's/.*__p9l_autolib_//; s/:.*//' |
 					sort -u |
 					egrep -v '^(thread|draw)$'
 				`
-- 
cgit v1.2.3


From 9444b8e4bc847f8fd9d02466976b962288cedf31 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Sun, 17 May 2020 20:07:52 -0400
Subject: 9c, 9l: accept CC9FLAGS from config

Also, if CC9FLAGS includes -fsanitize=address (ASAN),
predefine PLAN9PORT_ASAN for use by programs that need
to know (mainly libthread).

The 9c script used to have a variable called ngflags, which
was ccflags except -g (ng stood for "no g"), but nothing needs
it split out anymore, so simplify to just ccflags.
---
 bin/9l | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'bin/9l')

diff --git a/bin/9l b/bin/9l
index 398adbd8..875e103a 100755
--- a/bin/9l
+++ b/bin/9l
@@ -12,29 +12,29 @@ extralibs="-lm"
 tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
 case "$tag" in
 *DragonFly*|*BSD*)
-	ld=${CC9:-gcc}
+	ld="${CC9:-gcc} $CC9FLAGS"
 	userpath=true
 	extralibs="$extralibs -lutil"
 	;;
 *OSF1*)
-	ld=${CC9:-cc}
+	ld="${CC9:-cc} $CC9FLAGS"
 	userpath=true
 	extralibs="$extralibs -lutil"
 	nmflags="-B"
 	;;
 *Linux*)
-	ld=${CC9:-gcc}
+	ld="${CC9:-gcc} $CC9FLAGS"
 	userpath=true
 	extralibs="$extralibs -lutil -lresolv -lpthread"
 	;;
 *Darwin*x86_64*)
-	ld="${CC9:-gcc} -m64"
+	ld="${CC9:-gcc} -m64 $CC9FLAGS"
 	;;
 *Darwin*)
-	ld="${CC9:-gcc} -m32"
+	ld="${CC9:-gcc} -m32 $CC9FLAGS"
 	;;
 *SunOS*)
-	ld="${CC9:-cc} -g"
+	ld="${CC9:-cc} -g $CC9FLAGS"
 	extralibs="$extralibs -lrt -lpthread -lsocket -lnsl"
 	# Record paths to shared libraries to avoid needing LD_LIBRARY_PATH
 	for i in "$libsl $@"
@@ -61,7 +61,7 @@ case "$tag" in
 	esac
 	;;
 *AIX*)
-	ld="${CC9:-xlc_r} -g -O0"
+	ld="${CC9:-xlc_r} -g -O0 $CC9FLAGS"
 	nmflags="-A -B"
 	extralibs="$extralibs -lpthread"
 	;;
-- 
cgit v1.2.3


From 53bf1f1ccf9a6fee9437649216ac047f80590fae Mon Sep 17 00:00:00 2001
From: Ben Huntsman <BHuntsman@mail2.cu-portland.edu>
Date: Mon, 18 May 2020 12:20:48 -0700
Subject: 9l: xlc_r automatically adds -lpthread.

---
 bin/9l | 1 -
 1 file changed, 1 deletion(-)

(limited to 'bin/9l')

diff --git a/bin/9l b/bin/9l
index 875e103a..b4f91584 100755
--- a/bin/9l
+++ b/bin/9l
@@ -63,7 +63,6 @@ case "$tag" in
 *AIX*)
 	ld="${CC9:-xlc_r} -g -O0 $CC9FLAGS"
 	nmflags="-A -B"
-	extralibs="$extralibs -lpthread"
 	;;
 *)
 	echo do not know how to link on "$tag" 1>&2
-- 
cgit v1.2.3