o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

all: remove $OBJTYPE from build

Browse source 
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.
This commit is contained in:
Russ Cox 2020-12-30 07:39:16 -05:00
parent 0bd1478342
commit 99dee78c2d
56 changed files with 41 additions and 1291 deletions
Download patch file Download diff file Expand all files Collapse all files

21
bin/9a
View file

@ -1,21 +0,0 @@
#!/bin/sh
if [ $# != 1 ]; then
echo 'usage: 9a file.s' 1>&2
exit 1
fi
test -f $PLAN9/config && . $PLAN9/config
aflags=""
case "`uname`-${OBJTYPE:-`uname -m`}" in
Darwin-*386*)
aflags="-arch i386"
;;
Darwin-*x86_64*)
aflags="-arch x86_64"
;;
esac
out=`echo $1 | sed 's/\.s$//;s/$/.o/'`
exec as $aflags -o $out $1

14
bin/9c
View file

@ -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

12
bin/9l
View file

@ -9,7 +9,7 @@ verbose=false
nmflags=""
extralibs="-lm"
tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
tag="${SYSNAME:-`uname`}"
case "$tag" in
*DragonFly*|*BSD*)
ld="${CC9:-gcc} $CC9FLAGS"
@ -27,14 +27,8 @@ case "$tag" in
userpath=true
extralibs="$extralibs -lutil -lresolv -lpthread"
;;
*Darwin*x86_64*)
ld="${CC9:-gcc} -m64 $CC9FLAGS"
;;
*Darwin-arm64*)
ld="${CC9:-gcc} -m64 $CC9FLAGS"
;;
*Darwin*)
ld="${CC9:-gcc} -m32 $CC9FLAGS"
ld="${CC9:-gcc} -m64 $CC9FLAGS"
;;
*SunOS*)
ld="${CC9:-cc} -g $CC9FLAGS"
@ -255,7 +249,7 @@ then
fi
# Don't say -L with a non-existent directory: Xcode complains.
# x86_64 seems to put its 64-bit libraries in lib64.
if [ "${OBJTYPE:-`uname -m`}" = "x86_64" -a -d "$X11/lib64" ]
if [ "`uname -m`" = "x86_64" -a -d "$X11/lib64" ]
then
libsl="$libsl -L$X11/lib64"
fi