all: remove Linux 2.4 vs 2.6 detection
Linux 2.4 is dead. (The libthread code hasn't worked for Linux 2.4 for a long time.)
This commit is contained in:
parent
8d82ccefd2
commit
cb8f735786
9 changed files with 28 additions and 130 deletions
14
bin/9c
14
bin/9c
|
|
@ -93,28 +93,20 @@ case "$tag" in
|
|||
useclang
|
||||
cflags="$ngflags -g3 -m32"
|
||||
;;
|
||||
*Darwin*) usegcc
|
||||
*Darwin*) usegcc
|
||||
cflags="$ngflags -g3 -no-cpp-precomp -m32" ;;
|
||||
*HP-UX*) cc=${CC9:-cc}; cflags="-g -O -c -Ae" ;;
|
||||
*Linux*) usegcc
|
||||
*Linux*) usegcc
|
||||
case "${CC9:-gcc}" in
|
||||
tcc)
|
||||
cc=tcc
|
||||
cflags="-c -g"
|
||||
;;
|
||||
esac
|
||||
case "${SYSVERSION:-`uname -r`}" in
|
||||
2.4.*)
|
||||
cflags="$cflags -D__Linux24__"
|
||||
;;
|
||||
2.6.*)
|
||||
cflags="$cflags -D__Linux26__"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*OSF1*) cc=${CC9:-cc}; cflags="-g -O -c" ;;
|
||||
*SunOS*-cc) cc=cc;
|
||||
cflags="-mt -g -O -c -xCC -D__sun__"
|
||||
cflags="-mt -g -O -c -xCC -D__sun__"
|
||||
u=`uname`
|
||||
v=`uname -r`
|
||||
s=`echo $u$v | tr '. ' '__'`
|
||||
|
|
|
|||
17
bin/9l
17
bin/9l
|
|
@ -25,12 +25,7 @@ case "$tag" in
|
|||
*Linux*)
|
||||
ld=${CC9:-gcc}
|
||||
userpath=true
|
||||
extralibs="$extralibs -lutil -lresolv"
|
||||
case "${SYSVERSION:-`uname -r`}" in
|
||||
2.6.* | [3-9].* | [1-9][0-9].*)
|
||||
extralibs="$extralibs -lpthread"
|
||||
;;
|
||||
esac
|
||||
extralibs="$extralibs -lutil -lresolv -lpthread"
|
||||
;;
|
||||
*Darwin*x86_64*)
|
||||
ld="${CC9:-gcc} -m64"
|
||||
|
|
@ -41,7 +36,7 @@ case "$tag" in
|
|||
*SunOS*)
|
||||
ld="${CC9:-cc} -g"
|
||||
extralibs="$extralibs -lrt -lpthread -lsocket -lnsl"
|
||||
# Record paths to shared libraries to avoid needing LD_LIBRARY_PATH
|
||||
# Record paths to shared libraries to avoid needing LD_LIBRARY_PATH
|
||||
for i in "$libsl $@"
|
||||
do
|
||||
case "$i" in
|
||||
|
|
@ -106,7 +101,7 @@ then
|
|||
lpaths="$lpaths $l"
|
||||
esac
|
||||
done
|
||||
|
||||
|
||||
if $verbose
|
||||
then
|
||||
echo "ofiles $ofiles"
|
||||
|
|
@ -309,7 +304,7 @@ then
|
|||
|
||||
frameworks=""
|
||||
for i in $autoframeworks
|
||||
do
|
||||
do
|
||||
frameworks="-framework $i $frameworks"
|
||||
done
|
||||
fi
|
||||
|
|
@ -335,8 +330,8 @@ fi
|
|||
|
||||
xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out"
|
||||
xxout() {
|
||||
sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . |
|
||||
egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub'
|
||||
sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . |
|
||||
egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub'
|
||||
rm -f $xtmp
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue