From 6e91c122e5abb7f5cd0bd2db7d9cfbee6fa6b39f Mon Sep 17 00:00:00 2001 From: Bernd Schmidt Date: Wed, 28 Nov 2007 18:03:45 +0000 Subject: Fix merging error: a macro was renamed. --- ldso/ldso/bfin/dl-startup.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ldso/ldso/bfin/dl-startup.h b/ldso/ldso/bfin/dl-startup.h index 09f946e9f..d58690dd1 100644 --- a/ldso/ldso/bfin/dl-startup.h +++ b/ldso/ldso/bfin/dl-startup.h @@ -86,7 +86,8 @@ __asm__( " .size __dl_boot,.-__dl_boot\n" ); -#define DL_BOOT(X) \ +#undef DL_START +#define DL_START(X) \ static void __attribute__ ((used)) \ _dl_start (Elf32_Addr dl_boot_got_pointer, \ struct elf32_fdpic_loadmap *dl_boot_progmap, \ -- cgit v1.2.3