From 7b13ad0bd9f9e145dd680ae4fbb811e3b1990579 Mon Sep 17 00:00:00 2001 From: The Alliance Tool Date: Fri, 15 Apr 2005 08:38:51 +0000 Subject: [PATCH] * alliance/src/ : porting under Darwin/MacOS X - Bug : the Darwin link editor seems to be more strict, or having a different policy about implicit static/extern variables. We have to do a lot of cleanup to avoid symbols redefinition at link time. We do hope it may solve the earlier bison problem with asimut... --- alliance/src/autostuff | 11 ++++++++++- .../tutorials/place_and_route/tex/Makefile | 2 +- alliance/src/druc/src/drucompi.c | 2 -- alliance/src/log/src/log.h | 8 ++++---- alliance/src/log/src/log_bdd0.c | 5 ++++- alliance/src/mbkspice/src/spi_drive.c | 2 +- alliance/src/mbkspice/src/spi_parse.c | 8 ++++---- alliance/src/ppt/src/Makefile.am | 16 +++++++++++----- alliance/src/scl/src/scp.h | 2 +- alliance/src/scl/src/scpadd.c | 3 +++ 10 files changed, 39 insertions(+), 20 deletions(-) diff --git a/alliance/src/autostuff b/alliance/src/autostuff index 1eb04fd2..6ba3575a 100755 --- a/alliance/src/autostuff +++ b/alliance/src/autostuff @@ -1,5 +1,13 @@ #!/bin/sh #$Log: autostuff,v $ +#Revision 1.12 2005/04/15 08:38:29 alliance +# +#* alliance/src/ : porting under Darwin/MacOS X +# - Bug : the Darwin link editor seems to be more strict, or having a +# different policy about implicit static/extern variables. We have +# to do a lot of cleanup to avoid symbols redefinition at link time. +# We do hope it may solve the earlier bison problem with asimut... +# #Revision 1.11 2004/07/26 17:51:23 ludo #- operator '==' doesn't exists/not compatible with old /bin/sh version # (such as the one installed under Solaris or Cygwin ...) @@ -44,10 +52,11 @@ for dir in $dirs; do if [ "$dir" = "autom4te.cache" ]; then continue; fi if [ "$dir" = "Linux" ]; then continue; fi if [ "$dir" = "Solaris" ]; then continue; fi + if [ "$dir" = "documentation" ]; then continue; fi if [ ! -f "$dir/Makefile.am" ]; then continue; fi newdirs="$newdirs $dir" done -dirs="$newdirs" +dirs="$newdirs documentation" ## Order directories. diff --git a/alliance/src/documentation/tutorials/place_and_route/tex/Makefile b/alliance/src/documentation/tutorials/place_and_route/tex/Makefile index cb9d1f13..0a8c3c9b 100644 --- a/alliance/src/documentation/tutorials/place_and_route/tex/Makefile +++ b/alliance/src/documentation/tutorials/place_and_route/tex/Makefile @@ -16,7 +16,7 @@ place_and_route.dvi : place_and_route.tex $(EPS) latex $< %.eps : %.fig - fig2dev -L eps $< > $@ + /usr/pkg/bin/fig2dev -L eps $< > $@ $(EPS) : $(FIG) $(PDF) : $(EPS) diff --git a/alliance/src/druc/src/drucompi.c b/alliance/src/druc/src/drucompi.c index 19ee01a0..e5664be3 100644 --- a/alliance/src/druc/src/drucompi.c +++ b/alliance/src/druc/src/drucompi.c @@ -35,9 +35,7 @@ DrucTypeStructRegle DrucStructRegle; DrucTypeStructInstruction *DrucStructInstruction; -int DrucNombreInstructions; int CurrentIndexDrucLayer; -long DrucCtmMax; FILE *TmpFileAssembler; char DRUC_OUTPUT_NAME[256]; diff --git a/alliance/src/log/src/log.h b/alliance/src/log/src/log.h index 3060e66c..10c9f38e 100644 --- a/alliance/src/log/src/log.h +++ b/alliance/src/log/src/log.h @@ -30,7 +30,7 @@ -/* $Id: log.h,v 1.4 2002/09/30 16:20:43 czo Exp $ */ +/* $Id: log.h,v 1.5 2005/04/15 08:38:49 alliance Exp $ */ #ifndef LUC_LOG_H #define LUC_LOG_H @@ -238,10 +238,10 @@ struct systemBdd pNode pAT; int indiceAT; pTableLoc pMC; - } -sysBdd; + }; +extern struct systemBdd sysBdd; -pNode one, zero; +extern pNode one, zero; /**************** DECLARATION DES FONCTIONS *******/ diff --git a/alliance/src/log/src/log_bdd0.c b/alliance/src/log/src/log_bdd0.c index fa975fa9..f8263551 100644 --- a/alliance/src/log/src/log_bdd0.c +++ b/alliance/src/log/src/log_bdd0.c @@ -30,7 +30,7 @@ -#ident "$Id: log_bdd0.c,v 1.3 2002/09/30 16:20:43 czo Exp $" +#ident "$Id: log_bdd0.c,v 1.4 2005/04/15 08:38:49 alliance Exp $" /****************************************************************************/ /* Produit : librairie BDD - Gestion de BDD */ @@ -40,6 +40,9 @@ #include "mut.h" #include "log.h" +pNode one, zero; +struct systemBdd sysBdd; + #undef NAME_ATOM #undef MIN_OPER #undef MAX_OPER diff --git a/alliance/src/mbkspice/src/spi_drive.c b/alliance/src/mbkspice/src/spi_drive.c index f65b7164..ba3f03a4 100644 --- a/alliance/src/mbkspice/src/spi_drive.c +++ b/alliance/src/mbkspice/src/spi_drive.c @@ -64,7 +64,7 @@ void sort_loself(lofig_list *ptfig,FILE *df) ; static char *TNMOS, *TPMOS; -char *SPI_NETNAME; +static char *SPI_NETNAME; char SPI_NAMEDNODES; #define SPI_NONODES (-1l) diff --git a/alliance/src/mbkspice/src/spi_parse.c b/alliance/src/mbkspice/src/spi_parse.c index 672b38bb..1dec13f8 100644 --- a/alliance/src/mbkspice/src/spi_parse.c +++ b/alliance/src/mbkspice/src/spi_parse.c @@ -21,7 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ident "$Author: fred $ $Date: 2004/07/28 12:04:23 $ $Revision: 1.3 $" +#ident "$Author: alliance $ $Date: 2005/04/15 08:38:50 $ $Revision: 1.4 $" /******************************************************************************* * * @@ -59,7 +59,7 @@ char* msl_subckt; int msl_line; char SPI_SEPAR ; -char *SPI_NETNAME ; +static char *SPI_NETNAME ; char SPI_ONE_NODE_NORC ; char SPI_MERGE ; char SPI_VERBOSE ; @@ -173,8 +173,8 @@ char mode; if( SPI_VERBOSE ) { printf( "Parser Spice compile le %s a %s\n", __DATE__, __TIME__ ); - printf( "Revision : %s\n", "$Revision: 1.3 $" ); - printf( "Date : %s\n", "$Date: 2004/07/28 12:04:23 $" ); + printf( "Revision : %s\n", "$Revision: 1.4 $" ); + printf( "Date : %s\n", "$Date: 2005/04/15 08:38:50 $" ); printf( "Separateur : '%c'\n", SPI_SEPAR ); printf( "Nom de noeud : %s\n", SPI_NETNAME ); diff --git a/alliance/src/ppt/src/Makefile.am b/alliance/src/ppt/src/Makefile.am index e19881ba..c656016e 100644 --- a/alliance/src/ppt/src/Makefile.am +++ b/alliance/src/ppt/src/Makefile.am @@ -16,17 +16,23 @@ CLEANFILES = pat_decl_y.c pat_decl_y.h pat_desc_y.h pat_desc_y.c \ pat_decl_l.c pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y - $(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c > pat_decl_y.c && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h + $(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y \ + && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \ + | sed -e "s/int[\t ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \ + | sed -e "s/PAT_DECL_Y_STYPE[\t ]*pat_decl_y_lval;/extern PAT_DECL_Y_STYPE pat_decl_y_lval;/" \ + | sed -e "s/int[\t ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \ + > pat_decl_y.c \ + && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h pat_decl_l.c : $(srcdir)/pat_decl_l.l pat_decl_y.h $(LEX) -t $(srcdir)/pat_decl_l.l | sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_decl_l.c pat_desc_y.c pat_desc_y.h : $(srcdir)/pat_desc_y.y $(YACC) -d $(YFLAGS) $(srcdir)/pat_desc_y.y \ - && sed -e "s/yyparse/pat_desc_y_parse/g" y.tab.c | \ - sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_desc_y.c\ - && sed -e "s/yyparse/pat_desc_y_parse/g" y.tab.h | \ - sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_desc_y.h + && sed -e "s/yyparse/pat_desc_y_parse/g" y.tab.c \ + | sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_desc_y.c \ + && sed -e "s/yyparse/pat_desc_y_parse/g" y.tab.h \ + | sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_desc_y.h #sed -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" > pat_desc_y.c && sed -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" y.tab.h > pat_desc_y.h # sed -e "s/yyin/pat_decl_y_/g" -e "s/yylex/pat_decl_y_lex/g" y.tab.c | diff --git a/alliance/src/scl/src/scp.h b/alliance/src/scl/src/scp.h index 7dc22d81..160e0883 100644 --- a/alliance/src/scl/src/scp.h +++ b/alliance/src/scl/src/scp.h @@ -94,7 +94,7 @@ | | \------------------------------------------------------*/ - scpcol_list *HEAD_SCPCOL; +extern scpcol_list *HEAD_SCPCOL; /*------------------------------------------------------\ | | diff --git a/alliance/src/scl/src/scpadd.c b/alliance/src/scl/src/scpadd.c index f23ac934..687e5433 100644 --- a/alliance/src/scl/src/scpadd.c +++ b/alliance/src/scl/src/scpadd.c @@ -63,6 +63,9 @@ | Variables | | | \------------------------------------------------------------*/ + +scpcol_list *HEAD_SCPCOL; + /*------------------------------------------------------------\ | | | Functions |