From 5b8300ea26b41124950fabf8f7c69624d9657334 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 16 Oct 2014 01:03:32 -0400 Subject: [PATCH] tree-core.h: Fix comment to not assume pointers are multiples of bytes. * tree-core.h: Fix comment to not assume pointers are multiples of bytes. * c-cppbuiltin.c (cpp_atomic_builtins): Don't assume pointers are multiples of bytes. From-SVN: r216296 --- gcc/ChangeLog | 5 +++++ gcc/c-family/ChangeLog | 5 +++++ gcc/c-family/c-cppbuiltin.c | 2 +- gcc/tree-core.h | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9823522f20e..a936c016811 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-10-16 DJ Delorie + + * tree-core.h: Fix comment to not assume pointers are multiples of + bytes. + 2014-10-15 Tom Tromey * timevar.h (class auto_timevar): New class. diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 7c515281068..ea7a990ff43 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2014-10-16 DJ Delorie + + * c-cppbuiltin.c (cpp_atomic_builtins): Don't assume pointers are + multiples of bytes. + 2014-10-14 Jason Merrill PR c++/63455 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index c0fcde76049..7e2ae672adc 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -671,7 +671,7 @@ cpp_atomic_builtins (cpp_reader *pfile) /* ptr_type_node can't be used here since ptr_mode is only set when toplev calls backend_init which is not done with -E or pch. */ - psize = POINTER_SIZE / BITS_PER_UNIT; + psize = POINTER_SIZE_UNITS; if (psize >= SWAP_LIMIT) psize = 0; builtin_define_with_int_value ("__GCC_ATOMIC_POINTER_LOCK_FREE", diff --git a/gcc/tree-core.h b/gcc/tree-core.h index c9004fd9771..b69312b0c40 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -1173,7 +1173,7 @@ enum omp_clause_map_kind OMP_CLAUSE_MAP_TOFROM, /* The following kind is an internal only map kind, used for pointer based array sections. OMP_CLAUSE_SIZE for these is not the pointer size, - which is implicitly POINTER_SIZE / BITS_PER_UNIT, but the bias. */ + which is implicitly POINTER_SIZE_UNITS, but the bias. */ OMP_CLAUSE_MAP_POINTER, /* Also internal, behaves like OMP_CLAUS_MAP_TO, but additionally any OMP_CLAUSE_MAP_POINTER records consecutive after it which have addresses -- 2.30.2