diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:30 +0200 |
| commit | 56c5a861cefeff11eeda8e6f1c79a27cd22a8b78 (patch) | |
| tree | d8d27dd0b892a19d72d07bd147bbebb502fcfe62 /common/dlmalloc.c | |
| parent | 9a508d728597bca2d84245817d22dfe56c4bb942 (diff) | |
| download | barebox-56c5a861cefeff11eeda8e6f1c79a27cd22a8b78.tar.gz barebox-56c5a861cefeff11eeda8e6f1c79a27cd22a8b78.tar.xz | |
svn_rev_178
remove unneeded ifdef for arm, remove global data
Diffstat (limited to 'common/dlmalloc.c')
| -rw-r--r-- | common/dlmalloc.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 7c5375a5f0..d65e6dbe82 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -3,8 +3,6 @@ #include <common.h> -DECLARE_GLOBAL_DATA_PTR; - /* Emulation of sbrk for WIN32 All code within the ifdef WIN32 is untested by me. @@ -547,19 +545,16 @@ static mbinptr av_[NAV * 2 + 2] = { IAV(120), IAV(121), IAV(122), IAV(123), IAV(124), IAV(125), IAV(126), IAV(127) }; -void malloc_bin_reloc (void) +void malloc_bin_reloc (ulong reloc_off) { -#ifdef CONFIG_ARM - return; -#else unsigned long *p = (unsigned long *)(&av_[2]); int i; for (i=2; i<(sizeof(av_)/sizeof(mbinptr)); ++i) { - *p++ += gd->reloc_off; + *p++ += reloc_off; } -#endif } + /* field-extraction macros */ #define first(b) ((b)->fd) |