JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

new option -combine (complementary to -llvm):

Browse Source 
compile all source files at once using -fwhole-program --combine,
similarily to how it used to be done in older mksh versions, except
that the flags are now hardcoded; tested with llvm-gcc4.2 from MirPorts
This commit is contained in:
tg 2008-12-20 20:39:05 +00:00
parent d363c6a729
commit dc79b9b118
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Build.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.373 2008/11/13 00:36:07 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.374 2008/12/20 20:39:05 tg Exp $'
#- #-
# Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS # Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS
# CPPFLAGS recognised: MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NOPWNAM MKSH_NOVI # CPPFLAGS recognised: MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NOPWNAM MKSH_NOVI
@ -232,6 +232,9 @@ do
-j) -j)
pm=1 pm=1
;; ;;
-combine)
llvm=COMBINE
;;
-llvm) -llvm)
llvm=-std-compile-opts llvm=-std-compile-opts
;; ;;
@ -611,7 +614,7 @@ xlc)
ct=unknown ct=unknown
;; ;;
esac esac
test x"$llvm" = x"NO" || vv '|' "llc -version" test x"$llvm" = x"NO" || test x"$llvm" = x"COMBINE" || vv '|' "llc -version"
$e "$bi==> which compiler seems to be used...$ao $ui$ct$ao" $e "$bi==> which compiler seems to be used...$ao $ui$ct$ao"
rm -f scn.c scn.o scn a.out* a.exe* rm -f scn.c scn.o scn a.out* a.exe*
@ -1314,6 +1317,8 @@ EOF
chmod 755 test.sh chmod 755 test.sh
if test x"$llvm" = x"NO"; then if test x"$llvm" = x"NO"; then
emitbc=-c emitbc=-c
elif test x"$llvm" = x"COMBINE"; then
emitbc="-fwhole-program --combine"
else else
emitbc="-emit-llvm -c" emitbc="-emit-llvm -c"
fi fi
@ -1323,7 +1328,7 @@ for file in $SRCS; do
test -f $file || file=$srcdir/$file test -f $file || file=$srcdir/$file
echo "$CC $CFLAGS $CPPFLAGS $emitbc $file || exit 1" >>Rebuild.sh echo "$CC $CFLAGS $CPPFLAGS $emitbc $file || exit 1" >>Rebuild.sh
done done
if test x"$llvm" = x"NO"; then if test x"$llvm" = x"NO" || test x"$llvm" = x"COMBINE"; then
lobjs=$objs lobjs=$objs
else else
echo "rm -f mksh.s" >>Rebuild.sh echo "rm -f mksh.s" >>Rebuild.sh
@ -1336,7 +1341,17 @@ a.exe) echo tcfn=mksh.exe >>Rebuild.sh ;;
esac esac
echo "$CC $CFLAGS $LDFLAGS -o \$tcfn $lobjs $LIBS $ccpr" >>Rebuild.sh echo "$CC $CFLAGS $LDFLAGS -o \$tcfn $lobjs $LIBS $ccpr" >>Rebuild.sh
echo 'test -f $tcfn || exit 1; size $tcfn' >>Rebuild.sh echo 'test -f $tcfn || exit 1; size $tcfn' >>Rebuild.sh
if test 1 = $pm; then if test x"$llvm" = x"COMBINE"; then
case $tcfn in
a.exe) objs="-o mksh.exe" ;;
*) objs="-o mksh" ;;
esac
for file in $SRCS; do
test -f $file || file=$srcdir/$file
objs="$objs $file"
done
v "$CC $CFLAGS $CPPFLAGS $LDFLAGS $emitbc $objs $LIBS $ccpr"
elif test 1 = $pm; then
for file in $SRCS; do for file in $SRCS; do
test -f $file || file=$srcdir/$file test -f $file || file=$srcdir/$file
v "$CC $CFLAGS $CPPFLAGS $emitbc $file" & v "$CC $CFLAGS $CPPFLAGS $emitbc $file" &
@ -1356,7 +1371,8 @@ case $tcfn in
a.exe) tcfn=mksh.exe ;; a.exe) tcfn=mksh.exe ;;
*) tcfn=mksh ;; *) tcfn=mksh ;;
esac esac
v "$CC $CFLAGS $LDFLAGS -o $tcfn $lobjs $LIBS $ccpr" test x"$llvm" = x"COMBINE" || \
v "$CC $CFLAGS $LDFLAGS -o $tcfn $lobjs $LIBS $ccpr"
test -f $tcfn || exit 1 test -f $tcfn || exit 1
test 1 = $r || v "$NROFF -mdoc <'$srcdir/mksh.1' >mksh.cat1" || \ test 1 = $r || v "$NROFF -mdoc <'$srcdir/mksh.1' >mksh.cat1" || \
rm -f mksh.cat1 rm -f mksh.cat1