diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/bfd-in.h | 5 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 5 | ||||
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/pe-dll.c | 12 |
5 files changed, 23 insertions, 12 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7034943..d9d5330 100644 --- 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 07fdf03..be5c2e5 100644 --- 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 35aad28..5e54867 100644 --- 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 5a4b2e2..104a0ff 100644 --- 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 cdbfa70..d754747 100644 --- 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) |