From 89d0a14a1fdf89d38d9db1156ffde8c1b276823c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sun, 6 Nov 2022 12:12:47 +0100 Subject: [PATCH] Manually add ChangeLog entries from r13-3652-ge4cba49413ca429dc82f6aa2e88129ecb3fdd943 This commit caused failure of update_version_git due to the removal of liboffloadmic with ChangeLog in it, so I had to blacklist that commit and here I'm adding ChangeLog entries manually. --- ChangeLog | 7 +++++++ contrib/ChangeLog | 9 +++++++++ gcc/ChangeLog | 14 ++++++++++++++ include/ChangeLog | 5 +++++ libgomp/ChangeLog | 21 +++++++++++++++++++++ 5 files changed, 56 insertions(+) diff --git a/ChangeLog b/ChangeLog index f99789e..612319f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2022-11-04 Thomas Schwinge + + * Makefile.def: Remove module 'liboffloadmic'. + * Makefile.in: Regenerate. + * configure.ac: Remove 'liboffloadmic' handling. + * configure: Regenerate. + 2022-10-31 Ramana Radhakrishnan * MAINTAINERS: Update email address. diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 7222e2b..da85fa8 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -3,6 +3,15 @@ * gcc-changelog/git_update_version.py: Add e4cba49413ca429dc82f6aa2e88129ecb3fdd943 to ignored commits. +2022-11-04 Thomas Schwinge + + * gcc-changelog/git_commit.py (default_changelog_locations): + Remove 'liboffloadmic'. + * gcc_update (files_and_dependencies): Remove 'liboffloadmic' + files. + * update-copyright.py (GCCCmdLine): Remove 'liboffloadmic' + comment. + 2022-10-20 Jonathan Wakely Ulrich Drepper diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9f89f46..0549cdd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -55,6 +55,20 @@ 2022-11-04 Thomas Schwinge + * config.gcc [target *-intelmic-* | *-intelmicemul-*]: Remove. + * config/i386/i386-options.cc (ix86_omp_device_kind_arch_isa) + [ACCEL_COMPILER]: Remove. + * config/i386/intelmic-mkoffload.cc: Remove. + * config/i386/intelmic-offload.h: Likewise. + * config/i386/t-intelmic: Likewise. + * config/i386/t-omp-device: Likewise. + * configure.ac [target *-intelmic-* | *-intelmicemul-*]: Remove. + * configure: Regenerate. + * doc/install.texi (--enable-offload-targets=[...]): Update. + * doc/sourcebuild.texi: Remove 'liboffloadmic' documentation. + +2022-11-04 Thomas Schwinge + * Makefile.in (OBJS): Remove 'dbxout.o'. * config/nvptx/nvptx.cc: Don't '#include "dbxout.h"'. * dbxout.cc: Remove. diff --git a/include/ChangeLog b/include/ChangeLog index 64b158a..51d58a6 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2022-11-04 Thomas Schwinge + + * gomp-constants.h (GOMP_DEVICE_INTEL_MIC): Comment out. + (GOMP_VERSION_INTEL_MIC): Remove. + 2022-10-31 Guillermo E. Martinez * btf.h (btf_enum64): Add new definition and new symbolic diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 35e2100..b39144e 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,24 @@ +2022-11-04 Thomas Schwinge + + * libgomp-plugin.h (OFFLOAD_TARGET_TYPE_INTEL_MIC): Remove. + * libgomp.texi (OpenMP Context Selectors): Remove Intel MIC + documentation. + * plugin/configfrag.ac + [*-intelmic-* | *-intelmicemul-*]: Remove. + * configure: Regenerate. + * testsuite/lib/libgomp.exp (libgomp_init): Remove 'liboffloadmic' + handling. + (offload_target_to_openacc_device_type) + [$offload_target = *-intelmic*]: Remove. + (check_effective_target_offload_device_intel_mic) + (check_effective_target_offload_device_any_intel_mic): Remove. + * testsuite/libgomp.c-c++-common/on_device_arch.h + (device_arch_intel_mic, on_device_arch_intel_mic, any_device_arch) + (any_device_arch_intel_mic): Remove. + * testsuite/libgomp.c-c++-common/target-45.c: Remove + 'offload_device_any_intel_mic' XFAIL. + * testsuite/libgomp.fortran/target10.f90: Likewise. + 2022-11-03 Tobias Burnus * testsuite/libgomp.fortran/target-11.f90: New test. -- 2.7.4