diff --git a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile index 2cdd31f7afe7..afee6927fb1b 100644 --- a/src/cmd/builtin/Mamfile +++ b/src/cmd/builtin/Mamfile @@ -8,7 +8,7 @@ setv MAMAKE_STRICT 3 setv INSTALLROOT ../../.. setv PACKAGE_ast_INCLUDE ${INSTALLROOT}/include/ast setv CC cc -setv mam_cc_FLAGS ${mam_cc_TARGET} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} ${mam_cc_NOSTRICTALIASING} +setv mam_cc_FLAGS ${mam_cc_TARGET} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCFLAGS setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} setv IFFEFLAGS @@ -134,7 +134,7 @@ make install virtual exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} \ exec - -DERROR_CATALOG=\""builtin"\" -DCMD_STANDALONE=b_pty -c ${<} done pty.o - exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} \ + exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} ${LDFLAGS} ${mam_cc_L+-L.} \ exec - ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} done pty diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile index eab7d105d6af..5b6221bfbde0 100644 --- a/src/cmd/ksh93/Mamfile +++ b/src/cmd/ksh93/Mamfile @@ -8,7 +8,7 @@ setv INSTALLROOT ../../.. setv PACKAGE_ast_INCLUDE ${INSTALLROOT}/include/ast setv CC cc setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS} -setv mam_cc_FLAGS ${mam_cc_TARGET} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} ${mam_cc_NOSTRICTALIASING} +setv mam_cc_FLAGS ${mam_cc_TARGET} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCFLAGS setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} setv IFFEFLAGS @@ -167,7 +167,7 @@ make install virtual make shell.req prev ${INSTALLROOT}/bin/mkreq - exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} : ${LDFLAGS} : \ + exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} : ${LDFLAGS} : \ exec - shell dll cmd ast m jobs i socket nsl secdb network done @@ -175,7 +175,7 @@ make install virtual note * Feature tests note * - setv iffe_run iffe ${IFFEFLAGS} -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}' ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run + setv iffe_run iffe ${IFFEFLAGS} -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} ${LDFLAGS}' ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run make features/time prev ${PACKAGE_ast_INCLUDE}/times.h @@ -1157,7 +1157,7 @@ make install virtual note * Set common compiler invocation arguments note * - setv compile ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${DEBUG+-DDEBUG=${DEBUG}} -DSH_DICT=${SH_DICT} ${SH_CMDLIB_DIR+-DSH_CMDLIB_DIR=${SH_CMDLIB_DIR}} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c + setv compile ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} ${DEBUG+-DDEBUG=${DEBUG}} -DSH_DICT=${SH_DICT} ${SH_CMDLIB_DIR+-DSH_CMDLIB_DIR=${SH_CMDLIB_DIR}} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c note * note * Build the library diff --git a/src/lib/libast/Mamfile b/src/lib/libast/Mamfile index 6e40f0d2ec89..4e9ef2835233 100644 --- a/src/lib/libast/Mamfile +++ b/src/lib/libast/Mamfile @@ -8,7 +8,7 @@ setv INSTALLROOT ../../.. setv PACKAGEROOT ../../../../.. setv CC cc setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS} -setv mam_cc_FLAGS ${mam_cc_TARGET} ${mam_cc_DLL} -D_BLD_ast ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} ${mam_cc_NOSTRICTALIASING} +setv mam_cc_FLAGS ${mam_cc_TARGET} ${mam_cc_DLL} -D_BLD_ast ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCFLAGS setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} setv IFFEFLAGS @@ -23,7 +23,7 @@ shim - invoke_iffe() shim - { shim - s=$1 shim - shift -shim - set -- ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} "$@" +shim - set -- ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} ${LDFLAGS} "$@" shim - iffe ${IFFEFLAGS} -v -X ast -X std -c "$*" run "$s" shim - } shim - @@ -31,7 +31,7 @@ shim - compile() shim - { shim - s=$1 shim - shift -shim - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp "$@" -Iinclude -Istd -c "$s" +shim - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} -I. -Icomp "$@" -Iinclude -Istd -c "$s" shim - } make install virtual @@ -287,7 +287,7 @@ make install virtual note * prev ${INSTALLROOT}/bin/mkreq exec - set -o errexit - exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} : ${LDFLAGS} : ast iconv w + exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} : ${LDFLAGS} : ast iconv w note * note * some systems move -lc routines to -lm; see astmath.c for details note * @@ -295,7 +295,7 @@ make install virtual make port/astmath.c prev std/endian.h done - setv _math_test ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} -DN=$N -DIS -o astmath.exe ${<} + setv _math_test ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} ${LDFLAGS} -DN=$N -DIS -o astmath.exe ${<} exec - X=1 exec - for N in 1 2 3 4 5 6 7 8 exec - do if ${_math_test} 2>/dev/null @@ -353,7 +353,7 @@ make install virtual exec - EOF done prev comp/conf.tab - exec - conf -v ${<} ${CC} ${mam_cc_FLAGS} ${CCFLAGS} + exec - conf -v ${<} ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} done done features/limits.c exec - invoke_iffe ${<} -I. -Icomp -Iinclude -Istd @@ -521,7 +521,7 @@ make install virtual make port/lcgen.c prev std/stdio.h done - exec - ${CC} ${CCLDFLAGS} ${CCFLAGS} ${LDFLAGS} -o lcgen port/lcgen.c + exec - ${CC} ${CCLDFLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} ${LDFLAGS} -o lcgen port/lcgen.c done exec - lcgen lc.h lctab.c < port/lc.tab done @@ -5043,7 +5043,7 @@ make install virtual exec - compile ${<} -D_PACKAGE_ast done bind -last - exec - ${CC} ${CCLDFLAGS} ${CCFLAGS} ${LDFLAGS} -o ${@} ${<} ${mam_libast} || exit + exec - ${CC} ${CCLDFLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} ${LDFLAGS} -o ${@} ${<} ${mam_libast} || exit note * note * We purposely do not have a make target of ${INSTALLROOT}/bin/mamake here; note * this helps to ensure that the package.sh-built version gets overwritten. diff --git a/src/lib/libcmd/Mamfile b/src/lib/libcmd/Mamfile index f055bb043752..500a0fddf173 100644 --- a/src/lib/libcmd/Mamfile +++ b/src/lib/libcmd/Mamfile @@ -147,14 +147,14 @@ make install virtual bind -lsum make cmd.req prev ${INSTALLROOT}/bin/mkreq - exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} : ${LDFLAGS} : cmd fsg md util ast + exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} : ${LDFLAGS} : cmd fsg md util ast done note * note * Header dependencies and feature tests note * - setv run_iffe iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libutil} ${mam_libast} : run + setv run_iffe iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} ${LDFLAGS}" ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libutil} ${mam_libast} : run make deps virtual make cmdinit.c @@ -468,7 +468,7 @@ make install virtual loop OBJ cmdinit basename cat chgrp chmod chown cksum cmp comm cp cut dirname date expr fds fmt fold getconf head id join ln logname md5sum mkdir mkfifo mktemp mv paste pathchk pids rev rm rmdir stty sum sync tail tee tty uname uniq vmstate wc revlib wclib lib make ${OBJ}.o prev ${OBJ}.c - exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DHOSTTYPE=\""${mam_cc_HOSTTYPE}"\" -D_BLD_cmd -c ${<} + exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DHOSTTYPE=\""${mam_cc_HOSTTYPE}"\" -D_BLD_cmd -c ${<} done done make sumlib.o diff --git a/src/lib/libdll/Mamfile b/src/lib/libdll/Mamfile index cc7242134f51..01054c02bffb 100644 --- a/src/lib/libdll/Mamfile +++ b/src/lib/libdll/Mamfile @@ -8,7 +8,7 @@ setv INSTALLROOT ../../.. setv PACKAGE_ast_INCLUDE ${INSTALLROOT}/include/ast setv CC cc setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS} -setv mam_cc_FLAGS ${mam_cc_TARGET} ${mam_cc_DLL} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} ${mam_cc_NOSTRICTALIASING} +setv mam_cc_FLAGS ${mam_cc_TARGET} ${mam_cc_DLL} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCFLAGS setv IFFEFLAGS setv LDFLAGS @@ -103,7 +103,7 @@ make install virtual bind -last make dll.req prev ${INSTALLROOT}/bin/mkreq - exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} : ${LDFLAGS} : dll dl dld ast + exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} : ${LDFLAGS} : dll dl dld ast done note * @@ -115,7 +115,8 @@ make install virtual make dlldefs.h implicit make FEATURE/dll prev features/dll - exec - iffe ${IFFEFLAGS} -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}' \ + exec - iffe ${IFFEFLAGS} -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} \ + exec - ${mam_cc_NOSTRICTALIASING} ${LDFLAGS}' \ exec - ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} \ exec - -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include \ exec - ${mam_libdl} ${mam_libast} : run ${<} @@ -175,7 +176,7 @@ make install virtual loop OBJ dlfcn dllopen dllfind dllplug dll_lib dllnext dlllook dllscan dllcheck dllerror make ${OBJ}.o prev ${OBJ}.c - exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -c ${<} + exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -c ${<} done done exec - if test -f ${@} diff --git a/src/lib/libsum/Mamfile b/src/lib/libsum/Mamfile index 3f41cf1609f9..3017af8921de 100644 --- a/src/lib/libsum/Mamfile +++ b/src/lib/libsum/Mamfile @@ -8,7 +8,7 @@ setv INSTALLROOT ../../.. setv PACKAGE_ast_INCLUDE ${INSTALLROOT}/include/ast setv CC cc setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS} -setv mam_cc_FLAGS ${mam_cc_TARGET} ${mam_cc_PIC} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} ${mam_cc_NOSTRICTALIASING} +setv mam_cc_FLAGS ${mam_cc_TARGET} ${mam_cc_PIC} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCFLAGS setv IFFEFLAGS setv LDFLAGS @@ -94,7 +94,7 @@ make install virtual bind -last make sum.req prev ${INSTALLROOT}/bin/mkreq - exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} : ${LDFLAGS} : sum md ast + exec - mkreq ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} : ${LDFLAGS} : sum md ast done note * @@ -117,7 +117,8 @@ make install virtual prev sum-ast4.c implicit make FEATURE/sum implicit prev features/sum - exec - iffe ${IFFEFLAGS} -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}' \ + exec - iffe ${IFFEFLAGS} -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} \ + exec - ${mam_cc_NOSTRICTALIASING} ${LDFLAGS}' \ exec - ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} \ exec - -I${INSTALLROOT}/include ${mam_libast} : run ${<} done @@ -134,7 +135,7 @@ make install virtual prev ${PACKAGE_ast_INCLUDE}/ast.h done done - exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -c ${<} + exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOSTRICTALIASING} -I. -I${PACKAGE_ast_INCLUDE} -c ${<} done sumlib.o exec - ${AR} rc ${@} ${<} || exit exec - ranlib ${@} >/dev/null 2>&1 || true