diff options
| author | Dan Nicolaescu | 2011-06-01 14:54:35 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2011-06-01 14:54:35 -0700 |
| commit | 698d32e2c326871239dc0cb10659a0ecb25bf558 (patch) | |
| tree | c936bfb711c89d489e43c3004aa1b7feff7a314a /src | |
| parent | 2403c841a8e920fa7e517997ecb5addcca2ecfe7 (diff) | |
| download | emacs-698d32e2c326871239dc0cb10659a0ecb25bf558.tar.gz emacs-698d32e2c326871239dc0cb10659a0ecb25bf558.zip | |
Make it possible to build with GCC-4.6+ -O2 -flto.
* src/emacs.c (__malloc_initialize_hook): Mark as EXTERNALLY_VISIBLE.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a59b8740094..0302f06f9c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-06-01 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | Make it possible to build with GCC-4.6+ -O2 -flto. | ||
| 4 | |||
| 5 | * emacs.c (__malloc_initialize_hook): Mark as EXTERNALLY_VISIBLE. | ||
| 6 | |||
| 1 | 2011-06-01 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2011-06-01 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * minibuf.c (get_minibuffer, read_minibuf_unwind): | 9 | * minibuf.c (get_minibuffer, read_minibuf_unwind): |
diff --git a/src/emacs.c b/src/emacs.c index 3a7c5c0bf3d..70d90fd5781 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -678,7 +678,7 @@ malloc_initialize_hook (void) | |||
| 678 | } | 678 | } |
| 679 | } | 679 | } |
| 680 | 680 | ||
| 681 | void (*__malloc_initialize_hook) (void) = malloc_initialize_hook; | 681 | void (*__malloc_initialize_hook) (void) EXTERNALLY_VISIBLE = malloc_initialize_hook; |
| 682 | 682 | ||
| 683 | #endif /* DOUG_LEA_MALLOC */ | 683 | #endif /* DOUG_LEA_MALLOC */ |
| 684 | 684 | ||