From 929e9ba03699c4c1cc53802086586dda96ae08e0 Mon Sep 17 00:00:00 2001 From: borutr Date: Thu, 6 Nov 2008 17:20:29 +0000 Subject: [PATCH] * src/SDCCmain.c: #fixed bug 2224960: sdcc -MM no working correctly pass system include paths with -isystem to sdcpp * src/SDCCglue.c, src/pic/glue.c, src/pic16/glue.c: removed unneded functions (closePipes), (closeTmpFiles) and (rmTmpFiles) git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5257 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 9 +++++++++ src/SDCCglue.c | 51 ------------------------------------------------ src/SDCCmain.c | 2 +- src/pic/glue.c | 12 +++++------- src/pic16/glue.c | 21 +++++++++----------- 5 files changed, 24 insertions(+), 71 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95229fb7..80ce246c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-06 Borut Razem + + * src/SDCCmain.c: #fixed bug 2224960: sdcc -MM no working correctly + pass system include paths with -isystem to sdcpp + * src/SDCCglue.c, src/pic/glue.c, src/pic16/glue.c: removed unneded + functions (closePipes), (closeTmpFiles) and (rmTmpFiles) + 2008-11-02 Raphael Neider * doc/sdccman.lyx: updated the sections on the library build process @@ -189,6 +196,8 @@ * src/SDCCglue.c, src/SDCCast.c: fixed throw of "excess elements" warning for char arrays + * support/regression/tests/nullstring.c: + disable warning about excess elements in array of chars initializer 2008-09-07 Maarten Brock diff --git a/src/SDCCglue.c b/src/SDCCglue.c index be05fca1..37428849 100644 --- a/src/SDCCglue.c +++ b/src/SDCCglue.c @@ -47,57 +47,6 @@ symbol *mainf; int noInit = 0; /* no initialization */ -/*-----------------------------------------------------------------*/ -/* closePipes - closes all pipes created by the compiler */ -/*-----------------------------------------------------------------*/ -DEFSETFUNC (closePipes) -{ - FILE *pfile = item; - int ret; - - if (pfile) { - ret = pclose (pfile); - assert(ret != -1); - } - - return 0; -} - -/*-----------------------------------------------------------------*/ -/* closeTmpFiles - closes all tmp files created by the compiler */ -/* because of BRAIN DEAD MS/DOS & CYGNUS Libraries */ -/*-----------------------------------------------------------------*/ -DEFSETFUNC (closeTmpFiles) -{ - FILE *tfile = item; - int ret; - - if (tfile) { - ret = fclose (tfile); - assert(ret == 0); - } - - return 0; -} - -/*-----------------------------------------------------------------*/ -/* rmTmpFiles - unlinks all tmp files created by the compiler */ -/* because of BRAIN DEAD MS/DOS & CYGNUS Libraries */ -/*-----------------------------------------------------------------*/ -DEFSETFUNC (rmTmpFiles) -{ - char *name = item; - int ret; - - if (name) { - ret = remove (name); - assert(ret == 0); - Safe_free (name); - } - - return 0; -} - char * aopLiteralLong (value * val, int offset, int size) { diff --git a/src/SDCCmain.c b/src/SDCCmain.c index cfdbb10a..12909d3b 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -2049,7 +2049,7 @@ preProcess (char **envp) /* standard include path */ if (!options.nostdinc) { - inclList = appendStrSet(includeDirsSet, "-I\"", "\""); + inclList = appendStrSet(includeDirsSet, "-isystem \"", "\""); mergeSets(&preArgvSet, inclList); } diff --git a/src/pic/glue.c b/src/pic/glue.c index 586f7dc2..50b9ba17 100644 --- a/src/pic/glue.c +++ b/src/pic/glue.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - SDCCglue.c - glues everything we have done together into one file. + glue.c - glues everything we have done together into one file. Written By - Sandeep Dutta . sandeep.dutta@usa.net (1998) This program is free software; you can redistribute it and/or modify it @@ -37,11 +37,9 @@ extern set *externs; extern symbol *mainf; extern struct dbuf_s *codeOutBuf; -extern DEFSETFUNC(closeTmpFiles); -extern DEFSETFUNC(rmTmpFiles); -extern void initialComments(FILE *afile); -extern operand *operandFromAst(ast *tree, int lvl); -extern value *initPointer(initList *ilist, sym_link *toType); +extern void initialComments (FILE *afile); +extern operand *operandFromAst (ast *tree, int lvl); +extern value *initPointer (initList *ilist, sym_link *toType); set *pic14_localFunctions = NULL; @@ -66,7 +64,7 @@ static struct dbuf_s *ivalBuf, *extBuf, *gloBuf, *gloDefBuf; static set *emitted = NULL; -static void showAllMemmaps(FILE *of); // XXX: emits initialized symbols +static void showAllMemmaps (FILE *of); // XXX: emits initialized symbols static void emitPseudoStack(struct dbuf_s *oBuf, struct dbuf_s *oBufExt) diff --git a/src/pic16/glue.c b/src/pic16/glue.c index 79ecd22e..b26f0478 100644 --- a/src/pic16/glue.c +++ b/src/pic16/glue.c @@ -51,24 +51,21 @@ extern unsigned long pFile_isize; extern unsigned long pic16_countInstructions(); set *pic16_localFunctions = NULL; -set *rel_idataSymSet=NULL; -set *fix_idataSymSet=NULL; - -extern DEFSETFUNC (closeTmpFiles); -extern DEFSETFUNC (rmTmpFiles); +set *rel_idataSymSet = NULL; +set *fix_idataSymSet = NULL; extern void pic16_AnalyzeBanking (void); -extern void pic16_OptimizeJumps (); -extern void pic16_OptimizeBanksel (); -extern void pic16_InlinepCode(void); -extern void pic16_writeUsedRegs(FILE *); +extern void pic16_OptimizeJumps (void); +extern void pic16_OptimizeBanksel (void); +extern void pic16_InlinepCode (void); +extern void pic16_writeUsedRegs (FILE *); extern void initialComments (FILE * afile); extern void printPublics (FILE * afile); -void pic16_pCodeInitRegisters(void); -pCodeOp *pic16_popCopyReg(pCodeOpReg *pc); -extern void pic16_pCodeConstString(char *name, char *value, unsigned length); +void pic16_pCodeInitRegisters (void); +pCodeOp *pic16_popCopyReg (pCodeOpReg *pc); +extern void pic16_pCodeConstString (char *name, char *value, unsigned length); /*-----------------------------------------------------------------*/ -- 2.30.2