diff --git a/src/lib/libast/Mamfile b/src/lib/libast/Mamfile --- a/src/lib/libast/Mamfile +++ b/src/lib/libast/Mamfile @@ -535,7 +535,7 @@ done misc/findlib.h done misc/fastfind.c meta fastfind.o %.c>%.o misc/fastfind.c fastfind prev misc/fastfind.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c done fastfind.o generated make hashalloc.o make hash/hashalloc.c @@ -1641,7 +1641,7 @@ done sfio/sfhdr.h done port/mc.c meta mc.o %.c>%.o port/mc.c mc prev port/mc.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c done mc.o generated make base64.o make string/base64.c @@ -2349,7 +2349,7 @@ prev tmx.h implicit done tm/tmxfmt.c meta tmxfmt.o %.c>%.o tm/tmxfmt.c tmxfmt prev tm/tmxfmt.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c tm/tmxfmt.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c tm/tmxfmt.c done tmxfmt.o generated make tmxgettime.o make tm/tmxgettime.c @@ -3011,7 +3011,7 @@ prev include/ast.h implicit done comp/spawnveg.c meta spawnveg.o %.c>%.o comp/spawnveg.c spawnveg prev comp/spawnveg.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c done spawnveg.o generated make vfork.o make comp/vfork.c @@ -3812,7 +3812,7 @@ prev regex/reglib.h implicit done regex/regcomp.c meta regcomp.o %.c>%.o regex/regcomp.c regcomp prev regex/regcomp.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Iregex -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c regex/regcomp.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Iregex -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c regex/regcomp.c done regcomp.o generated make regcache.o make regex/regcache.c @@ -4251,7 +4251,7 @@ prev sfio/sfhdr.h implicit done sfio/sfprintf.c meta sfprintf.o %.c>%.o sfio/sfprintf.c sfprintf prev sfio/sfprintf.c -exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS.FORCE} ${mam_cc_NOPROTECT} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfprintf.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${CCFLAGS.FORCE} ${mam_cc_NOPROTECT} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfprintf.c done sfprintf.o generated make sfputd.o make sfio/sfputd.c @@ -4291,7 +4291,7 @@ prev sfio/sfhdr.h implicit done sfio/sfrd.c meta sfrd.o %.c>%.o sfio/sfrd.c sfrd prev sfio/sfrd.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c done sfrd.o generated make sfread.o make sfio/sfread.c @@ -4315,7 +4315,7 @@ prev sfio/sfhdr.h implicit done sfio/sfscanf.c meta sfscanf.o %.c>%.o sfio/sfscanf.c sfscanf prev sfio/sfscanf.c -exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS.FORCE} ${mam_cc_NOPROTECT} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfscanf.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${CCFLAGS.FORCE} ${mam_cc_NOPROTECT} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfscanf.c done sfscanf.o generated make sfseek.o make sfio/sfseek.c @@ -4331,7 +4331,7 @@ prev sfio/sfhdr.h implicit done sfio/sfset.c meta sfset.o %.c>%.o sfio/sfset.c sfset prev sfio/sfset.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfset.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfset.c done sfset.o generated make sfsetbuf.o make sfio/sfsetbuf.c @@ -4445,7 +4445,7 @@ prev sfio/sfhdr.h implicit done sfio/sfvprintf.c meta sfvprintf.o %.c>%.o sfio/sfvprintf.c sfvprintf prev sfio/sfvprintf.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${mam_cc_NOPROTECT} ${DEBUG+-DDEBUG=${DEBUG}} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${mam_cc_NOPROTECT} ${DEBUG+-DDEBUG=${DEBUG}} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c done sfvprintf.o generated make sfvscanf.o make sfio/sfvscanf.c @@ -4454,7 +4454,7 @@ prev sfio/sfhdr.h implicit done sfio/sfvscanf.c meta sfvscanf.o %.c>%.o sfio/sfvscanf.c sfvscanf prev sfio/sfvscanf.c -exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS.FORCE} ${mam_cc_NOPROTECT} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvscanf.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${CCFLAGS.FORCE} ${mam_cc_NOPROTECT} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvscanf.c done sfvscanf.o generated make sfwr.o make sfio/sfwr.c diff --git a/src/lib/libast/string/strdup.c b/src/lib/libast/string/strdup.c --- a/src/lib/libast/string/strdup.c +++ b/src/lib/libast/string/strdup.c @@ -50,18 +50,11 @@ __STDPP__directive pragma pp:nohide strdup #define extern __EXPORT__ #endif -#pragma GCC push_options -#pragma GCC optimize ("O0") - - extern char* -strdup(register const char* s) +_ast_strdup(const char* s) { register char* t; register int n; return (s && (t = oldof(0, char, n = strlen(s) + 1, 0))) ? (char*)memcpy(t, s, n) : (char*)0; } - -#pragma GCC pop_options - diff --git a/src/lib/libcmd/Mamfile b/src/lib/libcmd/Mamfile --- a/src/lib/libcmd/Mamfile +++ b/src/lib/libcmd/Mamfile @@ -611,7 +611,7 @@ make id.o prev id.c meta id.o %.c>%.o id.c id prev id.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -D_BLD_cmd -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libcmd]"\" -c id.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -D_BLD_cmd -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libcmd]"\" -c id.c done id.o generated make join.o prev join.c diff --git a/src/lib/libdll/Mamfile b/src/lib/libdll/Mamfile index fbeea49..a392d55 100644 --- a/src/lib/libdll/Mamfile +++ b/src/lib/libdll/Mamfile @@ -259,7 +259,7 @@ prev ${PACKAGE_ast_INCLUDE}/ast.h implicit done dllscan.c meta dllscan.o %.c>%.o dllscan.c dllscan prev dllscan.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -D_PACKAGE_ast -c dllscan.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -D_PACKAGE_ast -c dllscan.c done dllscan.o generated make dllcheck.o make dllcheck.c