diff options
| author | Lukas Larsson <[email protected]> | 2018-12-03 14:42:15 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-12-03 14:42:15 +0100 |
| commit | 7515f713da271618c688de768f1586280fcc9635 (patch) | |
| tree | 0b139876b58ecc12ba21727138db9459fc19227d | |
| parent | 28d77314ceb96cda8f270eccaa60af625bbe0e76 (diff) | |
| parent | 0d24aecf46f9f387d64f06744f8a55b841669d1e (diff) | |
| download | otp-7515f713da271618c688de768f1586280fcc9635.tar.gz otp-7515f713da271618c688de768f1586280fcc9635.tar.bz2 otp-7515f713da271618c688de768f1586280fcc9635.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/configure.in | 11 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 4 | ||||
| -rw-r--r-- | erts/emulator/nifs/common/prim_file_nif.c | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index 0323058b4a..05379f74ee 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -570,6 +570,17 @@ else WFLAGS="" WERRORFLAGS="" fi + +AC_MSG_CHECKING([CFLAGS for -O switch]) +case "$CFLAGS" in + *-O*) AC_MSG_RESULT([yes]) ;; + *) + AC_MSG_ERROR([ + CFLAGS must contain a -O flag. If you need to edit the CFLAGS you probably + also want to add the default CFLAGS. The default CFLAGS are "-O2 -g". + If you want to build erts without any optimization, pass -O0 to CFLAGS.]) ;; +esac + dnl DEBUG_FLAGS is obsolete (I hope) AC_SUBST(DEBUG_FLAGS) AC_SUBST(DEBUG_CFLAGS) diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index b7a8b9c2d0..5364ca0cbf 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -872,6 +872,8 @@ static ERTS_INLINE void clr_bit(UWord* map, Uint ix) &= ~((UWord)1 << (ix % ERTS_VSPACE_WORD_BITS)); } +#ifdef DEBUG + static ERTS_INLINE int is_bit_set(UWord* map, Uint ix) { ASSERT(ix / ERTS_VSPACE_WORD_BITS < VSPACE_MAP_SZ); @@ -879,6 +881,8 @@ static ERTS_INLINE int is_bit_set(UWord* map, Uint ix) & ((UWord)1 << (ix % ERTS_VSPACE_WORD_BITS)); } +#endif + UWord erts_literal_vspace_map[VSPACE_MAP_SZ]; static void set_literal_range(void* start, Uint size) diff --git a/erts/emulator/nifs/common/prim_file_nif.c b/erts/emulator/nifs/common/prim_file_nif.c index 0ada345442..0b5eccbde2 100644 --- a/erts/emulator/nifs/common/prim_file_nif.c +++ b/erts/emulator/nifs/common/prim_file_nif.c @@ -936,7 +936,7 @@ static ERL_NIF_TERM set_permissions_nif(ErlNifEnv *env, int argc, const ERL_NIF_ posix_errno_t posix_errno; efile_path_t path; - Uint32 permissions; + Uint permissions; ASSERT(argc == 2); if(!enif_get_uint(env, argv[1], &permissions)) { @@ -956,7 +956,7 @@ static ERL_NIF_TERM set_owner_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM a posix_errno_t posix_errno; efile_path_t path; - Sint32 uid, gid; + Sint uid, gid; ASSERT(argc == 3); if(!enif_get_int(env, argv[1], &uid) || !enif_get_int(env, argv[2], &gid)) { |