summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>2014-10-16 05:03:32 +0000
committerdj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>2014-10-16 05:03:32 +0000
commit926ddd2c21109629ecf1906276cfe28b14b52f92 (patch)
tree48885f2a8215f53261c5e511ea2890a09e02f1bc
parent6d7330560801012aa17f5d9c210f4c75596d283d (diff)
downloadgcc-926ddd2c21109629ecf1906276cfe28b14b52f92.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216296 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-family/ChangeLog5
-rw-r--r--gcc/c-family/c-cppbuiltin.c2
-rw-r--r--gcc/tree-core.h2
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 <dj@redhat.com>
+
+ * tree-core.h: Fix comment to not assume pointers are multiples of
+ bytes.
+
2014-10-15 Tom Tromey <tromey@redhat.com>
* 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 <dj@redhat.com>
+
+ * c-cppbuiltin.c (cpp_atomic_builtins): Don't assume pointers are
+ multiples of bytes.
+
2014-10-14 Jason Merrill <jason@redhat.com>
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