diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-25 21:24:28 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-25 21:25:55 -0800 |
| commit | d2d4b0746500265eddfa3c618bd6670aaa5eee90 (patch) | |
| tree | 874863a0e41ab5863d33ad715dfbba5558520f4a /src | |
| parent | acb5589fcd981650225e9fb2e949e3681db551c1 (diff) | |
| download | emacs-d2d4b0746500265eddfa3c618bd6670aaa5eee90.tar.gz | |
Port build to gcc -fcheck-pointer-bounds
This does not let Emacs run, just build.
* lib-src/etags.c (main):
* lib-src/profile.c (main):
Use return, not exit.
* src/bytecode.c (BYTE_CODE_THREADED) [__CHKP__]:
Do not define, as -fcheck-pointer-bounds is incompatible with taking
addresses of labels.
* src/menu.c (Fx_popup_dialog): Use eassume, not eassert,
to pacify gcc -fcheck-pointer-bounds -Wnull-dereference.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bytecode.c | 2 | ||||
| -rw-r--r-- | src/menu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index e2d8ab706c7..be39a81c5e9 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -46,7 +46,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ indirect threaded, using GCC's computed goto extension. This code, as currently implemented, is incompatible with BYTE_CODE_SAFE and BYTE_CODE_METER. */ -#if (defined __GNUC__ && !defined __STRICT_ANSI__ \ +#if (defined __GNUC__ && !defined __STRICT_ANSI__ && !defined __CHKP__ \ && !BYTE_CODE_SAFE && !defined BYTE_CODE_METER) #define BYTE_CODE_THREADED #endif diff --git a/src/menu.c b/src/menu.c index 638810b36f8..80709679513 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1540,7 +1540,7 @@ for instance using the window manager, then this produces a quit and /* Note that xw_popup_dialog can call menu code, so Vmenu_updating_frame should be set (Bug#17891). */ - eassert (f && FRAME_LIVE_P (f)); + eassume (f && FRAME_LIVE_P (f)); XSETFRAME (Vmenu_updating_frame, f); /* Force a redisplay before showing the dialog. If a frame is created |