diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b723e498d0..be34843a51b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-26  Richard Guenther  <rguenther@suse.de>
+
+	* tree.h (DECL_IS_BUILTIN): Compare LOCATION_LOCUS.
+
 2012-09-26  Ian Lance Taylor  <iant@google.com>
 
 	* diagnostic.c: Include "demangle.h" and "backtrace.h".
diff --git a/gcc/tree.h b/gcc/tree.h
index edc47eec432..254eaef2a71 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2617,7 +2617,7 @@ struct function;
 #define DECL_SOURCE_LINE(NODE) LOCATION_LINE (DECL_SOURCE_LOCATION (NODE))
 #define DECL_SOURCE_COLUMN(NODE) LOCATION_COLUMN (DECL_SOURCE_LOCATION (NODE))
 #define DECL_IS_BUILTIN(DECL) \
-  (DECL_SOURCE_LOCATION (DECL) <= BUILTINS_LOCATION)
+  (LOCATION_LOCUS (DECL_SOURCE_LOCATION (DECL)) <= BUILTINS_LOCATION)
 
 /*  For FIELD_DECLs, this is the RECORD_TYPE, UNION_TYPE, or
     QUAL_UNION_TYPE node that the field is a member of.  For VAR_DECL,