From: Olivier Hainque Date: Fri, 21 Sep 2018 13:09:51 +0000 (+0000) Subject: Leverage cacheTextUpdate for __clear_cache on VxWorks X-Git-Tag: upstream/12.2.0~29179 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5244089f1518bed96b73dfd52bbdc436f180696d;p=platform%2Fupstream%2Fgcc.git Leverage cacheTextUpdate for __clear_cache on VxWorks 2018-09-21 Alexandre Oliva libgcc/ * config/vxcache.c: New file. Provide __clear_cache, based on the cacheTextUpdate VxWorks service. * config/t-vxworks (LIB2ADD): Add vxcache.c. (LIB2FUNCS_EXCLUDE): Add _clear_cache. * config/t-vxwoks7: Likewise. gcc/ * config/vxworks.h (CLEAR_INSN_CACHE): #define to 1. From-SVN: r264479 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 011d933..b72c326 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2018-09-21 Olivier Hainque + * config/vxworks.h (CLEAR_INSN_CACHE): #define to 1. + +2018-09-21 Olivier Hainque + * config/vxworks.h (VXWORKS_LIBGCC_SPEC): Remove -lc_internal. Merge block comment with the one ahead of VXWORKS_LIBS_RTP. Then: (VXWORKS_LIBS_RTP): Minor reordering. diff --git a/gcc/config/vxworks.h b/gcc/config/vxworks.h index 214c616..3ed706e 100644 --- a/gcc/config/vxworks.h +++ b/gcc/config/vxworks.h @@ -206,6 +206,10 @@ extern void vxworks_asm_out_destructor (rtx symbol, int priority); /* The diab linker does not handle .gnu_attribute sections. */ #undef HAVE_AS_GNU_ATTRIBUTE +/* We provide our own version of __clear_cache in libgcc, using a separate C + file to facilitate #inclusion of VxWorks header files. */ +#define CLEAR_INSN_CACHE 1 + /* Default dwarf control values, for non-gdb debuggers that come with VxWorks. */ diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index b172d71..928b5a8 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,11 @@ +2018-09-21 Alexandre Oliva + + * config/vxcache.c: New file. Provide __clear_cache, based on + the cacheTextUpdate VxWorks service. + * config/t-vxworks (LIB2ADD): Add vxcache.c. + (LIB2FUNCS_EXCLUDE): Add _clear_cache. + * config/t-vxwoks7: Likewise. + 2018-09-21 Martin Liska * libgcov-driver.c (crc32_unsigned): Remove. diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks index df70fee..2db8e05 100644 --- a/libgcc/config/t-vxworks +++ b/libgcc/config/t-vxworks @@ -1,6 +1,11 @@ # Don't build libgcc.a with debug info LIBGCC2_DEBUG_CFLAGS = +# We provide our own implementation for __clear_cache, using a +# VxWorks specific entry point. +LIB2FUNCS_EXCLUDE += _clear_cache +LIB2ADD += $(srcdir)/config/vxcache.c + # Extra libgcc2 modules used by gthr-vxworks.h functions LIB2ADDEH += $(srcdir)/config/vxlib.c $(srcdir)/config/vxlib-tls.c diff --git a/libgcc/config/t-vxworks7 b/libgcc/config/t-vxworks7 index f0293fe..054ab7c 100644 --- a/libgcc/config/t-vxworks7 +++ b/libgcc/config/t-vxworks7 @@ -1,6 +1,11 @@ # Don't build libgcc.a with debug info LIBGCC2_DEBUG_CFLAGS = +# We provide our own implementation for __clear_cache, using a +# VxWorks specific entry point. +LIB2FUNCS_EXCLUDE += _clear_cache +LIB2ADD += $(srcdir)/config/vxcache.c + # Extra libgcc2 modules used by gthr-vxworks.h functions LIB2ADDEH += $(srcdir)/config/vxlib.c $(srcdir)/config/vxlib-tls.c diff --git a/libgcc/config/vxcache.c b/libgcc/config/vxcache.c new file mode 100644 index 0000000..23c72fb --- /dev/null +++ b/libgcc/config/vxcache.c @@ -0,0 +1,35 @@ +/* Copyright (C) 2018 Free Software Foundation, Inc. + Contributed by Alexandre Oliva + +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 +. */ + +/* Instruction cache invalidation routine using VxWorks' cacheLib. */ + +#include +#include + +void +__clear_cache (char *beg __attribute__((__unused__)), + char *end __attribute__((__unused__))) +{ + cacheTextUpdate (beg, end - beg); +}