MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linux.h: Do not include arch/icache.h

Browse Source 
gcc/ChangeLog
	* config/tilegx/linux.h: Do not include arch/icache.h
	(CLEAR_INSN_CACHE): Provide inlined definition directly.
	* config/tilepro/linux.h: Do not include arch/icache.h
	(CLEAR_INSN_CACHE): Provide inlined definition directly.

libgcc/ChangeLog
	* config/tilepro/atomic.h: Do not include arch/spr_def.h and
	asm/unistd.h.
	(SPR_CMPEXCH_VALUE): Define for tilegx.
	(__NR_FAST_cmpxchg): Define for tilepro.
	(__NR_FAST_atomic_update): Define for tilepro.
	(__NR_FAST_cmpxchg64): Define for tilepro.

From-SVN: r237824
This commit is contained in:
Walter Lee 2016-06-28 16:20:58 +00:00 committed by Walter Lee
parent 77d93c476d
commit ba6be749f9
5 changed files with 59 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2016-06-28 Walter Lee <walt@tilera.com>
* config/tilegx/linux.h: Do not include arch/icache.h
(CLEAR_INSN_CACHE): Provide inlined definition directly.
* config/tilepro/linux.h: Do not include arch/icache.h
(CLEAR_INSN_CACHE): Provide inlined definition directly.
2016-06-28 Wilco Dijkstra <wdijkstr@arm.com> 2016-06-28 Wilco Dijkstra <wdijkstr@arm.com>
* tree-ssa-math-opts.c (find_bswap_or_nop_1): Adjust bitnumbering * tree-ssa-math-opts.c (find_bswap_or_nop_1): Adjust bitnumbering

19
gcc/config/tilegx/linux.h
View File

@ -55,12 +55,23 @@
/* For __clear_cache in libgcc2.c. */ /* For __clear_cache in libgcc2.c. */
#ifdef IN_LIBGCC2 #ifdef IN_LIBGCC2
#include <arch/icache.h>
/* Use the minimum page size of 4K. Alternatively we can call /* Use the minimum page size of 4K. Alternatively we can call
getpagesize() but it introduces a libc dependence. */ getpagesize() but it introduces a libc dependence.
See Linux arch/tile/include/uapi/arch/icache.h for more commentary. */
#undef CLEAR_INSN_CACHE #undef CLEAR_INSN_CACHE
#define CLEAR_INSN_CACHE(beg, end) invalidate_icache (beg, end - beg, 4096) #define CLEAR_INSN_CACHE(BEG, END) \
{ \
long size = (long) (END) - (long) (BEG); \
if (size) \
{ \
const char *p = (const char *) ((unsigned long) (BEG) & -64L); \
const char *end = p + (size < 4096 ? size : 4096) - 1; \
__insn_mf (); \
for (; p <= end; p += 64) \
__insn_icoh (p); \
__insn_drain (); \
} \
}
#else #else

29
gcc/config/tilepro/linux.h
View File

@ -47,12 +47,31 @@
/* For __clear_cache in libgcc2.c. */ /* For __clear_cache in libgcc2.c. */
#ifdef IN_LIBGCC2 #ifdef IN_LIBGCC2
#include <arch/icache.h> /* Use the minimum page size of 4K. Alternatively we can call
getpagesize() but it introduces a libc dependence.
/* Use the minimum page size of 4K. Alternatively we can call getpagesize() See Linux arch/tile/include/uapi/arch/icache.h for more commentary. */
but it introduces a libc dependence. */
#undef CLEAR_INSN_CACHE #undef CLEAR_INSN_CACHE
#define CLEAR_INSN_CACHE(beg, end) invalidate_icache (beg, end - beg, 4096) #define CLEAR_INSN_CACHE(BEG, END) \
{ \
long size = (long) (END) - (long) (BEG); \
if (size) \
{ \
const char *start = (const char *) ((unsigned long) (BEG) & -64L);\
const char *end = start + (size < 16384 ? size : 16384) - 1; \
long num_passes = 4; \
__insn_mf (); \
do \
{ \
const char *p; \
for (p = start; p <= end; p += 64) \
__insn_icoh (p); \
start += 4096; \
end += 4096; \
} \
while (--num_passes > 0); \
__insn_drain (); \
} \
}
#else #else

9
libgcc/ChangeLog
View File

@ -1,3 +1,12 @@
2016-06-28 Walter Lee <walt@tilera.com>
* config/tilepro/atomic.h: Do not include arch/spr_def.h and
asm/unistd.h.
(SPR_CMPEXCH_VALUE): Define for tilegx.
(__NR_FAST_cmpxchg): Define for tilepro.
(__NR_FAST_atomic_update): Define for tilepro.
(__NR_FAST_cmpxchg64): Define for tilepro.
2016-06-23 Jakub Sejdak <jakub.sejdak@phoesys.com> 2016-06-23 Jakub Sejdak <jakub.sejdak@phoesys.com>
* config.host: Add suport for arm*-*-phoenix* targets. * config.host: Add suport for arm*-*-phoenix* targets.

6
libgcc/config/tilepro/atomic.h
View File

@ -93,9 +93,11 @@
#endif #endif
#ifdef __tilegx__ #ifdef __tilegx__
#include <arch/spr_def.h> #define SPR_CMPEXCH_VALUE 0x2780
#else #else
#include <asm/unistd.h> #define __NR_FAST_cmpxchg -1
#define __NR_FAST_atomic_update -2
#define __NR_FAST_cmpxchg64 -3
#endif #endif