From: Olivier Hainque <hainque@gcc.gnu.org>
Date: Fri, 21 Sep 2018 13:09:51 +0000 (+0000)
Subject: Leverage cacheTextUpdate for __clear_cache on VxWorks
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5244089f1518bed96b73dfd52bbdc436f180696d;p=gcc.git

Leverage cacheTextUpdate for __clear_cache on VxWorks

2018-09-21  Alexandre Oliva  <oliva@adacore.com>

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 011d933c071..b72c326c153 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-21  Olivier Hainque  <hainque@adacore.com>
+
+	* config/vxworks.h (CLEAR_INSN_CACHE): #define to 1.
+
 2018-09-21  Olivier Hainque  <hainque@adacore.com>
 
 	* config/vxworks.h (VXWORKS_LIBGCC_SPEC): Remove -lc_internal.
diff --git a/gcc/config/vxworks.h b/gcc/config/vxworks.h
index 214c6161343..3ed706e92b3 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 b172d714851..928b5a86ac1 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2018-09-21  Alexandre Oliva  <oliva@adacore.com>
+
+	* 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  <mliska@suse.cz>
 
 	* libgcov-driver.c (crc32_unsigned): Remove.
diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks
index df70feecef3..2db8e05966e 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 f0293feb472..054ab7c4091 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 00000000000..23c72fbb5f5
--- /dev/null
+++ b/libgcc/config/vxcache.c
@@ -0,0 +1,35 @@
+/* Copyright (C) 2018 Free Software Foundation, Inc.
+   Contributed by Alexandre Oliva <oliva@adacore.com>
+
+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/>.  */
+
+/* Instruction cache invalidation routine using VxWorks' cacheLib.  */
+
+#include <vxWorks.h>
+#include <cacheLib.h>
+
+void
+__clear_cache (char *beg __attribute__((__unused__)),
+	       char *end __attribute__((__unused__)))
+{
+  cacheTextUpdate (beg, end - beg);
+}