diff options
author | Bernd Schmidt <bernds_cb1@t-online.de> | 2007-11-28 18:03:45 +0000 |
---|---|---|
committer | Bernd Schmidt <bernds_cb1@t-online.de> | 2007-11-28 18:03:45 +0000 |
commit | 6e91c122e5abb7f5cd0bd2db7d9cfbee6fa6b39f (patch) | |
tree | e3e3b4a67e4ac21855546b00b9c173e97d89ad7a /ldso | |
parent | 866a0745f5ababedee1e2964ca0acee2929d2925 (diff) |
Fix merging error: a macro was renamed.
Diffstat (limited to 'ldso')
-rw-r--r-- | ldso/ldso/bfin/dl-startup.h | 3 |
1 files changed, 2 insertions, 1 deletions
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, \ |