re PR libobjc/78697 (--with-target-bdw-gc-include shouldn't be required to be per multilib)

2017-01-18  Matthias Klose  <doko@ubuntu.com>

        PR libobjc/78697
        * configure.ac: Allow default for --with-target-bdw-gc-include.
        * configure: Regenerate.

        PR libobjc/78698
        * configure.ac: Use the libgc.la file when available.
        * configure: Regenerate.

2017-01-18  Matthias Klose  <doko@ubuntu.com>

       * doc/install.texi: Allow default for --with-target-bdw-gc-include.

From-SVN: r244579

gcc/ChangeLog

+2017-01-18  Matthias Klose  <doko@ubuntu.com>
+
+       * doc/install.texi: Allow default for --with-target-bdw-gc-include.
+
 2016-01-18  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	* config/rs6000/altivec.h (vec_bperm): Change #define.

gcc/doc/install.texi

@@ -2207,8 +2207,12 @@ is named as @samp{.} (dot), or is omitted (e.g.
 The options @option{--with-target-bdw-gc-include} and
 @option{--with-target-bdw-gc-lib} must always be specified together
 for each multilib variant and they take precedence over
-@option{--with-target-bdw-gc}.  If none of these options are
-specified, the library is assumed in default locations.
+@option{--with-target-bdw-gc}.  If @option{--with-target-bdw-gc-include}
+is missing values for a multilib, then the value for the default
+multilib is used (e.g. @samp{--with-target-bdw-gc-include=/opt/bdw-gc/include}
+@samp{--with-target-bdw-gc-lib=/opt/bdw-gc/lib64,32=/opt-bdw-gc/lib32}).
+If none of these options are specified, the library is assumed in
+default locations.
 @end table
 
 @html

libobjc/ChangeLog

+2017-01-18  Matthias Klose  <doko@ubuntu.com>
+
+        PR libobjc/78697
+	* configure.ac: Allow default for --with-target-bdw-gc-include.
+	* configure: Regenerate.
+
+        PR libobjc/78698
+	* configure.ac: Use the libgc.la file when available.
+	* configure: Regenerate.
+
 2017-01-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR other/79046

libobjc/configure

@@ -11567,17 +11567,20 @@ $as_echo "using paths configured with --with-target-bdw-gc options" >&6; }
       for i in `echo $with_target_bdw_gc_include | tr ',' ' '`; do
         case "$i" in
           *=*) sd=${i%%=*}; d=${i#*=} ;;
-          *) sd=.; d=$i ;;
+          *) sd=.; d=$i; fallback=$i ;;
         esac
         if test "$mldir" = "$sd"; then
           bdw_val=$d
         fi
       done
-      if test "x$bdw_val" = x; then
+      if test "x$bdw_val" = x && test "x$bdw_inc_dir" = x && test "x$fallback" != x; then
+        bdw_inc_dir="$fallback"
+      elif test "x$bdw_val" = x; then
         as_fn_error "no multilib path ($mldir) found in --with-target-bdw-gc-include" "$LINENO" 5
-      fi
+      else
         bdw_inc_dir="$bdw_val"
       fi
+    fi
     bdw_val=
     if test "x$with_target_bdw_gc_lib" != x; then
       for i in `echo $with_target_bdw_gc_lib | tr ',' ' '`; do
@@ -11601,11 +11604,20 @@ $as_echo "using paths configured with --with-target-bdw-gc options" >&6; }
       as_fn_error "no multilib path ($mldir) found in --with-target-bdw-gc-lib" "$LINENO" 5
     fi
     BDW_GC_CFLAGS="-I$bdw_inc_dir"
+    if test -f $bdw_lib_dir/libgc.la; then
+      BDW_GC_LIBS="$bdw_lib_dir/libgc.la"
+    else
       BDW_GC_LIBS="-L$bdw_lib_dir -lgc"
+    fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
   fi
 
+  case "$BDW_GC_LIBS" in
+  *libgc.la)
+    use_bdw_gc=yes
+    ;;
+  *)
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for system boehm-gc" >&5
 $as_echo_n "checking for system boehm-gc... " >&6; }
     save_CFLAGS=$CFLAGS
@@ -11670,6 +11682,7 @@ $as_echo "$as_me: WARNING: system bdw-gc not found, not building libobjc_gc" >&2
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
     fi
+  esac
 esac
 
 if test "$use_bdw_gc" = no; then

libobjc/configure.ac

@@ -256,17 +256,20 @@ no)
       for i in `echo $with_target_bdw_gc_include | tr ',' ' '`; do
         case "$i" in
           *=*) sd=${i%%=*}; d=${i#*=} ;;
-          *) sd=.; d=$i ;;
+          *) sd=.; d=$i; fallback=$i ;;
         esac
         if test "$mldir" = "$sd"; then
           bdw_val=$d
         fi
       done
-      if test "x$bdw_val" = x; then
+      if test "x$bdw_val" = x && test "x$bdw_inc_dir" = x && test "x$fallback" != x; then
+        bdw_inc_dir="$fallback"
+      elif test "x$bdw_val" = x; then
         AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-include])
-      fi
+      else
         bdw_inc_dir="$bdw_val"
       fi
+    fi
     bdw_val=
     if test "x$with_target_bdw_gc_lib" != x; then
       for i in `echo $with_target_bdw_gc_lib | tr ',' ' '`; do
@@ -290,10 +293,19 @@ no)
       AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-lib])
     fi
     BDW_GC_CFLAGS="-I$bdw_inc_dir"
+    if test -f $bdw_lib_dir/libgc.la; then
+      BDW_GC_LIBS="$bdw_lib_dir/libgc.la"
+    else
       BDW_GC_LIBS="-L$bdw_lib_dir -lgc"
+    fi
     AC_MSG_RESULT([found])
   fi
 
+  case "$BDW_GC_LIBS" in
+  *libgc.la)
+    use_bdw_gc=yes
+    ;;
+  *)
     AC_MSG_CHECKING([for system boehm-gc])
     save_CFLAGS=$CFLAGS
     save_LIBS=$LIBS
@@ -329,6 +341,7 @@ no)
       use_bdw_gc=yes
       AC_MSG_RESULT([found])
     fi
+  esac
 esac
 
 if test "$use_bdw_gc" = no; then