PR 10387

        * config/tc-arm.h (THUMB_IS_FUNC): Handle a NULL pointer.
        (ARM_IS_FUNC): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e8864c8e6195a3969a1b4c48fecd76aa484285a8..bf7dc296693d187dc22171d751e39f1f0f662840 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-14  Nick Clifton  <nickc@redhat.com>
+
+       PR 10387
+       * config/tc-arm.h (THUMB_IS_FUNC): Handle a NULL pointer.
+       (ARM_IS_FUNC): Likewise.
+
 2009-07-14  Daniel Gutson  <dgutson@codesourcery.com>
 
        * config/tc-arm.c (md_assemble): Added validation.

diff --git a/gas/config/tc-arm.h b/gas/config/tc-arm.h
index 05841df9bcaf839bae7ba2f07654aaa2ffb05e0c..47fce80d9f8039cdca4c9409abb8fdb0ad808fa6 100644 (file)
--- a/gas/config/tc-arm.h
+++ b/gas/config/tc-arm.h
@@ -128,24 +128,26 @@ bfd_boolean arm_is_eabi (void);
 
 /* For ELF objects THUMB_IS_FUNC is inferred from
    ARM_IS_THUMB and the function type.  */
-#define THUMB_IS_FUNC(s) \
-  ((arm_is_eabi () \
-    && (ARM_IS_THUMB (s)) \
-    && (symbol_get_bfdsym (s)->flags & BSF_FUNCTION)) \
-   || (ARM_GET_FLAG (s) & THUMB_FLAG_FUNC))
-
-#define ARM_IS_FUNC(s) \
-  ((arm_is_eabi () \
-    && !(ARM_IS_THUMB (s)) \
-    /* && !(THUMB_FLAG_FUNC & ARM_GET_FLAG (s)) \ */ \
+#define THUMB_IS_FUNC(s)                                       \
+  ((s) != NULL                                                 \
+   && ((arm_is_eabi ()                                         \
+       && (ARM_IS_THUMB (s))                                   \
+       && (symbol_get_bfdsym (s)->flags & BSF_FUNCTION))       \
+       || (ARM_GET_FLAG (s) & THUMB_FLAG_FUNC)))
+
+#define ARM_IS_FUNC(s)                                 \
+  (((s) != NULL                                                \
+    && arm_is_eabi ()                                  \
+    && !(ARM_IS_THUMB (s))                             \
+    /* && !(THUMB_FLAG_FUNC & ARM_GET_FLAG (s)) \ */   \
     && (symbol_get_bfdsym (s)->flags & BSF_FUNCTION)))
 
 
 #else
 
-#define THUMB_IS_FUNC(s)       (ARM_GET_FLAG (s) & THUMB_FLAG_FUNC)
+#define THUMB_IS_FUNC(s)       ((s) && ARM_GET_FLAG (s) & THUMB_FLAG_FUNC)
 #define ARM_IS_FUNC(s)          (!THUMB_IS_FUNC (s) \
-                                && (symbol_get_bfdsym (s)->flags & BSF_FUNCTION))
+                                && (s) && (symbol_get_bfdsym (s)->flags & BSF_FUNCTION))
 #endif
 
 #define ARM_SET_THUMB(s,t)      ((t) ? ARM_SET_FLAG (s, ARM_FLAG_THUMB)     : ARM_RESET_FLAG (s, ARM_FLAG_THUMB))