diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5644df4d527..4f250e70c29 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-24  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* config/sparc/sparc.c (sparc_type_code) <NULLPTR_TYPE>: New case.
+
 2010-10-24  Paul Koning  <ni1d@arrl.net>
 
 	* config/pdp11/pdp11.md: Change length attribute to be in bytes.
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 1898732308a..e23ede053a0 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -7729,7 +7729,8 @@ sparc_type_code (register tree type)
 
 	case VECTOR_TYPE:
 	case BOOLEAN_TYPE:	/* Boolean truth value type.  */
-	case LANG_TYPE:		/* ? */
+	case LANG_TYPE:
+	case NULLPTR_TYPE:
 	  return qualifiers;
 
 	default: