From ae36c610fdb3dfcd4d850c6fe0bf193bd0e455db Mon Sep 17 00:00:00 2001 From: borutr Date: Tue, 28 Apr 2009 05:40:30 +0000 Subject: [PATCH] * fixed GCC 4.4.0 mingw compilation: sim/ucsim/cmd.src/cmdlex.cc: regenerated - added #include * src/SDCCsymt.c: fixed warning: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' * support/scripts/sdcc_mingw32: sync with sdcc-build git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5441 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 4 ++++ src/SDCCsymt.c | 2 +- support/scripts/sdcc_mingw32 | 13 ++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3515f02..ad3469f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ * fixed GCC 4.4.0 mingw compilation: sim/ucsim/cmd.src/cmdlex.cc: regenerated - added #include + * src/SDCCsymt.c: fixed warning: + suggest parentheses around operand of '!' or change '&' to '&&' or + '!' to '~' + * support/scripts/sdcc_mingw32: sync with sdcc-build 2009-04-27 Raphael Neider diff --git a/src/SDCCsymt.c b/src/SDCCsymt.c index 6692939f..72f323ab 100644 --- a/src/SDCCsymt.c +++ b/src/SDCCsymt.c @@ -2324,7 +2324,7 @@ compareTypeExact (sym_link * dest, sym_link * src, int level) srcScls = SPEC_SCLS (src); /* Compensate for const to const code change in checkSClass() */ - if ((!level & port->mem.code_ro) && SPEC_CONST (dest)) + if (((!level) & port->mem.code_ro) && SPEC_CONST (dest)) { if (srcScls == S_CODE && destScls == S_FIXED) destScls = S_CODE; diff --git a/support/scripts/sdcc_mingw32 b/support/scripts/sdcc_mingw32 index ac78f548..081d51cb 100755 --- a/support/scripts/sdcc_mingw32 +++ b/support/scripts/sdcc_mingw32 @@ -1,11 +1,11 @@ #!/bin/sh # Script to crosscompile with mingw32 -TOOLSPREFIX=/usr/local/cross-tools/i386-mingw32msvc/bin +TOOLSPREFIX=/usr/local/cross-tools/bin/i586-mingw32msvc- -export CC=$TOOLSPREFIX/gcc -export CXX=$TOOLSPREFIX/g++ -export RANLIB=$TOOLSPREFIX/ranlib -export STRIP=$TOOLSPREFIX/strip +export CC=${TOOLSPREFIX}/gcc +export CXX=${TOOLSPREFIX}/g++ +export RANLIB=${TOOLSPREFIX}/ranlib +export STRIP=${TOOLSPREFIX}/strip export SDCCCONFIGUREFLAGS=" \ --prefix=/sdcc \ @@ -17,5 +17,4 @@ sdccconf_h_dir_separator=\\\\ \ --disable-device-lib \ --host=i586-mingw32msvc --build=unknown-unknown-linux-gnu" -./configure $SDCCCONFIGUREFLAGS -make 2>&1 | tee make.log +./configure ${SDCCCONFIGUREFLAGS} & make 2>&1 | tee make.log -- 2.30.2