aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/config/s390/s390.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 66ca884..ff76d9c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-19 Christian Borntraeger <borntraeger@de.ibm.com>
+
+ * config/s390/s390.c (s390_function_arg_integer): Handle NULLPTR_TYPE.
+
2010-11-19 Jakub Jelinek <jakub@redhat.com>
PR target/45870
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 2c40b67..0573b26 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -8433,6 +8433,7 @@ s390_function_arg_integer (enum machine_mode mode, const_tree type)
/* We accept small integral (and similar) types. */
if (INTEGRAL_TYPE_P (type)
|| POINTER_TYPE_P (type)
+ || TREE_CODE (type) == NULLPTR_TYPE
|| TREE_CODE (type) == OFFSET_TYPE
|| (TARGET_SOFT_FLOAT && TREE_CODE (type) == REAL_TYPE))
return true;