diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-26 12:59:00 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-26 12:59:00 +0200 |
| commit | 62e475bad0d668c432bb97113cbf73fa281b8b55 (patch) | |
| tree | 1c8993afe363ddbf4ae80795e47042df1e33d181 /libgcc | |
| parent | 5776a5ffab3b92d6ccac87ccf32c580ee2742d5a (diff) | |
| parent | d80b7744c6ae6f6d8ca1f56982a50d1888b8279f (diff) | |
| download | gcc-62e475bad0d668c432bb97113cbf73fa281b8b55.zip gcc-62e475bad0d668c432bb97113cbf73fa281b8b55.tar.gz gcc-62e475bad0d668c432bb97113cbf73fa281b8b55.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/config/i386/gthr-mcf.h | 35 |
2 files changed, 40 insertions, 0 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 005505b..658ee22 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2022-10-23 LIU Hao <lh_mouse@126.com> + + * config/i386/gthr-mcf.h: Include 'gthr_libobjc.h' when building + libobjc, instead of 'gthr.h' + 2022-10-19 LIU Hao <lh_mouse@126.com> * config.host: Add new cases for `mcf` thread model diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h index 58131bb..40da868 100644 --- a/libgcc/config/i386/gthr-mcf.h +++ b/libgcc/config/i386/gthr-mcf.h @@ -1 +1,36 @@ +/* Threads compatibility routines for libgcc and libobjc. */ +/* Copyright (C) 2022 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +<http://www.gnu.org/licenses/>. */ + +#ifdef _LIBOBJC + +/* libobjc references some internal structures and requires a + * dedicated set of functions. */ +#include <mcfgthread/gthr_libobjc.h> + +#else /* _LIBOBJC */ + +/* This is for libgcc and libstdc++. */ #include <mcfgthread/gthr.h> + +#endif /* _LIBOBJC */ |