diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-05-02 14:43:35 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-05-02 14:43:35 +0000 |
| commit | 34efdaf078b01a7387007c4e6bde6db86384c4b7 (patch) | |
| tree | d503eaf41d085669d1481bb46ec038bc866fece6 /libobjc | |
| parent | f733cf303bcdc952c92b81dd62199a40a1f555ec (diff) | |
| download | gcc-tarball-master.tar.gz | |
gcc-7.1.0gcc-7.1.0
Diffstat (limited to 'libobjc')
52 files changed, 540 insertions, 119 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 42bbe88bdb..1dd6d73b35 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,10 +1,68 @@ -2016-08-22 Release Manager +2017-05-02 Release Manager - * GCC 6.2.0 released. + * GCC 7.1.0 released. -2016-04-27 Release Manager +2017-02-07 Richard Biener <rguenther@suse.de> - * GCC 6.1.0 released. + PR tree-optimization/79256 + PR middle-end/79278 + * encoding.c (objc_layout_structure_next_member): Adjust + ADJUST_FIELD_ALIGN usage. + +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 + * configure: Regenerated. + * configure.ac: Add GCC_BASE_VER. + * Makefile.in (gcc_version): Use @get_gcc_base_ver@ instead of cat to + get version from BASE-VER file. + * configure: Regenerated. + +2017-01-01 Jakub Jelinek <jakub@redhat.com> + + Update copyright years. + +2016-12-01 Matthias Klose <doko@ubuntu.com> + + * configure.ac: Don't use pkg-config to check for bdw-gc. + * configure: Regenerate. + +2016-11-30 Matthias Klose <doko@ubuntu.com> + + * configure.ac: Set BDW_GC_CFLAGS and BDW_GC_LIBS after checking + for the existence of the pkg-config modules. + * Regenerate. + +2016-11-30 Jakub Jelinek <jakub@redhat.com> + + * configure.ac (--enable-objc-gc): If not given, default to + enable_objc_gc=no. + * configure: Regenerated. + +2016-11-30 Matthias Klose <doko@ubuntu.com> + + * configure.ac (--enable-objc-gc): Allow to configure with a + system provided boehm-gc. + * configure: Regenerate. + * Makefile.in (OBJC_BOEHM_GC_LIBS): Get value from configure. + * gc.c: Include system bdw-gc headers. + * memory.c: Likewise. + * objects.c: Likewise. + +2016-11-15 Matthias Klose <doko@ubuntu.com> + + * aclocal.m4: Regenerate. + * configure: Likewise. 2016-01-04 Jakub Jelinek <jakub@redhat.com> @@ -3413,7 +3471,7 @@ Mon Sep 21 23:27:10 1998 Ovidiu Predescu <ovidiu@slip.net> * New directory. Moved files from ../gcc/objc. -Copyright (C) 1998-2016 Free Software Foundation, Inc. +Copyright (C) 1998-2017 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index b61823c582..febc92d4b3 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -1,5 +1,5 @@ # Makefile for GNU Objective C runtime library. -# Copyright (C) 1993-2016 Free Software Foundation, Inc. +# Copyright (C) 1993-2017 Free Software Foundation, Inc. #This file is part of GCC. @@ -31,7 +31,7 @@ VPATH = @glibcpp_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ target_noncanonical = @target_noncanonical@ -gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER) host_subdir = @host_subdir@ top_srcdir = @top_srcdir@ multi_basedir = @multi_basedir@ @@ -47,8 +47,6 @@ extra_ldflags_libobjc = @extra_ldflags_libobjc@ top_builddir = . --include ../boehm-gc/threads.mk - libdir = $(exec_prefix)/lib libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) @@ -95,7 +93,7 @@ LIBTOOL_CLEAN = $(LIBTOOL) --mode=clean OBJC_GCFLAGS=@OBJC_GCFLAGS@ OBJC_BOEHM_GC=@OBJC_BOEHM_GC@ OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@ -OBJC_BOEHM_GC_LIBS=../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags) +OBJC_BOEHM_GC_LIBS=@OBJC_BOEHM_GC_LIBS@ INCLUDES = -I$(srcdir)/$(MULTISRCTOP)../gcc \ -I$(srcdir)/$(MULTISRCTOP)../gcc/config \ diff --git a/libobjc/NXConstStr.m b/libobjc/NXConstStr.m index 7e51fe2a00..169a294832 100644 --- a/libobjc/NXConstStr.m +++ b/libobjc/NXConstStr.m @@ -1,5 +1,5 @@ /* Implementation of the NXConstantString class for Objective-C. - Copyright (C) 1995-2016 Free Software Foundation, Inc. + Copyright (C) 1995-2017 Free Software Foundation, Inc. Contributed by Pieter J. Schoenmakers <tiggr@es.ele.tue.nl> This file is part of GCC. diff --git a/libobjc/Object.m b/libobjc/Object.m index 8dfc50f9bc..b281074c53 100644 --- a/libobjc/Object.m +++ b/libobjc/Object.m @@ -1,5 +1,5 @@ /* The implementation of class Object for Objective-C. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/Protocol.m b/libobjc/Protocol.m index 36c81b888a..ab55c1cfc5 100644 --- a/libobjc/Protocol.m +++ b/libobjc/Protocol.m @@ -1,5 +1,5 @@ /* This file contains the implementation of class Protocol. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/accessors.m b/libobjc/accessors.m index 7ee3090bdb..4fba2895ce 100644 --- a/libobjc/accessors.m +++ b/libobjc/accessors.m @@ -1,5 +1,5 @@ /* GNU Objective C Runtime accessors functions - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero This file is part of GCC. diff --git a/libobjc/acinclude.m4 b/libobjc/acinclude.m4 index e52d20b6cf..c4abbf237d 100644 --- a/libobjc/acinclude.m4 +++ b/libobjc/acinclude.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 1994-2016 Free Software Foundation, Inc. +dnl Copyright (C) 1994-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/libobjc/aclocal.m4 b/libobjc/aclocal.m4 index c73ced987c..174f9b7d0d 100644 --- a/libobjc/aclocal.m4 +++ b/libobjc/aclocal.m4 @@ -197,11 +197,11 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_include([../config/lthostflags.m4]) +m4_include([../config/multi.m4]) +m4_include([../config/override.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) m4_include([../ltversion.m4]) m4_include([../lt~obsolete.m4]) -m4_include([../config/lthostflags.m4]) -m4_include([../config/multi.m4]) -m4_include([../config/override.m4]) m4_include([acinclude.m4]) diff --git a/libobjc/class.c b/libobjc/class.c index 986f77859e..53fb5fe8ef 100644 --- a/libobjc/class.c +++ b/libobjc/class.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime class related functions - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup and Dennis Glatting. Lock-free class table code designed and written from scratch by diff --git a/libobjc/configure b/libobjc/configure index 55fcc33dbe..abf5aed71c 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -600,6 +600,11 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +get_gcc_base_ver +OBJC_BOEHM_GC_LIBS +OBJC_BOEHM_GC_INCLUDES +OBJC_BOEHM_GC +OBJC_GCFLAGS SET_MAKE CPP OTOOL64 @@ -654,9 +659,6 @@ host_vendor host_cpu host multi_basedir -OBJC_BOEHM_GC_INCLUDES -OBJC_BOEHM_GC -OBJC_GCFLAGS VERSION target_subdir host_subdir @@ -711,7 +713,6 @@ with_build_libsubdir with_target_subdir with_cross_host enable_version_specific_runtime_libs -enable_objc_gc enable_multilib enable_maintainer_mode enable_shared @@ -721,6 +722,11 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_tls +enable_objc_gc +with_target_bdw_gc +with_target_bdw_gc_include +with_target_bdw_gc_lib +with_gcc_major_version_only ' ac_precious_vars='build_alias host_alias @@ -1343,8 +1349,6 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory - --enable-objc-gc enable the use of Boehm's garbage collector with - the GNU Objective-C runtime. --enable-multilib build many library versions (default) --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -1354,6 +1358,8 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-tls Use thread-local storage [default=yes] + --enable-objc-gc enable use of Boehm's garbage collector with the GNU + Objective-C runtime Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1365,6 +1371,18 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-target-bdw-gc=PATHLIST + specify prefix directory for installed bdw-gc + package. Equivalent to + --with-target-bdw-gc-include=PATH/include plus + --with-target-bdw-gc-lib=PATH/lib + --with-target-bdw-gc-include=PATHLIST + specify directories for installed bdw-gc include + files + --with-target-bdw-gc-lib=PATHLIST + specify directories for installed bdw-gc library + --with-gcc-major-version-only + use only GCC major number in filesystem paths Some influential environment variables: CC C compiler command @@ -2314,28 +2332,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5 $as_echo "$version_specific_libs" >&6; } -# Check whether --enable-objc-gc was given. -if test "${enable_objc_gc+set}" = set; then : - enableval=$enable_objc_gc; case $enable_objc_gc in - no) - OBJC_GCFLAGS='' - OBJC_BOEHM_GC='' - OBJC_BOEHM_GC_INCLUDES='' - ;; - *) - OBJC_GCFLAGS='-DOBJC_WITH_GC=1' - OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la' - OBJC_BOEHM_GC_INCLUDES='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' - ;; -esac -else - OBJC_GCFLAGS=''; OBJC_BOEHM_GC=''; OBJC_BOEHM_GC_INCLUDES='' -fi - - - - - # ----------- # Directories # ----------- @@ -8543,7 +8539,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -10598,7 +10594,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10601 "configure" +#line 10597 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10704,7 +10700,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10707 "configure" +#line 10703 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11499,6 +11495,227 @@ $as_echo "#define HAVE_BITFIELD_TYPE_MATTERS 1" >>confdefs.h fi +# ----------- +# boehm-gc +# ----------- + +# Check whether --enable-objc-gc was given. +if test "${enable_objc_gc+set}" = set; then : + enableval=$enable_objc_gc; +else + enable_objc_gc=no +fi + + +# Check whether --with-target-bdw-gc was given. +if test "${with_target_bdw_gc+set}" = set; then : + withval=$with_target_bdw_gc; +fi + + +# Check whether --with-target-bdw-gc-include was given. +if test "${with_target_bdw_gc_include+set}" = set; then : + withval=$with_target_bdw_gc_include; +fi + + +# Check whether --with-target-bdw-gc-lib was given. +if test "${with_target_bdw_gc_lib+set}" = set; then : + withval=$with_target_bdw_gc_lib; +fi + + +case "$enable_objc_gc" in +no) + use_bdw_gc=no + ;; +*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bdw garbage collector" >&5 +$as_echo_n "checking for bdw garbage collector... " >&6; } + if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then + BDW_GC_CFLAGS= + BDW_GC_LIBS="-lgc" + else + if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then + as_fn_error "found --with-target-bdw-gc-lib but --with-target-bdw-gc-include missing" "$LINENO" 5 + elif test "x$with_target_bdw_gc_include" != x && test "x$with_target_bdw_gc_lib" = x; then + as_fn_error "found --with-target-bdw-gc-include but --with-target-bdw-gc-lib missing" "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using paths configured with --with-target-bdw-gc options" >&5 +$as_echo "using paths configured with --with-target-bdw-gc options" >&6; } + 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 + fi + done + if test "x$bdw_val" = x; then + as_fn_error "no multilib path ($mldir) found in --with-target-bdw-gc" "$LINENO" 5 + 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; fallback=$i ;; + esac + if test "$mldir" = "$sd"; then + bdw_val=$d + fi + done + 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 + 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 + 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 + as_fn_error "no multilib path ($mldir) found in --with-target-bdw-gc-lib" "$LINENO" 5 + fi + bdw_lib_dir="$bdw_val" + fi + if test "x$bdw_inc_dir" = x; then + as_fn_error "no multilib path ($mldir) found in --with-target-bdw-gc-include" "$LINENO" 5 + fi + if test "x$bdw_lib_dir" = x; then + 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 + save_LIBS=$LIBS + CFLAGS="$CFLAGS $BDW_GC_CFLAGS" + LIBS="$LIBS $BDW_GC_LIBS" + if test x$gcc_no_link = xyes; then + as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 +fi +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <gc/gc.h> +int +main () +{ +GC_init() + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + if test "$cross_compiling" = yes; then : + system_bdw_gc_found=no + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <gc/gc.h> + int main() { + GC_init(); + return 0; + } + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + system_bdw_gc_found=yes +else + system_bdw_gc_found=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +else + system_bdw_gc_found=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS=$save_CFLAGS + LIBS=$save_LIBS + if test x$enable_objc_gc = xauto && test x$system_bdw_gc_found = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system bdw-gc not found, not building libobjc_gc" >&5 +$as_echo "$as_me: WARNING: system bdw-gc not found, not building libobjc_gc" >&2;} + use_bdw_gc=no + elif test x$enable_objc_gc = xyes && test x$system_bdw_gc_found = xno; then + as_fn_error "system bdw-gc required but not found" "$LINENO" 5 + else + use_bdw_gc=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } + fi + esac +esac + +if test "$use_bdw_gc" = no; then + OBJC_GCFLAGS='' + OBJC_BOEHM_GC='' + OBJC_BOEHM_GC_INCLUDES='' + OBJC_BOEHM_GC_LIBS='' +else + OBJC_GCFLAGS='-DOBJC_WITH_GC=1' + OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la' + OBJC_BOEHM_GC_INCLUDES=$BDW_GC_CFLAGS + OBJC_BOEHM_GC_LIBS=$BDW_GC_LIBS +fi + + + + + +# Determine what GCC version number to use in filesystem paths. + + get_gcc_base_ver="cat" + +# Check whether --with-gcc-major-version-only was given. +if test "${with_gcc_major_version_only+set}" = set; then : + withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'" + fi + +fi + + + + # ------ # Output # ------ @@ -12207,7 +12424,6 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} CC="$CC" CXX="$CXX" GFORTRAN="$GFORTRAN" -GCJ="$GCJ" # The HP-UX ksh and POSIX shell print the target directory to stdout diff --git a/libobjc/configure.ac b/libobjc/configure.ac index 9dbc16cb9a..c6d48f787a 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1994-2016 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # Originally contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GCC. @@ -57,26 +57,6 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [version_specific_libs=no]) AC_MSG_RESULT($version_specific_libs) -AC_ARG_ENABLE(objc-gc, -[ --enable-objc-gc enable the use of Boehm's garbage collector with - the GNU Objective-C runtime.], -[case $enable_objc_gc in - no) - OBJC_GCFLAGS='' - OBJC_BOEHM_GC='' - OBJC_BOEHM_GC_INCLUDES='' - ;; - *) - OBJC_GCFLAGS='-DOBJC_WITH_GC=1' - OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la' - OBJC_BOEHM_GC_INCLUDES='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' - ;; -esac], -[OBJC_GCFLAGS=''; OBJC_BOEHM_GC=''; OBJC_BOEHM_GC_INCLUDES='']) -AC_SUBST(OBJC_GCFLAGS) -AC_SUBST(OBJC_BOEHM_GC) -AC_SUBST(OBJC_BOEHM_GC_INCLUDES) - # ----------- # Directories # ----------- @@ -214,6 +194,175 @@ GCC_CHECK_TLS gt_BITFIELD_TYPE_MATTERS +# ----------- +# boehm-gc +# ----------- + +AC_ARG_ENABLE(objc-gc, +[AS_HELP_STRING([--enable-objc-gc], + [enable use of Boehm's garbage collector with the + GNU Objective-C runtime])],,enable_objc_gc=no) +AC_ARG_WITH([target-bdw-gc], +[AS_HELP_STRING([--with-target-bdw-gc=PATHLIST], + [specify prefix directory for installed bdw-gc package. + Equivalent to --with-target-bdw-gc-include=PATH/include + plus --with-target-bdw-gc-lib=PATH/lib])]) +AC_ARG_WITH([target-bdw-gc-include], +[AS_HELP_STRING([--with-target-bdw-gc-include=PATHLIST], + [specify directories for installed bdw-gc include files])]) +AC_ARG_WITH([target-bdw-gc-lib], +[AS_HELP_STRING([--with-target-bdw-gc-lib=PATHLIST], + [specify directories for installed bdw-gc library])]) + +case "$enable_objc_gc" in +no) + use_bdw_gc=no + ;; +*) + AC_MSG_CHECKING([for bdw garbage collector]) + if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then + dnl no bdw-gw options, assuming bdw-gc in default locations + BDW_GC_CFLAGS= + BDW_GC_LIBS="-lgc" + else + 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 + AC_MSG_ERROR([found --with-target-bdw-gc-include but --with-target-bdw-gc-lib missing]) + else + AC_MSG_RESULT([using paths configured with --with-target-bdw-gc options]) + 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 + fi + done + if test "x$bdw_val" = x; then + AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc]) + 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; fallback=$i ;; + esac + if test "$mldir" = "$sd"; then + bdw_val=$d + fi + done + 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]) + 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 + 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 + 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_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 + CFLAGS="$CFLAGS $BDW_GC_CFLAGS" + LIBS="$LIBS $BDW_GC_LIBS" + dnl the link test is not good enough for ARM32 multilib detection, + dnl first check to link, then to run + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include <gc/gc.h>],[GC_init()])], + [ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <gc/gc.h> + int main() { + GC_init(); + return 0; + } + ]])], + [system_bdw_gc_found=yes], + [system_bdw_gc_found=no], + dnl assume no system boehm-gc for cross builds ... + [system_bdw_gc_found=no] + ) + ], + [system_bdw_gc_found=no]) + CFLAGS=$save_CFLAGS + LIBS=$save_LIBS + if test x$enable_objc_gc = xauto && test x$system_bdw_gc_found = xno; then + AC_MSG_WARN([system bdw-gc not found, not building libobjc_gc]) + use_bdw_gc=no + elif test x$enable_objc_gc = xyes && test x$system_bdw_gc_found = xno; then + AC_MSG_ERROR([system bdw-gc required but not found]) + else + use_bdw_gc=yes + AC_MSG_RESULT([found]) + fi + esac +esac + +if test "$use_bdw_gc" = no; then + OBJC_GCFLAGS='' + OBJC_BOEHM_GC='' + OBJC_BOEHM_GC_INCLUDES='' + OBJC_BOEHM_GC_LIBS='' +else + OBJC_GCFLAGS='-DOBJC_WITH_GC=1' + OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la' + OBJC_BOEHM_GC_INCLUDES=$BDW_GC_CFLAGS + OBJC_BOEHM_GC_LIBS=$BDW_GC_LIBS +fi +AC_SUBST(OBJC_GCFLAGS) +AC_SUBST(OBJC_BOEHM_GC) +AC_SUBST(OBJC_BOEHM_GC_INCLUDES) +AC_SUBST(OBJC_BOEHM_GC_LIBS) + +# Determine what GCC version number to use in filesystem paths. +GCC_BASE_VER + # ------ # Output # ------ diff --git a/libobjc/encoding.c b/libobjc/encoding.c index e2fff3412b..6f18d60444 100644 --- a/libobjc/encoding.c +++ b/libobjc/encoding.c @@ -1,5 +1,5 @@ /* Encoding of types for Objective C. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup Bitfield support by Ovidiu Predescu @@ -1159,7 +1159,7 @@ objc_layout_structure_next_member (struct objc_struct_layout *layout) desired_align = MIN (desired_align, BIGGEST_FIELD_ALIGNMENT); #endif #ifdef ADJUST_FIELD_ALIGN - desired_align = ADJUST_FIELD_ALIGN (type, desired_align); + desired_align = ADJUST_FIELD_ALIGN (type, type, desired_align); #endif /* Record must have at least as much alignment as any field. diff --git a/libobjc/error.c b/libobjc/error.c index 23c7f723cb..6bbb352665 100644 --- a/libobjc/error.c +++ b/libobjc/error.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime Error Functions - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/exception.c b/libobjc/exception.c index 5c7fffd8c5..312cb8e641 100644 --- a/libobjc/exception.c +++ b/libobjc/exception.c @@ -1,5 +1,5 @@ /* The implementation of exception handling primitives for Objective-C. - Copyright (C) 2004-2016 Free Software Foundation, Inc. + Copyright (C) 2004-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/gc.c b/libobjc/gc.c index a090a522dd..e3e41d8524 100644 --- a/libobjc/gc.c +++ b/libobjc/gc.c @@ -1,5 +1,5 @@ /* Basic data types for Objective C. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2017 Free Software Foundation, Inc. Contributed by Ovidiu Predescu. This file is part of GCC. @@ -36,7 +36,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "objc/runtime.h" #include "objc-private/module-abi-8.h" -#include <gc.h> +#include <gc/gc.h> #include <limits.h> /* gc_typed.h uses the following but doesn't declare them */ @@ -44,7 +44,7 @@ typedef GC_word word; typedef GC_signed_word signed_word; #define BITS_PER_WORD (CHAR_BIT * sizeof (word)) -#include <gc_typed.h> +#include <gc/gc_typed.h> /* The following functions set up in `mask` the corresponding pointers. The offset is incremented with the size of the type. */ diff --git a/libobjc/hash.c b/libobjc/hash.c index 1d49925c22..6648199a53 100644 --- a/libobjc/hash.c +++ b/libobjc/hash.c @@ -1,5 +1,5 @@ /* Hash tables for Objective C internal structures - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/init.c b/libobjc/init.c index 56e047c759..a0555a86b2 100644 --- a/libobjc/init.c +++ b/libobjc/init.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime initialization - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup +load support contributed by Ovidiu Predescu <ovidiu@net-community.com> diff --git a/libobjc/ivars.c b/libobjc/ivars.c index 7721ef27ad..6a41087ba5 100644 --- a/libobjc/ivars.c +++ b/libobjc/ivars.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime ivar related functions. - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero This file is part of GCC. diff --git a/libobjc/libobjc.def b/libobjc/libobjc.def index 4f072509d5..a5b070dff8 100644 --- a/libobjc/libobjc.def +++ b/libobjc/libobjc.def @@ -1,5 +1,5 @@ ; GNU Objective C Runtime DLL Export Definitions -; Copyright (C) 1997-2016 Free Software Foundation, Inc. +; Copyright (C) 1997-2017 Free Software Foundation, Inc. ; Contributed by Scott Christley <scottc@net-community.com> ; ; This file is part of GCC. diff --git a/libobjc/linking.m b/libobjc/linking.m index 73dcfeedea..970e1b0544 100644 --- a/libobjc/linking.m +++ b/libobjc/linking.m @@ -1,5 +1,5 @@ /* Force linking of classes required by Objective C runtime. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2017 Free Software Foundation, Inc. Contributed by Ovidiu Predescu (ovidiu@net-community.com). This file is part of GCC. diff --git a/libobjc/memory.c b/libobjc/memory.c index ee28f82cf5..9ad3378efe 100644 --- a/libobjc/memory.c +++ b/libobjc/memory.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime Memory allocation functions - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup This file is part of GCC. @@ -41,7 +41,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "objc/runtime.h" #if OBJC_WITH_GC -#include <gc.h> +#include <gc/gc.h> void * objc_malloc (size_t size) diff --git a/libobjc/methods.c b/libobjc/methods.c index f478d1cf62..04b1ba2ea9 100644 --- a/libobjc/methods.c +++ b/libobjc/methods.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime method related functions. - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero This file is part of GCC. diff --git a/libobjc/nil_method.c b/libobjc/nil_method.c index 165a9d4c89..f14ebba8e0 100644 --- a/libobjc/nil_method.c +++ b/libobjc/nil_method.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime nil receiver function - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup This file is part of GCC. diff --git a/libobjc/objc-foreach.c b/libobjc/objc-foreach.c index e26f82deb6..c9c0f0e5e2 100644 --- a/libobjc/objc-foreach.c +++ b/libobjc/objc-foreach.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime 'fast enumeration' implementation - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc-private/accessors.h b/libobjc/objc-private/accessors.h index 7f4362847b..a81c71918d 100644 --- a/libobjc/objc-private/accessors.h +++ b/libobjc/objc-private/accessors.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime accessors - Private Declarations - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc-private/common.h b/libobjc/objc-private/common.h index 658b0cb11a..59834a56ce 100644 --- a/libobjc/objc-private/common.h +++ b/libobjc/objc-private/common.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime Common Private Definitions - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero This file is part of GCC. diff --git a/libobjc/objc-private/error.h b/libobjc/objc-private/error.h index 7d76bd2063..7d137281fd 100644 --- a/libobjc/objc-private/error.h +++ b/libobjc/objc-private/error.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime Common Private Definitions - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero This file is part of GCC. diff --git a/libobjc/objc-private/hash.h b/libobjc/objc-private/hash.h index 54202786c5..3e7fd674ab 100644 --- a/libobjc/objc-private/hash.h +++ b/libobjc/objc-private/hash.h @@ -1,5 +1,5 @@ /* Hash tables for Objective C method dispatch. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/objc-private/module-abi-8.h b/libobjc/objc-private/module-abi-8.h index f4abee28fe..77917277c7 100644 --- a/libobjc/objc-private/module-abi-8.h +++ b/libobjc/objc-private/module-abi-8.h @@ -1,5 +1,5 @@ /* Definitions of Module Structures used by ABI version 8 - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/objc-private/objc-list.h b/libobjc/objc-private/objc-list.h index e3ecffbd0b..c96a58146b 100644 --- a/libobjc/objc-private/objc-list.h +++ b/libobjc/objc-private/objc-list.h @@ -1,5 +1,5 @@ /* Generic single linked list to keep various information - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup. This file is part of GCC. diff --git a/libobjc/objc-private/objc-sync.h b/libobjc/objc-private/objc-sync.h index 681183a414..b67a2dc37f 100644 --- a/libobjc/objc-private/objc-sync.h +++ b/libobjc/objc-private/objc-sync.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime @synchronized implementation - Private functions - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc-private/protocols.h b/libobjc/objc-private/protocols.h index a85f45d759..0860091cf7 100644 --- a/libobjc/objc-private/protocols.h +++ b/libobjc/objc-private/protocols.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime protocols - Private functions - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc-private/runtime.h b/libobjc/objc-private/runtime.h index a2ffaad6bb..209aae7e4a 100644 --- a/libobjc/objc-private/runtime.h +++ b/libobjc/objc-private/runtime.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime internal declarations - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup This file is part of GCC. diff --git a/libobjc/objc-private/sarray.h b/libobjc/objc-private/sarray.h index 1c9a9b09de..c90bb57dad 100644 --- a/libobjc/objc-private/sarray.h +++ b/libobjc/objc-private/sarray.h @@ -1,5 +1,5 @@ /* Sparse Arrays for Objective C dispatch tables - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup. This file is part of GCC. diff --git a/libobjc/objc-private/selector.h b/libobjc/objc-private/selector.h index 2d50a040b5..c14f80203d 100644 --- a/libobjc/objc-private/selector.h +++ b/libobjc/objc-private/selector.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime selector implementation - Private functions - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc-sync.c b/libobjc/objc-sync.c index 5a4000bdc6..c78b609c67 100644 --- a/libobjc/objc-sync.c +++ b/libobjc/objc-sync.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime @synchronized implementation - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc/NXConstStr.h b/libobjc/objc/NXConstStr.h index e760ad5a13..acc42d67f2 100644 --- a/libobjc/objc/NXConstStr.h +++ b/libobjc/objc/NXConstStr.h @@ -1,5 +1,5 @@ /* Interface for the NXConstantString class for Objective-C. - Copyright (C) 1995-2016 Free Software Foundation, Inc. + Copyright (C) 1995-2017 Free Software Foundation, Inc. Contributed by Pieter J. Schoenmakers <tiggr@es.ele.tue.nl> This file is part of GCC. diff --git a/libobjc/objc/Object.h b/libobjc/objc/Object.h index f69f8139e8..a6e85dd133 100644 --- a/libobjc/objc/Object.h +++ b/libobjc/objc/Object.h @@ -1,5 +1,5 @@ /* Interface for the Object class for Objective-C. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/objc/Protocol.h b/libobjc/objc/Protocol.h index d58febded5..50c383800d 100644 --- a/libobjc/objc/Protocol.h +++ b/libobjc/objc/Protocol.h @@ -1,5 +1,5 @@ /* Declare the class Protocol for Objective C programs. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/objc/message.h b/libobjc/objc/message.h index 1f94775d5f..6bb5aa7bf4 100644 --- a/libobjc/objc/message.h +++ b/libobjc/objc/message.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime messaging declarations - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/objc/objc-decls.h b/libobjc/objc/objc-decls.h index 380d9da2a8..3dd1135adb 100644 --- a/libobjc/objc/objc-decls.h +++ b/libobjc/objc/objc-decls.h @@ -1,5 +1,5 @@ /* GNU Objective-C Extern helpers for Win32. - Copyright (C) 2004-2016 Free Software Foundation, Inc. + Copyright (C) 2004-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/objc/objc-exception.h b/libobjc/objc/objc-exception.h index 6a4ab68ccd..0bec446902 100644 --- a/libobjc/objc/objc-exception.h +++ b/libobjc/objc/objc-exception.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime native exceptions - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc/objc-sync.h b/libobjc/objc/objc-sync.h index 5a8df65dbf..8157566d56 100644 --- a/libobjc/objc/objc-sync.h +++ b/libobjc/objc/objc-sync.h @@ -1,5 +1,5 @@ /* GNU Objective C Runtime @synchronized implementation - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc/objc.h b/libobjc/objc/objc.h index 37391a446b..20fcdb4aa9 100644 --- a/libobjc/objc/objc.h +++ b/libobjc/objc/objc.h @@ -1,5 +1,5 @@ /* Basic data types for Objective C. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/objc/runtime.h b/libobjc/objc/runtime.h index d58bf73bde..303569acaf 100644 --- a/libobjc/objc/runtime.h +++ b/libobjc/objc/runtime.h @@ -1,5 +1,5 @@ /* GNU Objective-C Runtime API - Modern API - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero <nicola.pero@meta-innovation.com> This file is part of GCC. diff --git a/libobjc/objc/thr.h b/libobjc/objc/thr.h index 5dd4fdcccb..e4bd8f0ac6 100644 --- a/libobjc/objc/thr.h +++ b/libobjc/objc/thr.h @@ -1,5 +1,5 @@ /* Thread and mutex controls for Objective C. - Copyright (C) 1996-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2017 Free Software Foundation, Inc. Contributed by Galen C. Hunt (gchunt@cs.rochester.edu) This file is part of GCC. diff --git a/libobjc/objects.c b/libobjc/objects.c index 056f82d496..db30b38f3f 100644 --- a/libobjc/objects.c +++ b/libobjc/objects.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime class related functions - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup This file is part of GCC. @@ -31,8 +31,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include <string.h> /* For memcpy() */ #if OBJC_WITH_GC -# include <gc.h> -# include <gc_typed.h> +# include <gc/gc.h> +# include <gc/gc_typed.h> #endif /* FIXME: The semantics of extraBytes are not really clear. */ diff --git a/libobjc/protocols.c b/libobjc/protocols.c index 7b6609c591..f6090fbda8 100644 --- a/libobjc/protocols.c +++ b/libobjc/protocols.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime protocol related functions. - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. Contributed by Nicola Pero This file is part of GCC. diff --git a/libobjc/sarray.c b/libobjc/sarray.c index c5f352eca9..ccec8c47c4 100644 --- a/libobjc/sarray.c +++ b/libobjc/sarray.c @@ -1,5 +1,5 @@ /* Sparse Arrays for Objective C dispatch tables - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libobjc/selector.c b/libobjc/selector.c index cc1fa0f8c6..809e38e1be 100644 --- a/libobjc/selector.c +++ b/libobjc/selector.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime selector related functions - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup This file is part of GCC. diff --git a/libobjc/sendmsg.c b/libobjc/sendmsg.c index 7f149e690c..fa1deee54a 100644 --- a/libobjc/sendmsg.c +++ b/libobjc/sendmsg.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime message lookup - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup This file is part of GCC. diff --git a/libobjc/thr.c b/libobjc/thr.c index d9d19e5980..cbd5b8dd34 100644 --- a/libobjc/thr.c +++ b/libobjc/thr.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime Thread Interface - Copyright (C) 1996-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2017 Free Software Foundation, Inc. Contributed by Galen C. Hunt (gchunt@cs.rochester.edu) This file is part of GCC. |