* 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...
This commit is contained in:
The Alliance Tool 2005-04-15 08:38:51 +00:00
parent 590b046c5a
commit 7b13ad0bd9
10 changed files with 39 additions and 20 deletions

View File

@ -1,5 +1,13 @@
#!/bin/sh #!/bin/sh
#$Log: autostuff,v $ #$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 #Revision 1.11 2004/07/26 17:51:23 ludo
#- operator '==' doesn't exists/not compatible with old /bin/sh version #- operator '==' doesn't exists/not compatible with old /bin/sh version
# (such as the one installed under Solaris or Cygwin ...) # (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" = "autom4te.cache" ]; then continue; fi
if [ "$dir" = "Linux" ]; then continue; fi if [ "$dir" = "Linux" ]; then continue; fi
if [ "$dir" = "Solaris" ]; then continue; fi if [ "$dir" = "Solaris" ]; then continue; fi
if [ "$dir" = "documentation" ]; then continue; fi
if [ ! -f "$dir/Makefile.am" ]; then continue; fi if [ ! -f "$dir/Makefile.am" ]; then continue; fi
newdirs="$newdirs $dir" newdirs="$newdirs $dir"
done done
dirs="$newdirs" dirs="$newdirs documentation"
## Order directories. ## Order directories.

View File

@ -16,7 +16,7 @@ place_and_route.dvi : place_and_route.tex $(EPS)
latex $< latex $<
%.eps : %.fig %.eps : %.fig
fig2dev -L eps $< > $@ /usr/pkg/bin/fig2dev -L eps $< > $@
$(EPS) : $(FIG) $(EPS) : $(FIG)
$(PDF) : $(EPS) $(PDF) : $(EPS)

View File

@ -35,9 +35,7 @@ DrucTypeStructRegle DrucStructRegle;
DrucTypeStructInstruction *DrucStructInstruction; DrucTypeStructInstruction *DrucStructInstruction;
int DrucNombreInstructions;
int CurrentIndexDrucLayer; int CurrentIndexDrucLayer;
long DrucCtmMax;
FILE *TmpFileAssembler; FILE *TmpFileAssembler;
char DRUC_OUTPUT_NAME[256]; char DRUC_OUTPUT_NAME[256];

View File

@ -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 #ifndef LUC_LOG_H
#define LUC_LOG_H #define LUC_LOG_H
@ -238,10 +238,10 @@ struct systemBdd
pNode pAT; pNode pAT;
int indiceAT; int indiceAT;
pTableLoc pMC; pTableLoc pMC;
} };
sysBdd; extern struct systemBdd sysBdd;
pNode one, zero; extern pNode one, zero;
/**************** DECLARATION DES FONCTIONS *******/ /**************** DECLARATION DES FONCTIONS *******/

View File

@ -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 */ /* Produit : librairie BDD - Gestion de BDD */
@ -40,6 +40,9 @@
#include "mut.h" #include "mut.h"
#include "log.h" #include "log.h"
pNode one, zero;
struct systemBdd sysBdd;
#undef NAME_ATOM #undef NAME_ATOM
#undef MIN_OPER #undef MIN_OPER
#undef MAX_OPER #undef MAX_OPER

View File

@ -64,7 +64,7 @@ void sort_loself(lofig_list *ptfig,FILE *df) ;
static char *TNMOS, static char *TNMOS,
*TPMOS; *TPMOS;
char *SPI_NETNAME; static char *SPI_NETNAME;
char SPI_NAMEDNODES; char SPI_NAMEDNODES;
#define SPI_NONODES (-1l) #define SPI_NONODES (-1l)

View File

@ -21,7 +21,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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; int msl_line;
char SPI_SEPAR ; char SPI_SEPAR ;
char *SPI_NETNAME ; static char *SPI_NETNAME ;
char SPI_ONE_NODE_NORC ; char SPI_ONE_NODE_NORC ;
char SPI_MERGE ; char SPI_MERGE ;
char SPI_VERBOSE ; char SPI_VERBOSE ;
@ -173,8 +173,8 @@ char mode;
if( SPI_VERBOSE ) if( SPI_VERBOSE )
{ {
printf( "Parser Spice compile le %s a %s\n", __DATE__, __TIME__ ); printf( "Parser Spice compile le %s a %s\n", __DATE__, __TIME__ );
printf( "Revision : %s\n", "$Revision: 1.3 $" ); printf( "Revision : %s\n", "$Revision: 1.4 $" );
printf( "Date : %s\n", "$Date: 2004/07/28 12:04:23 $" ); printf( "Date : %s\n", "$Date: 2005/04/15 08:38:50 $" );
printf( "Separateur : '%c'\n", SPI_SEPAR ); printf( "Separateur : '%c'\n", SPI_SEPAR );
printf( "Nom de noeud : %s\n", SPI_NETNAME ); printf( "Nom de noeud : %s\n", SPI_NETNAME );

View File

@ -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_l.c
pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y 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 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 $(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 pat_desc_y.c pat_desc_y.h : $(srcdir)/pat_desc_y.y
$(YACC) -d $(YFLAGS) $(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/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/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/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_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/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 | # sed -e "s/yyin/pat_decl_y_/g" -e "s/yylex/pat_decl_y_lex/g" y.tab.c |

View File

@ -94,7 +94,7 @@
| | | |
\------------------------------------------------------*/ \------------------------------------------------------*/
scpcol_list *HEAD_SCPCOL; extern scpcol_list *HEAD_SCPCOL;
/*------------------------------------------------------\ /*------------------------------------------------------\
| | | |

View File

@ -63,6 +63,9 @@
| Variables | | Variables |
| | | |
\------------------------------------------------------------*/ \------------------------------------------------------------*/
scpcol_list *HEAD_SCPCOL;
/*------------------------------------------------------------\ /*------------------------------------------------------------\
| | | |
| Functions | | Functions |