bfd/

	* bfd-in.h (STRING_COMMA_LEN): Don't handle NULL STR case.
	* bfd-in2.h: Regenerate.

	ld/
	* pe-dll.c (autofilter_symbollist_generic)
	(autofilter_symbollist_i386, autofilter_liblist)
	(autofilter_objlist, autofilter_symbolprefixlist)
	(autofilter_symbolsuffixlist): Don't use STRING_COMMA_LEN with
	NULL.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7034943990e22dd29269fca2db4f44f3613cef4a..d9d53304c8ddb60ed31cfabac290866169534a98 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-25  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+       * bfd-in.h (STRING_COMMA_LEN): Don't handle NULL STR case.
+       * bfd-in2.h: Regenerate.
+
 2007-10-25  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * elf32-ppc.c (ppc_elf_merge_obj_attributes): Add support for

diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 07fdf0364973d62241bcbe2d72d2496df794db39..be5c2e59fa7e279e1e1d334b536476b68ea60e8e 100644 (file)
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -46,9 +46,8 @@ extern "C" {
 /* This is a utility macro to handle the situation where the code
    wants to place a constant string into the code, followed by a
    comma and then the length of the string.  Doing this by hand
-   is error prone, so using this macro is safer.  The macro will
-   also safely handle the case where a NULL is passed as the arg.  */
-#define STRING_COMMA_LEN(STR) (STR), ((STR) ? sizeof (STR) - 1 : 0)
+   is error prone, so using this macro is safer.  */
+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
 /* Unfortunately it is not possible to use the STRING_COMMA_LEN macro
    to create the arguments to another macro, since the preprocessor
    will mis-count the number of arguments to the outer macro (by not

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 35aad28a5c603e40e278dd3fda438872c9f49f44..5e548674e1fe7cb885ca4c5e5db12809bb6164ac 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -53,9 +53,8 @@ extern "C" {
 /* This is a utility macro to handle the situation where the code
    wants to place a constant string into the code, followed by a
    comma and then the length of the string.  Doing this by hand
-   is error prone, so using this macro is safer.  The macro will
-   also safely handle the case where a NULL is passed as the arg.  */
-#define STRING_COMMA_LEN(STR) (STR), ((STR) ? sizeof (STR) - 1 : 0)
+   is error prone, so using this macro is safer.  */
+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
 /* Unfortunately it is not possible to use the STRING_COMMA_LEN macro
    to create the arguments to another macro, since the preprocessor
    will mis-count the number of arguments to the outer macro (by not

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5a4b2e29dcf4e09d67b59476d86279c804f63cd2..104a0ff8a2a51366450db665a6d7d4381aa49f7f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-25  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+       * pe-dll.c (autofilter_symbollist_generic)
+       (autofilter_symbollist_i386, autofilter_liblist)
+       (autofilter_objlist, autofilter_symbolprefixlist)
+       (autofilter_symbolsuffixlist): Don't use STRING_COMMA_LEN with
+       NULL.
+
 2007-10-24  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure.in: Move AM_PROG_LIBTOOL after AC_GNU_SOURCE.

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index cdbfa70f0e346bc10d6db1796bc50fb04c232d21..d75474770083dcc1a1b2c49cf413e543c342aa45 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -195,7 +195,7 @@ static const autofilter_entry_type autofilter_symbollist_generic[] =
   /* Runtime pseudo-reloc.  */
   { STRING_COMMA_LEN ("_pei386_runtime_relocator") },
   { STRING_COMMA_LEN ("do_pseudo_reloc") },
-  { STRING_COMMA_LEN (NULL) }
+  { NULL, 0 }
 };
 
 static const autofilter_entry_type autofilter_symbollist_i386[] =
@@ -231,7 +231,7 @@ static const autofilter_entry_type autofilter_symbollist_i386[] =
   { STRING_COMMA_LEN ("_impure_ptr") },
   { STRING_COMMA_LEN ("_fmode") },
   { STRING_COMMA_LEN ("environ") },
-  { STRING_COMMA_LEN (NULL) }
+  { NULL, 0 }
 };
 
 #define PE_ARCH_i386    1
@@ -321,7 +321,7 @@ static const autofilter_entry_type autofilter_liblist[] =
   { STRING_COMMA_LEN ("libsupc++") },
   { STRING_COMMA_LEN ("libobjc") },
   { STRING_COMMA_LEN ("libgcj") },
-  { STRING_COMMA_LEN (NULL) }
+  { NULL, 0 }
 };
 
 static const autofilter_entry_type autofilter_objlist[] =
@@ -336,7 +336,7 @@ static const autofilter_entry_type autofilter_objlist[] =
   { STRING_COMMA_LEN ("gcrt2.o") },
   { STRING_COMMA_LEN ("crtbegin.o") },
   { STRING_COMMA_LEN ("crtend.o") },
-  { STRING_COMMA_LEN (NULL) }
+  { NULL, 0 }
 };
 
 static const autofilter_entry_type autofilter_symbolprefixlist[] =
@@ -350,13 +350,13 @@ static const autofilter_entry_type autofilter_symbolprefixlist[] =
   { STRING_COMMA_LEN ("_nm_") },
   /* Don't export symbols specifying internal DLL layout.  */
   { STRING_COMMA_LEN ("_head_") },
-  { STRING_COMMA_LEN (NULL) }
+  { NULL, 0 }
 };
 
 static const autofilter_entry_type autofilter_symbolsuffixlist[] =
 {
   { STRING_COMMA_LEN ("_iname") },
-  { STRING_COMMA_LEN (NULL) }
+  { NULL, 0 }
 };
 
 #define U(str) (pe_details->underscored ? "_" str : str)