This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [committed, PATCH] Fix sim build
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: GDB <gdb-patches at sourceware dot org>, Binutils <binutils at sourceware dot org>
- Date: Thu, 2 Apr 2015 05:50:15 -0700
- Subject: Re: [committed, PATCH] Fix sim build
- Authentication-results: sourceware.org; auth=none
- References: <20150401173315 dot GA2820 at intel dot com> <20150402053501 dot GA9832 at vapier>
On Wed, Apr 1, 2015 at 10:35 PM, Mike Frysinger <vapier@gentoo.org> wrote:
> On 01 Apr 2015 10:33, H.J. Lu wrote:
>> I checked in this patch to fix sim build.
>
> this partially fixes it. the zlib macro is still broken:
> # Use the system's zlib library.
> zlibdir=-L../zlib
>
> that only works if you try to link zlib when you're one dir deep. the sim is
> two dirs deep which leads to failure:
>
> make[2]: Entering directory '/usr/local/src/gnu/gdb/build/build-bfin-mingw/sim/bfin'
> i686-w64-mingw32-gcc -DHAVE_CONFIG_H -DWITH_DEFAULT_MODEL='"bf537"' -DPROFILE=1 -DWITH_PROFILE=-1 -DWITH_DEFAULT_ALIGNMENT=STRICT_ALIGNMENT -DWITH_TARGET_BYTE_ORDER=LITTLE_ENDIAN -DWITH_ENVIRONMENT=ALL_ENVIRONMENT -DWITH_HW=1 -DWITH_HOST_BYTE_ORDER=0 -DDEFAULT_INLINE=0 -Wall -Wdeclaration-after-statement -Wpointer-arith -Wpointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type -Wold-style-declaration -Wold-style-definition -Wno-format -D__USE_MINGW_FSEEK -I. -I../../../../sim/bfin -I../common -I../../../../sim/bfin/../common -I../../include -I../../../../sim/bfin/../../include -I../../bfd -I../../../../sim/bfin/../../bfd -I../../opcodes -I../../../../sim/bfin/../../opcodes -g -O2 -D__USE_MINGW_ACCESS -static-libstdc++ -static-libgcc -Wl,--stack,12582912 -o run.exe \
> nrun.o libsim.a ../../bfd/libbfd.a ../../opcodes/libopcodes.a ../../libiberty/libiberty.a -lm -L../zlib -lz -lm
> /usr/libexec/gcc/i686-w64-mingw32/ld: cannot find -lz
> collect2: error: ld returned 1 exit status
> Makefile:297: recipe for target 'run.exe' failed
> make[2]: *** [run.exe] Error 1
>
> the zlib.a is in zlib/, but sim/bfin/ can't see that with -L../zlib. guess you
> want -L\$(top_builddir)/lib instead.
> -mike
These are 3 patches I pushed. I used
zlibdir="-L\$(top_builddir)/../zlib"
zlibinc="-I\$(top_srcdir)/../zlib"
since top_xxx is relative to configure. I also added top_srcdir to
gdb/Makefile.in.
--
H.J.
From df7f7547a5cb6455ad07855482797860b71fb532 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 2 Apr 2015 05:37:09 -0700
Subject: [PATCH 1/3] Set zlibdir/zlibinc with top_builddir/top_srcdir
* zlib.m4 (AM_ZLIB): Set zlibdir to -L\$(top_builddir)/../zlib
and set zlibinc to -I\$(top_srcdir)/../zlib.
---
config/ChangeLog | 5 +++++
config/zlib.m4 | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/config/ChangeLog b/config/ChangeLog
index 6dc4998..6ffb0ed 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * zlib.m4 (AM_ZLIB): Set zlibdir to -L\$(top_builddir)/../zlib
+ and set zlibinc to -I\$(top_srcdir)/../zlib.
+
2015-04-01 H.J. Lu <hongjiu.lu@intel.com>
* zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for
diff --git a/config/zlib.m4 b/config/zlib.m4
index aa3ac48..afa57d1 100644
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -5,8 +5,8 @@ dnl --with-system-zlib.
AC_DEFUN([AM_ZLIB],
[
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
AC_ARG_WITH(system-zlib,
[AS_HELP_STRING([--with-system-zlib], [use installed libz])],
if test x$with_system_zlib = xyes ; then
--
2.1.0
From 7fed4b0be6aa0d0794b8536e9f80d128f0d9bbdb Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 2 Apr 2015 05:38:34 -0700
Subject: [PATCH 2/3] Regenerate configure in sim
* 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.
---
sim/ChangeLog | 32 ++++++++++++++++++++++++++++++++
sim/arm/configure | 4 ++--
sim/avr/configure | 4 ++--
sim/bfin/configure | 4 ++--
sim/common/configure | 4 ++--
sim/cr16/configure | 4 ++--
sim/cris/configure | 4 ++--
sim/d10v/configure | 4 ++--
sim/erc32/configure | 4 ++--
sim/frv/configure | 4 ++--
sim/ft32/configure | 4 ++--
sim/h8300/configure | 4 ++--
sim/iq2000/configure | 4 ++--
sim/lm32/configure | 4 ++--
sim/m32c/configure | 4 ++--
sim/m32r/configure | 4 ++--
sim/m68hc11/configure | 4 ++--
sim/mcore/configure | 4 ++--
sim/microblaze/configure | 4 ++--
sim/mips/configure | 4 ++--
sim/mn10300/configure | 4 ++--
sim/moxie/configure | 4 ++--
sim/msp430/configure | 4 ++--
sim/ppc/configure | 4 ++--
sim/rl78/configure | 4 ++--
sim/rx/configure | 4 ++--
sim/sh/configure | 4 ++--
sim/sh64/configure | 4 ++--
sim/v850/configure | 4 ++--
29 files changed, 88 insertions(+), 56 deletions(-)
diff --git a/sim/ChangeLog b/sim/ChangeLog
index abbeccf..0c0dcd6 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,35 @@
+2015-04-02 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-04-01 H.J. Lu <hongjiu.lu@intel.com>
* common/Make-common.in (CSEARCH): Remove $(ZLIBINC).
diff --git a/sim/arm/configure b/sim/arm/configure
index cbcd18f..ead6d3d 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/avr/configure b/sim/avr/configure
index 095c763..092ef46 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/bfin/configure b/sim/bfin/configure
index f3cf008..59723c2 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -8724,8 +8724,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/common/configure b/sim/common/configure
index 49a667c..b81c8a1 100755
--- a/sim/common/configure
+++ b/sim/common/configure
@@ -6956,8 +6956,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/cr16/configure b/sim/cr16/configure
index cbcd18f..ead6d3d 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/cris/configure b/sim/cris/configure
index 262ec2a..f8e8340 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -8712,8 +8712,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/d10v/configure b/sim/d10v/configure
index cbcd18f..ead6d3d 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/erc32/configure b/sim/erc32/configure
index bfe44d0..a0f3228 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -8688,8 +8688,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/frv/configure b/sim/frv/configure
index f33a077..13ca7c3 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -8707,8 +8707,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/ft32/configure b/sim/ft32/configure
index 6a93f79..0d21f06 100755
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/h8300/configure b/sim/h8300/configure
index cbfe50b..97b396f 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -8684,8 +8684,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index e7f1b45..3561837 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -8706,8 +8706,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/lm32/configure b/sim/lm32/configure
index 0456851..d908fca 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -8704,8 +8704,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/m32c/configure b/sim/m32c/configure
index f34e941..99a06d1 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -8692,8 +8692,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 7331ecb..417e24c 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -8708,8 +8708,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 39a478d..e66e89c 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -8701,8 +8701,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/mcore/configure b/sim/mcore/configure
index cbcd18f..ead6d3d 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index cbcd18f..ead6d3d 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/mips/configure b/sim/mips/configure
index eac94ba..1abf98e 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -8730,8 +8730,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index c407db3..a8303be 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -8707,8 +8707,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/moxie/configure b/sim/moxie/configure
index 6a999ef..6417068 100755
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -8703,8 +8703,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/msp430/configure b/sim/msp430/configure
index 6c2989b..ff3e5bc 100755
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@@ -8698,8 +8698,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/ppc/configure b/sim/ppc/configure
index d42c285..8cd3313 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -6819,8 +6819,8 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/rl78/configure b/sim/rl78/configure
index e8bc205..b0e2f08 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -8684,8 +8684,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/rx/configure b/sim/rx/configure
index f4807c8..ab886c1 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -8688,8 +8688,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/sh/configure b/sim/sh/configure
index cbcd18f..ead6d3d 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/sh64/configure b/sim/sh64/configure
index 89b60cb..c31b447 100755
--- a/sim/sh64/configure
+++ b/sim/sh64/configure
@@ -8706,8 +8706,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/sim/v850/configure b/sim/v850/configure
index 47056de..9926027 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -8702,8 +8702,8 @@ fi
# using the same condition.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
--
2.1.0
From 39f3de7c43926181f8f2f57bfa17d4fe9e5748a0 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 2 Apr 2015 05:41:50 -0700
Subject: [PATCH 3/3] Regenerate configure in bfd/binutils/gas/gdb/gold
bfd/
* configure: Regenerated.
binutils/
* configure: Regenerated.
gas/
* configure: Regenerated.
gdb/
* Makefile.in (top_srcdir): New.
* configure: Regenerated.
gold/
* configure: Regenerated.
---
bfd/ChangeLog | 4 ++++
bfd/configure | 4 ++--
binutils/ChangeLog | 4 ++++
binutils/configure | 4 ++--
gas/ChangeLog | 4 ++++
gas/configure | 4 ++--
gdb/ChangeLog | 5 +++++
gdb/Makefile.in | 1 +
gdb/configure | 4 ++--
gold/ChangeLog | 4 ++++
gold/configure | 4 ++--
11 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9e78a49..1f3dc15 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * configure: Regenerated.
+
2015-04-01 Tejas Belagod <tejas.belagod@arm.com>
Marcus Shawcroft <marcus.shawcroft@arm.com>
Jiong Wang <jiong.wang@arm.com>
diff --git a/bfd/configure b/bfd/configure
index 4f0bdd8..be53faf 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -13857,8 +13857,8 @@ _ACEOF
# This is used only by compress.c.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 3c71c70..023bd98 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * configure: Regenerated.
+
2015-04-02 Mike Frysinger <vapier@gentoo.org>
* MAINTAINERS: Update my e-mail address.
diff --git a/binutils/configure b/binutils/configure
index c5e424e..5db82d7 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -13543,8 +13543,8 @@ _ACEOF
# reading compressed sections).
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2fa2313..1cdc6f1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * configure: Regenerated.
+
2015-04-01 Evandro Menezes <e.menezes@samsung.com>
* config/tc-aarch64.c: Add support for Samsung Exynos M1.
diff --git a/gas/configure b/gas/configure
index 67cf1dc..cb33d03 100755
--- a/gas/configure
+++ b/gas/configure
@@ -14324,8 +14324,8 @@ esac
# Link in zlib if we can. This allows us to write compressed debug sections.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 079a307..73108a1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * Makefile.in (top_srcdir): New.
+ * configure: Regenerated.
+
2015-04-02 Gary Benson <gbenson@redhat.com>
* NEWS: Announce the new default sysroot of "target:".
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8f43617..87645cd 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -105,6 +105,7 @@ POSTCOMPILE = @true
# Directory containing source files.
srcdir = @srcdir@
VPATH = @srcdir@
+top_srcdir = @top_srcdir@
YACC=@YACC@
diff --git a/gdb/configure b/gdb/configure
index 3e031a5..b8d4a7a 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -7020,8 +7020,8 @@ fi
# Link in zlib if we can. This allows us to read compressed debug sections.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 6a84355..ea4390e 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * configure: Regenerated.
+
2015-04-01 Ilya Tocar <ilya.tocar@intel.com>
PR gold/17640
diff --git a/gold/configure b/gold/configure
index d082ffe..a005a75 100755
--- a/gold/configure
+++ b/gold/configure
@@ -6876,8 +6876,8 @@ fi
# Link in zlib if we can. This allows us to write compressed sections.
# Use the system's zlib library.
- zlibdir=-L../zlib
- zlibinc="-I\$(srcdir)/../zlib"
+ zlibdir="-L\$(top_builddir)/../zlib"
+ zlibinc="-I\$(top_srcdir)/../zlib"
# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then :
--
2.1.0