diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rwxr-xr-x | bfd/configure | 28 | ||||
| -rw-r--r-- | bfd/configure.in | 6 |
3 files changed, 26 insertions, 14 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ae475d3..3ed8fd2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ 2001-10-21 H.J. Lu <hjl@gnu.org> + * configure.in (WIN32LIBADD): Check if PICFLAG is defined in + ../libiberty/Makefile instead of $enable_shared. + * configure: Rebuild. + +2001-10-21 H.J. Lu <hjl@gnu.org> + * elf32-cris.c (cris_reloc_type_lookup): Use int for index. 2001-10-20 H.J. Lu <hjl@gnu.org> diff --git a/bfd/configure b/bfd/configure index 25f2d20..24e3c69 100755 --- a/bfd/configure +++ b/bfd/configure @@ -5822,7 +5822,9 @@ case "${host}" in *) # We borrow WIN32LIBADD so that the shared libbfd won't depend on # libiberty.a. - if test "$enable_shared" = "yes"; then + PICFLAG= + eval `grep "^[ ]*PICFLAG[ ]*=" ../libiberty/Makefile | sed -e "s/[ ]*//g"` + if test -n "$PICFLAG"; then WIN32LIBADD="-L../libiberty/pic -liberty" fi ;; @@ -6183,17 +6185,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6187: checking for $ac_hdr" >&5 +echo "configure:6189: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6192 "configure" +#line 6194 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6222,12 +6224,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6226: checking for $ac_func" >&5 +echo "configure:6228: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6231 "configure" +#line 6233 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6250,7 +6252,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6275,7 +6277,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:6279: checking for working mmap" >&5 +echo "configure:6281: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6283,7 +6285,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 6287 "configure" +#line 6289 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -6423,7 +6425,7 @@ main() } EOF -if { (eval echo configure:6427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -6448,12 +6450,12 @@ fi for ac_func in madvise mprotect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6452: checking for $ac_func" >&5 +echo "configure:6454: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6457 "configure" +#line 6459 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6476,7 +6478,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff --git a/bfd/configure.in b/bfd/configure.in index a52f57d..728811c 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -413,7 +413,11 @@ case "${host}" in *) # We borrow WIN32LIBADD so that the shared libbfd won't depend on # libiberty.a. - if test "$enable_shared" = "yes"; then + PICFLAG= + changequote(,)dnl + eval `grep "^[ ]*PICFLAG[ ]*=" ../libiberty/Makefile | sed -e "s/[ ]*//g"` + changequote([,])dnl + if test -n "$PICFLAG"; then WIN32LIBADD="-L../libiberty/pic -liberty" fi ;; |