[gcc-7] 48/354: - update libobjc-system-gc.diff

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:29 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit d66773c2606fb3dac61dc717638068bd8f5ff194
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Nov 23 23:06:39 2016 +0000

     - update libobjc-system-gc.diff
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9129 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/libobjc-system-gc.diff | 209 ++++++++++++++++++----------------
 1 file changed, 112 insertions(+), 97 deletions(-)

diff --git a/debian/patches/libobjc-system-gc.diff b/debian/patches/libobjc-system-gc.diff
index 3a377db..c4ff300 100644
--- a/debian/patches/libobjc-system-gc.diff
+++ b/debian/patches/libobjc-system-gc.diff
@@ -39,9 +39,11 @@ boehm-gc/
 
 	Remove
 
+Index: b/src/Makefile.def
+===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -166,7 +166,6 @@
+@@ -166,7 +166,6 @@ target_modules = { module= winsup; };
  target_modules = { module= libgloss; no_check=true; };
  target_modules = { module= libffi; no_install=true; };
  target_modules = { module= zlib; };
@@ -49,7 +51,7 @@ boehm-gc/
  target_modules = { module= rda; };
  target_modules = { module= libada; };
  target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
-@@ -543,7 +542,6 @@
+@@ -543,7 +542,6 @@ lang_env_dependencies = { module=libgcc;
  // a dependency on libgcc for native targets to configure.
  lang_env_dependencies = { module=libiberty; no_c=true; };
  
@@ -57,7 +59,7 @@ boehm-gc/
  dependencies = { module=configure-target-fastjar; on=configure-target-zlib; };
  dependencies = { module=all-target-fastjar; on=all-target-zlib; };
  dependencies = { module=configure-target-libgo; on=configure-target-libffi; };
-@@ -551,8 +549,6 @@
+@@ -551,8 +549,6 @@ dependencies = { module=configure-target
  dependencies = { module=all-target-libgo; on=all-target-libbacktrace; };
  dependencies = { module=all-target-libgo; on=all-target-libffi; };
  dependencies = { module=all-target-libgo; on=all-target-libatomic; };
@@ -66,9 +68,11 @@ boehm-gc/
  dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
  dependencies = { module=configure-target-liboffloadmic; on=configure-target-libgomp; };
  dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; };
+Index: b/src/Makefile.in
+===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -998,7 +998,6 @@
+@@ -998,7 +998,6 @@ configure-target:  \
      maybe-configure-target-libgloss \
      maybe-configure-target-libffi \
      maybe-configure-target-zlib \
@@ -76,7 +80,7 @@ boehm-gc/
      maybe-configure-target-rda \
      maybe-configure-target-libada \
      maybe-configure-target-libgomp \
-@@ -1164,7 +1163,6 @@
+@@ -1164,7 +1163,6 @@ all-target: maybe-all-target-winsup
  all-target: maybe-all-target-libgloss
  all-target: maybe-all-target-libffi
  all-target: maybe-all-target-zlib
@@ -84,7 +88,7 @@ boehm-gc/
  all-target: maybe-all-target-rda
  all-target: maybe-all-target-libada
  @if target-libgomp-no-bootstrap
-@@ -1257,7 +1255,6 @@
+@@ -1257,7 +1255,6 @@ info-target: maybe-info-target-winsup
  info-target: maybe-info-target-libgloss
  info-target: maybe-info-target-libffi
  info-target: maybe-info-target-zlib
@@ -92,7 +96,7 @@ boehm-gc/
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
  info-target: maybe-info-target-libgomp
-@@ -1343,7 +1340,6 @@
+@@ -1343,7 +1340,6 @@ dvi-target: maybe-dvi-target-winsup
  dvi-target: maybe-dvi-target-libgloss
  dvi-target: maybe-dvi-target-libffi
  dvi-target: maybe-dvi-target-zlib
@@ -100,7 +104,7 @@ boehm-gc/
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
  dvi-target: maybe-dvi-target-libgomp
-@@ -1429,7 +1425,6 @@
+@@ -1429,7 +1425,6 @@ pdf-target: maybe-pdf-target-winsup
  pdf-target: maybe-pdf-target-libgloss
  pdf-target: maybe-pdf-target-libffi
  pdf-target: maybe-pdf-target-zlib
@@ -108,7 +112,7 @@ boehm-gc/
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
  pdf-target: maybe-pdf-target-libgomp
-@@ -1515,7 +1510,6 @@
+@@ -1515,7 +1510,6 @@ html-target: maybe-html-target-winsup
  html-target: maybe-html-target-libgloss
  html-target: maybe-html-target-libffi
  html-target: maybe-html-target-zlib
@@ -116,7 +120,7 @@ boehm-gc/
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
  html-target: maybe-html-target-libgomp
-@@ -1601,7 +1595,6 @@
+@@ -1601,7 +1595,6 @@ TAGS-target: maybe-TAGS-target-winsup
  TAGS-target: maybe-TAGS-target-libgloss
  TAGS-target: maybe-TAGS-target-libffi
  TAGS-target: maybe-TAGS-target-zlib
@@ -124,7 +128,7 @@ boehm-gc/
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
  TAGS-target: maybe-TAGS-target-libgomp
-@@ -1687,7 +1680,6 @@
+@@ -1687,7 +1680,6 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-libgloss
  install-info-target: maybe-install-info-target-libffi
  install-info-target: maybe-install-info-target-zlib
@@ -132,7 +136,7 @@ boehm-gc/
  install-info-target: maybe-install-info-target-rda
  install-info-target: maybe-install-info-target-libada
  install-info-target: maybe-install-info-target-libgomp
-@@ -1773,7 +1765,6 @@
+@@ -1773,7 +1765,6 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-libgloss
  install-pdf-target: maybe-install-pdf-target-libffi
  install-pdf-target: maybe-install-pdf-target-zlib
@@ -140,7 +144,7 @@ boehm-gc/
  install-pdf-target: maybe-install-pdf-target-rda
  install-pdf-target: maybe-install-pdf-target-libada
  install-pdf-target: maybe-install-pdf-target-libgomp
-@@ -1859,7 +1850,6 @@
+@@ -1859,7 +1850,6 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-libgloss
  install-html-target: maybe-install-html-target-libffi
  install-html-target: maybe-install-html-target-zlib
@@ -148,7 +152,7 @@ boehm-gc/
  install-html-target: maybe-install-html-target-rda
  install-html-target: maybe-install-html-target-libada
  install-html-target: maybe-install-html-target-libgomp
-@@ -1945,7 +1935,6 @@
+@@ -1945,7 +1935,6 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-libgloss
  installcheck-target: maybe-installcheck-target-libffi
  installcheck-target: maybe-installcheck-target-zlib
@@ -156,7 +160,7 @@ boehm-gc/
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
  installcheck-target: maybe-installcheck-target-libgomp
-@@ -2031,7 +2020,6 @@
+@@ -2031,7 +2020,6 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-libgloss
  mostlyclean-target: maybe-mostlyclean-target-libffi
  mostlyclean-target: maybe-mostlyclean-target-zlib
@@ -164,7 +168,7 @@ boehm-gc/
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
  mostlyclean-target: maybe-mostlyclean-target-libgomp
-@@ -2117,7 +2105,6 @@
+@@ -2117,7 +2105,6 @@ clean-target: maybe-clean-target-winsup
  clean-target: maybe-clean-target-libgloss
  clean-target: maybe-clean-target-libffi
  clean-target: maybe-clean-target-zlib
@@ -172,7 +176,7 @@ boehm-gc/
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
  clean-target: maybe-clean-target-libgomp
-@@ -2203,7 +2190,6 @@
+@@ -2203,7 +2190,6 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-libgloss
  distclean-target: maybe-distclean-target-libffi
  distclean-target: maybe-distclean-target-zlib
@@ -180,7 +184,7 @@ boehm-gc/
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
  distclean-target: maybe-distclean-target-libgomp
-@@ -2289,7 +2275,6 @@
+@@ -2289,7 +2275,6 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-libgloss
  maintainer-clean-target: maybe-maintainer-clean-target-libffi
  maintainer-clean-target: maybe-maintainer-clean-target-zlib
@@ -188,7 +192,7 @@ boehm-gc/
  maintainer-clean-target: maybe-maintainer-clean-target-rda
  maintainer-clean-target: maybe-maintainer-clean-target-libada
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
-@@ -2431,7 +2416,6 @@
+@@ -2431,7 +2416,6 @@ check-target:  \
      maybe-check-target-libgloss \
      maybe-check-target-libffi \
      maybe-check-target-zlib \
@@ -196,7 +200,7 @@ boehm-gc/
      maybe-check-target-rda \
      maybe-check-target-libada \
      maybe-check-target-libgomp \
-@@ -2613,7 +2597,6 @@
+@@ -2613,7 +2597,6 @@ install-target:  \
      maybe-install-target-libgloss \
      maybe-install-target-libffi \
      maybe-install-target-zlib \
@@ -204,7 +208,7 @@ boehm-gc/
      maybe-install-target-rda \
      maybe-install-target-libada \
      maybe-install-target-libgomp \
-@@ -2719,7 +2702,6 @@
+@@ -2719,7 +2702,6 @@ install-strip-target:  \
      maybe-install-strip-target-libgloss \
      maybe-install-strip-target-libffi \
      maybe-install-strip-target-zlib \
@@ -212,7 +216,7 @@ boehm-gc/
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
      maybe-install-strip-target-libgomp \
-@@ -48324,464 +48306,6 @@
+@@ -48324,464 +48306,6 @@ maintainer-clean-target-zlib:
  
  
  
@@ -677,7 +681,7 @@ boehm-gc/
  .PHONY: configure-target-rda maybe-configure-target-rda
  maybe-configure-target-rda:
  @if gcc-bootstrap
-@@ -54740,7 +54264,6 @@
+@@ -54740,7 +54264,6 @@ configure-target-winsup: stage_last
  configure-target-libgloss: stage_last
  configure-target-libffi: stage_last
  configure-target-zlib: stage_last
@@ -685,7 +689,7 @@ boehm-gc/
  configure-target-rda: stage_last
  configure-target-libada: stage_last
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
-@@ -54775,7 +54298,6 @@
+@@ -54775,7 +54298,6 @@ configure-target-winsup: maybe-all-gcc
  configure-target-libgloss: maybe-all-gcc
  configure-target-libffi: maybe-all-gcc
  configure-target-zlib: maybe-all-gcc
@@ -693,7 +697,7 @@ boehm-gc/
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
  configure-target-libgomp: maybe-all-gcc
-@@ -55790,7 +55312,6 @@
+@@ -55790,7 +55312,6 @@ all-flex: maybe-all-m4
  all-flex: maybe-all-build-texinfo
  all-m4: maybe-all-intl
  all-m4: maybe-all-build-texinfo
@@ -701,7 +705,7 @@ boehm-gc/
  configure-target-fastjar: maybe-configure-target-zlib
  all-target-fastjar: maybe-all-target-zlib
  configure-target-libgo: maybe-configure-target-libffi
-@@ -55798,8 +55319,6 @@
+@@ -55798,8 +55319,6 @@ configure-target-libgo: maybe-all-target
  all-target-libgo: maybe-all-target-libbacktrace
  all-target-libgo: maybe-all-target-libffi
  all-target-libgo: maybe-all-target-libatomic
@@ -710,7 +714,7 @@ boehm-gc/
  configure-target-libstdc++-v3: maybe-configure-target-libgomp
  
  configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
-@@ -55931,7 +55450,6 @@
+@@ -55931,7 +55450,6 @@ configure-target-winsup: maybe-all-targe
  configure-target-libgloss: maybe-all-target-libgcc
  configure-target-libffi: maybe-all-target-libgcc
  configure-target-zlib: maybe-all-target-libgcc
@@ -718,7 +722,7 @@ boehm-gc/
  configure-target-rda: maybe-all-target-libgcc
  configure-target-libada: maybe-all-target-libgcc
  configure-target-libgomp: maybe-all-target-libgcc
-@@ -55978,8 +55496,6 @@
+@@ -55978,8 +55496,6 @@ configure-target-libffi: maybe-all-targe
  
  configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
  
@@ -727,7 +731,9 @@ boehm-gc/
  configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
  
  configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
---- a/src/config/pkg.m4
+Index: b/src/config/pkg.m4
+===================================================================
+--- /dev/null
 +++ b/src/config/pkg.m4
 @@ -0,0 +1,825 @@
 +dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
@@ -1555,9 +1561,11 @@ boehm-gc/
 +
 +AS_VAR_IF([$1], [""], [$5], [$4])dnl
 +])dnl PKG_CHECK_VAR
+Index: b/src/configure.ac
+===================================================================
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,7 @@ m4_include([ltsugar.m4])
  m4_include([ltversion.m4])
  m4_include([lt~obsolete.m4])
  m4_include([config/isl.m4])
@@ -1565,7 +1573,7 @@ boehm-gc/
  
  AC_INIT(move-if-change)
  AC_PREREQ(2.64)
-@@ -161,7 +162,6 @@
+@@ -161,7 +162,6 @@ target_libraries="target-libgcc \
  		target-libssp \
  		target-libquadmath \
  		target-libgfortran \
@@ -1573,7 +1581,7 @@ boehm-gc/
  		target-libffi \
  		target-libobjc \
  		target-libada \
-@@ -2060,22 +2060,36 @@
+@@ -2060,22 +2060,36 @@ done
  AC_ARG_ENABLE(objc-gc,
  [AS_HELP_STRING([--enable-objc-gc],
  		[enable use of Boehm's garbage collector with the
@@ -1626,9 +1634,11 @@ boehm-gc/
  esac
  
  # Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++
+Index: b/src/libobjc/Makefile.in
+===================================================================
 --- a/src/libobjc/Makefile.in
 +++ b/src/libobjc/Makefile.in
-@@ -47,8 +47,6 @@
+@@ -47,8 +47,6 @@ extra_ldflags_libobjc = @extra_ldflags_l
  
  top_builddir = .
  
@@ -1637,7 +1647,7 @@ boehm-gc/
  libdir = $(exec_prefix)/lib
  libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
  
-@@ -95,7 +93,7 @@
+@@ -95,7 +93,7 @@ LIBTOOL_CLEAN   = $(LIBTOOL) --mode=clea
  OBJC_GCFLAGS=@OBJC_GCFLAGS@
  OBJC_BOEHM_GC=@OBJC_BOEHM_GC@
  OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@
@@ -1646,6 +1656,8 @@ boehm-gc/
  
  INCLUDES = -I$(srcdir)/$(MULTISRCTOP)../gcc \
    -I$(srcdir)/$(MULTISRCTOP)../gcc/config \
+Index: b/src/libobjc/configure.ac
+===================================================================
 --- a/src/libobjc/configure.ac
 +++ b/src/libobjc/configure.ac
 @@ -18,6 +18,8 @@
@@ -1657,7 +1669,7 @@ boehm-gc/
  AC_PREREQ(2.64)
  AC_INIT(package-unused, version-unused,, libobjc)
  AC_CONFIG_SRCDIR([objc/objc.h])
-@@ -57,26 +59,6 @@
+@@ -57,26 +59,6 @@ AC_ARG_ENABLE(version-specific-runtime-l
  [version_specific_libs=no])
  AC_MSG_RESULT($version_specific_libs)
  
@@ -1684,7 +1696,7 @@ boehm-gc/
  # -----------
  # Directories
  # -----------
-@@ -214,6 +196,163 @@
+@@ -214,6 +196,160 @@ GCC_CHECK_TLS
  
  gt_BITFIELD_TYPE_MATTERS
  
@@ -1720,7 +1732,7 @@ boehm-gc/
 +      AC_MSG_RESULT([using bdw-gc pkg-config module]),
 +      AC_MSG_ERROR([no --with-target-bdw-gc options and no bdw-gc pkg-config module found]))
 +  else
-+    dnl bdw-gw options, first error checking, complete checking in libobjc
++    dnl bdw-gw options passed by configure flags
 +    if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then
 +      AC_MSG_ERROR([found --with-target-bdw-gc-lib but --with-target-bdw-gc-include missing])
 +    elif test "x$with_target_bdw_gc_include" != x && test "x$with_target_bdw_gc_lib" = x; then
@@ -1728,70 +1740,67 @@ boehm-gc/
 +    else
 +      AC_MSG_RESULT([using paths configured with --with-target-bdw-gc options])
 +    fi
-+  fi
-+  mldir=`${CC-gcc} --print-multi-directory 2>/dev/null`
-+  bdw_val=
-+  if test "x$with_target_bdw_gc" != x; then
-+    for i in `echo $with_target_bdw_gc | tr ',' ' '`; do
-+      case "$i" in
-+        *=*) sd=${i%%=*}; d=${i#*=} ;;
-+        *) sd=.; d=$i ;;
-+      esac
-+      if test "$mldir" = "$sd"; then
-+        bdw_val=$d
++    mldir=`${CC-gcc} --print-multi-directory 2>/dev/null`
++    bdw_val=
++    if test "x$with_target_bdw_gc" != x; then
++      for i in `echo $with_target_bdw_gc | tr ',' ' '`; do
++        case "$i" in
++          *=*) sd=${i%%=*}; d=${i#*=} ;;
++          *) sd=.; d=$i ;;
++        esac
++        if test "$mldir" = "$sd"; then
++          bdw_val=$d
++        fi
++      done
++      if test "x$bdw_val" = x; then
++        AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc])
 +      fi
-+    done
-+    if test "x$bdw_val" = x; then
-+      AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc])
++      bdw_inc_dir="$bdw_val/include"
++      bdw_lib_dir="$bdw_val/lib"
 +    fi
-+    bdw_inc_dir="$bdw_val/include"
-+    bdw_lib_dir="$bdw_val/lib"
-+  fi
-+  bdw_val=
-+  if test "x$with_target_bdw_gc_include" != x; then
-+    for i in `echo $with_target_bdw_gc_include | tr ',' ' '`; do
-+      case "$i" in
-+        *=*) sd=${i%%=*}; d=${i#*=} ;;
-+        *) sd=.; d=$i ;;
-+      esac
-+      if test "$mldir" = "$sd"; then
-+        bdw_val=$d
++    bdw_val=
++    if test "x$with_target_bdw_gc_include" != x; then
++      for i in `echo $with_target_bdw_gc_include | tr ',' ' '`; do
++        case "$i" in
++          *=*) sd=${i%%=*}; d=${i#*=} ;;
++          *) sd=.; d=$i ;;
++        esac
++        if test "$mldir" = "$sd"; then
++          bdw_val=$d
++        fi
++      done
++      if test "x$bdw_val" = x; then
++        AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-include])
 +      fi
-+    done
-+    if test "x$bdw_val" = x; then
-+      AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-include])
++      bdw_inc_dir="$bdw_val"
 +    fi
-+    bdw_inc_dir="$bdw_val"
-+  fi
-+  bdw_val=
-+  if test "x$with_target_bdw_gc_lib" != x; then
-+    for i in `echo $with_target_bdw_gc_lib | tr ',' ' '`; do
-+      case "$i" in
-+        *=*) sd=${i%%=*}; d=${i#*=} ;;
-+        *) sd=.; d=$i ;;
-+      esac
-+      if test "$mldir" = "$sd"; then
-+        bdw_val=$d
++    bdw_val=
++    if test "x$with_target_bdw_gc_lib" != x; then
++      for i in `echo $with_target_bdw_gc_lib | tr ',' ' '`; do
++        case "$i" in
++          *=*) sd=${i%%=*}; d=${i#*=} ;;
++          *) sd=.; d=$i ;;
++        esac
++        if test "$mldir" = "$sd"; then
++          bdw_val=$d
++        fi
++      done
++      if test "x$bdw_val" = x; then
++        AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-lib])
 +      fi
-+    done
-+    if test "x$bdw_val" = x; then
++      bdw_lib_dir="$bdw_val"
++    fi
++    if test "x$bdw_inc_dir" = x; then
++      AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-include])
++    fi
++    if test "x$bdw_lib_dir" = x; then
 +      AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-lib])
 +    fi
-+    bdw_lib_dir="$bdw_val"
-+  fi
-+  if test "x$bdw_inc_dir" = x; then
-+    AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-include])
-+  fi
-+  if test "x$bdw_lib_dir" = x; then
-+    AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-lib])
++    BDW_GC_CFLAGS="-I$bdw_inc_dir"
++    BDW_GC_LIBS="-L$bdw_lib_dir -lgc"
++    AC_MSG_RESULT([found])
 +  fi
-+  BDW_GC_CFLAGS="-I$bdw_inc_dir"
-+  BDW_GC_LIBS="-L$bdw_lib_dir -lgc"
-+  AC_MSG_RESULT([found])
-+  use_bdw_gc=maybe
-+esac
 +
-+if test "$use_bdw_gc" = maybe; then
 +  AC_MSG_CHECKING([for system boehm-gc])
 +  save_CFLAGS=$CFLAGS
 +  save_LIBS=$LIBS
@@ -1827,7 +1836,7 @@ boehm-gc/
 +    use_bdw_gc=yes
 +    AC_MSG_RESULT([found])
 +  fi
-+fi
++esac
 +
 +if test "$use_bdw_gc" = no; then
 +  OBJC_GCFLAGS=''
@@ -1848,9 +1857,11 @@ boehm-gc/
  # ------
  # Output
  # ------
+Index: b/src/libobjc/gc.c
+===================================================================
 --- a/src/libobjc/gc.c
 +++ b/src/libobjc/gc.c
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ see the files COPYING3 and COPYING.RUNTI
  #include "objc/runtime.h"
  #include "objc-private/module-abi-8.h"
  
@@ -1859,7 +1870,7 @@ boehm-gc/
  #include <limits.h>
  
  /* gc_typed.h uses the following but doesn't declare them */
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ typedef GC_word word;
  typedef GC_signed_word signed_word;
  #define BITS_PER_WORD (CHAR_BIT * sizeof (word))
  
@@ -1868,9 +1879,11 @@ boehm-gc/
  
  /* The following functions set up in `mask` the corresponding pointers.
     The offset is incremented with the size of the type.  */
+Index: b/src/libobjc/memory.c
+===================================================================
 --- a/src/libobjc/memory.c
 +++ b/src/libobjc/memory.c
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ see the files COPYING3 and COPYING.RUNTI
  #include "objc/runtime.h"
  
  #if OBJC_WITH_GC
@@ -1879,9 +1892,11 @@ boehm-gc/
  
  void *
  objc_malloc (size_t size)
+Index: b/src/libobjc/objects.c
+===================================================================
 --- a/src/libobjc/objects.c
 +++ b/src/libobjc/objects.c
-@@ -31,8 +31,8 @@
+@@ -31,8 +31,8 @@ see the files COPYING3 and COPYING.RUNTI
  #include <string.h>                     /* For memcpy()  */
  
  #if OBJC_WITH_GC

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git



More information about the Reproducible-commits mailing list