diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-21 12:48:02 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-21 12:48:02 +0200 |
| commit | 5776a5ffab3b92d6ccac87ccf32c580ee2742d5a (patch) | |
| tree | cbdbbff551198c5e4bba8d08d734ad74a1d0d684 /libgcc | |
| parent | 4465e2a047c3b175bf6c4ca500547eb6b12df52f (diff) | |
| parent | bf3b532b524ecacb3202ab2c8af419ffaaab7cff (diff) | |
| download | gcc-5776a5ffab3b92d6ccac87ccf32c580ee2742d5a.zip gcc-5776a5ffab3b92d6ccac87ccf32c580ee2742d5a.tar.gz gcc-5776a5ffab3b92d6ccac87ccf32c580ee2742d5a.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 8 | ||||
| -rw-r--r-- | libgcc/config.host | 6 | ||||
| -rw-r--r-- | libgcc/config/i386/gthr-mcf.h | 1 | ||||
| -rw-r--r-- | libgcc/config/i386/t-mingw-mcfgthread | 1 | ||||
| -rw-r--r-- | libgcc/config/i386/t-slibgcc-cygming | 6 | ||||
| -rwxr-xr-x | libgcc/configure | 1 |
6 files changed, 22 insertions, 1 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index ea4997d..005505b 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,11 @@ +2022-10-19 LIU Hao <lh_mouse@126.com> + + * config.host: Add new cases for `mcf` thread model + * config/i386/gthr-mcf.h: New file + * config/i386/t-mingw-mcfgthread: New file + * config/i386/t-slibgcc-cygming: Add mcfgthread for libgcc DLL + * configure: Regenerate + 2022-10-18 Jonathan Wakely <jwakely@redhat.com> * Makefile.in: Quote variable. diff --git a/libgcc/config.host b/libgcc/config.host index 0fbf9a3..eb23abe 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -825,6 +825,9 @@ i[34567]86-*-mingw*) posix) tmake_file="i386/t-mingw-pthread $tmake_file" ;; + mcf) + tmake_file="i386/t-mingw-mcfgthread $tmake_file" + ;; esac # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h if test x$ac_cv_sjlj_exceptions = xyes; then @@ -849,6 +852,9 @@ x86_64-*-mingw*) posix) tmake_file="i386/t-mingw-pthread $tmake_file" ;; + mcf) + tmake_file="i386/t-mingw-mcfgthread $tmake_file" + ;; esac # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h if test x$ac_cv_sjlj_exceptions = xyes; then diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h new file mode 100644 index 0000000..58131bb --- /dev/null +++ b/libgcc/config/i386/gthr-mcf.h @@ -0,0 +1 @@ +#include <mcfgthread/gthr.h> diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread new file mode 100644 index 0000000..c5b817f --- /dev/null +++ b/libgcc/config/i386/t-mingw-mcfgthread @@ -0,0 +1 @@ +SHLIB_MCFGTHREAD_LIBS = -lmcfgthread -lkernel32 -lntdll diff --git a/libgcc/config/i386/t-slibgcc-cygming b/libgcc/config/i386/t-slibgcc-cygming index 6236c78..6871498 100644 --- a/libgcc/config/i386/t-slibgcc-cygming +++ b/libgcc/config/i386/t-slibgcc-cygming @@ -27,6 +27,9 @@ endif ifndef SHLIB_PTHREAD_LDFLAG SHLIB_PTHREAD_LDFLAG = endif +ifndef SHLIB_MCFGTHREAD_LIBS +SHLIB_MCFGTHREAD_LIBS = +endif SHLIB_LINK = $(LN_S) -f $(SHLIB_MAP) $(SHLIB_MAP).def && \ if [ ! -d $(SHLIB_DIR) ]; then \ @@ -37,7 +40,8 @@ SHLIB_LINK = $(LN_S) -f $(SHLIB_MAP) $(SHLIB_MAP).def && \ $(SHLIB_MAP).def \ -Wl,--out-implib,$(SHLIB_DIR)/$(SHLIB_IMPLIB).tmp \ -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ - $(SHLIB_OBJS) ${SHLIB_PTHREAD_LDFLAG} $(SHLIB_LC) && \ + $(SHLIB_OBJS) ${SHLIB_PTHREAD_LDFLAG} $(SHLIB_LC) \ + $(SHLIB_MCFGTHREAD_LIBS) && \ if [ -f $(SHLIB_DIR)/$(SHLIB_SONAME) ]; then \ mv -f $(SHLIB_DIR)/$(SHLIB_SONAME) \ $(SHLIB_DIR)/$(SHLIB_SONAME).backup; \ diff --git a/libgcc/configure b/libgcc/configure index 61f3ace..be5d45f 100755 --- a/libgcc/configure +++ b/libgcc/configure @@ -5699,6 +5699,7 @@ case $target_thread_file in tpf) thread_header=config/s390/gthr-tpf.h ;; vxworks) thread_header=config/gthr-vxworks.h ;; win32) thread_header=config/i386/gthr-win32.h ;; + mcf) thread_header=config/i386/gthr-mcf.h ;; esac |