* fixed GCC 4.4.0 mingw compilation:

  sim/ucsim/cmd.src/cmdlex.cc: regenerated - added #include <stdio.h>
* 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

diff --git a/ChangeLog b/ChangeLog
index a3515f02167116a4801d31c0a85ad68c9369bd5e..ad3469f63501cc5add3c535204612f0e0a02d7b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        * fixed GCC 4.4.0 mingw compilation:
          sim/ucsim/cmd.src/cmdlex.cc: regenerated - added #include <stdio.h>
+       * 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 <rneider AT web.de>
 

diff --git a/src/SDCCsymt.c b/src/SDCCsymt.c
index 6692939f2cb1e7442958e6012b44d7726fd11d1d..72f323ab3437b7d0de6f0fec90d132b1d5ffc86b 100644 (file)
--- 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 ac78f548ec068bdfedf6846e88818b047c3ed78d..081d51cbc0aee1424b0713a5c01fbcd2a5106bc9 100755 (executable)
--- 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