diff options
| -rw-r--r-- | sim/ChangeLog | 32 | ||||
| -rwxr-xr-x | sim/arm/configure | 10 | ||||
| -rwxr-xr-x | sim/avr/configure | 10 | ||||
| -rwxr-xr-x | sim/bfin/configure | 10 | ||||
| -rwxr-xr-x | sim/common/configure | 10 | ||||
| -rwxr-xr-x | sim/cr16/configure | 10 | ||||
| -rwxr-xr-x | sim/cris/configure | 10 | ||||
| -rwxr-xr-x | sim/d10v/configure | 10 | ||||
| -rwxr-xr-x | sim/erc32/configure | 10 | ||||
| -rwxr-xr-x | sim/frv/configure | 10 | ||||
| -rwxr-xr-x | sim/ft32/configure | 10 | ||||
| -rwxr-xr-x | sim/h8300/configure | 10 | ||||
| -rwxr-xr-x | sim/iq2000/configure | 10 | ||||
| -rwxr-xr-x | sim/lm32/configure | 10 | ||||
| -rwxr-xr-x | sim/m32c/configure | 10 | ||||
| -rwxr-xr-x | sim/m32r/configure | 10 | ||||
| -rwxr-xr-x | sim/m68hc11/configure | 10 | ||||
| -rwxr-xr-x | sim/mcore/configure | 10 | ||||
| -rwxr-xr-x | sim/microblaze/configure | 10 | ||||
| -rwxr-xr-x | sim/mips/configure | 10 | ||||
| -rwxr-xr-x | sim/mn10300/configure | 10 | ||||
| -rwxr-xr-x | sim/moxie/configure | 10 | ||||
| -rwxr-xr-x | sim/msp430/configure | 10 | ||||
| -rw-r--r-- | sim/ppc/Makefile.in | 7 | ||||
| -rwxr-xr-x | sim/ppc/configure | 6 | ||||
| -rwxr-xr-x | sim/rl78/configure | 10 | ||||
| -rwxr-xr-x | sim/rx/configure | 10 | ||||
| -rwxr-xr-x | sim/sh/configure | 10 | ||||
| -rwxr-xr-x | sim/sh64/configure | 10 | ||||
| -rwxr-xr-x | sim/v850/configure | 10 |
30 files changed, 204 insertions, 111 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 0c54ccd..c755273 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,35 @@ +2015-04-01 H.J. Lu <hongjiu.lu@intel.com> + + * arm/configure: Regenerated. + * avr/configure: Likewise. + * bfin/configure: Likewise. + * common/configure: Likewise. + * cr16/configure: Likewise. + * cris/configure: Likewise. + * d10v/configure: Likewise. + * erc32/configure: Likewise. + * frv/configure: Likewise. + * ft32/configure: Likewise. + * h8300/configure: Likewise. + * igen/configure: Likewise. + * iq2000/configure: Likewise. + * lm32/configure: Likewise. + * m32c/configure: Likewise. + * m32r/configure: Likewise. + * m68hc11/configure: Likewise. + * mcore/configure: Likewise. + * microblaze/configure: Likewise. + * mips/configure: Likewise. + * mn10300/configure: Likewise. + * moxie/configure: Likewise. + * msp430/configure: Likewise. + * ppc/configure: Likewise. + * rl78/configure: Likewise. + * rx/configure: Likewise. + * sh/configure: Likewise. + * sh64/configure: Likewise. + * v850/configure: Likewise. + 2015-03-29 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/arm/configure b/sim/arm/configure index ed1633e..cbcd18f 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/avr/configure b/sim/avr/configure index e394faf..095c763 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/bfin/configure b/sim/bfin/configure index 5fe2c37..f3cf008 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -8729,8 +8729,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12326,7 +12328,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12329 "configure" +#line 12331 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12432,7 +12434,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12435 "configure" +#line 12437 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/common/configure b/sim/common/configure index ce79060..49a667c 100755 --- a/sim/common/configure +++ b/sim/common/configure @@ -6961,8 +6961,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -10558,7 +10560,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10561 "configure" +#line 10563 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10664,7 +10666,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10667 "configure" +#line 10669 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/cr16/configure b/sim/cr16/configure index ed1633e..cbcd18f 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/cris/configure b/sim/cris/configure index e3f7e6e..262ec2a 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -8717,8 +8717,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12314,7 +12316,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12317 "configure" +#line 12319 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12420,7 +12422,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12423 "configure" +#line 12425 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/d10v/configure b/sim/d10v/configure index ed1633e..cbcd18f 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/erc32/configure b/sim/erc32/configure index f359b4e..bfe44d0 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -8693,8 +8693,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12290,7 +12292,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12293 "configure" +#line 12295 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12396,7 +12398,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12399 "configure" +#line 12401 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/frv/configure b/sim/frv/configure index ea25101..f33a077 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -8712,8 +8712,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12309,7 +12311,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12312 "configure" +#line 12314 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12415,7 +12417,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12418 "configure" +#line 12420 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/ft32/configure b/sim/ft32/configure index 4ba8649..6a93f79 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/h8300/configure b/sim/h8300/configure index 9e21d9a..cbfe50b 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -8689,8 +8689,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12286,7 +12288,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12289 "configure" +#line 12291 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12392,7 +12394,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12395 "configure" +#line 12397 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/iq2000/configure b/sim/iq2000/configure index a899df1..e7f1b45 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -8711,8 +8711,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12308,7 +12310,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12311 "configure" +#line 12313 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12414,7 +12416,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12417 "configure" +#line 12419 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/lm32/configure b/sim/lm32/configure index c7fa1a1..0456851 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -8709,8 +8709,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12306,7 +12308,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12309 "configure" +#line 12311 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12412,7 +12414,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12415 "configure" +#line 12417 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m32c/configure b/sim/m32c/configure index d46cfe1..f34e941 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -8697,8 +8697,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12294,7 +12296,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12297 "configure" +#line 12299 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12400,7 +12402,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12403 "configure" +#line 12405 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m32r/configure b/sim/m32r/configure index b235329..7331ecb 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -8713,8 +8713,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12310,7 +12312,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12313 "configure" +#line 12315 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12416,7 +12418,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12419 "configure" +#line 12421 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index a601a39..39a478d 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -8706,8 +8706,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12303,7 +12305,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12306 "configure" +#line 12308 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12409,7 +12411,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12412 "configure" +#line 12414 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/mcore/configure b/sim/mcore/configure index ed1633e..cbcd18f 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/microblaze/configure b/sim/microblaze/configure index ed1633e..cbcd18f 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/mips/configure b/sim/mips/configure index 6417995..eac94ba 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -8735,8 +8735,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12332,7 +12334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12335 "configure" +#line 12337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12438,7 +12440,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12441 "configure" +#line 12443 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/mn10300/configure b/sim/mn10300/configure index e0fcc5f..c407db3 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -8712,8 +8712,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12309,7 +12311,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12312 "configure" +#line 12314 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12415,7 +12417,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12418 "configure" +#line 12420 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/moxie/configure b/sim/moxie/configure index bddd8c9..6a999ef 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -8708,8 +8708,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12305,7 +12307,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12308 "configure" +#line 12310 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12411,7 +12413,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12414 "configure" +#line 12416 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/msp430/configure b/sim/msp430/configure index 3f514bd..6c2989b 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -8703,8 +8703,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12300,7 +12302,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12303 "configure" +#line 12305 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12406,7 +12408,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12409 "configure" +#line 12411 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 92a5812..d3a9f16 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -160,6 +160,11 @@ LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a $(ZLIB) ZLIB = @zlibdir@ -lz +# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is +# -I../zlib, unless we were configured with --with-system-zlib, in which +# case both are empty. +ZLIB = @zlibdir@ -lz + LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ INTL_CFLAGS = @INCINTL@ @@ -555,7 +560,7 @@ PACKAGE_OBJ = @sim_pk_obj@ psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) - $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) + $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) run: psim rm -f run$(EXEEXT) diff --git a/sim/ppc/configure b/sim/ppc/configure index 85ce1a0..d42c285 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -6824,8 +6824,10 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi diff --git a/sim/rl78/configure b/sim/rl78/configure index d537163..e8bc205 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -8689,8 +8689,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12286,7 +12288,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12289 "configure" +#line 12291 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12392,7 +12394,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12395 "configure" +#line 12397 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/rx/configure b/sim/rx/configure index 87b6efe..f4807c8 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -8693,8 +8693,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12290,7 +12292,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12293 "configure" +#line 12295 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12396,7 +12398,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12399 "configure" +#line 12401 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/sh/configure b/sim/sh/configure index ed1633e..cbcd18f 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/sh64/configure b/sim/sh64/configure index e186188..89b60cb 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -8711,8 +8711,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12308,7 +12310,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12311 "configure" +#line 12313 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12414,7 +12416,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12417 "configure" +#line 12419 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/v850/configure b/sim/v850/configure index 0fc4bdd..47056de 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -8707,8 +8707,10 @@ fi # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi @@ -12304,7 +12306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12307 "configure" +#line 12309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12410,7 +12412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12413 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |