diff options
| author | thakis@chromium.org <thakis@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-03-11 05:52:21 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-03-11 05:52:21 +0000 |
| commit | 25d4c66bfbac64422dcc52adf9d4766d0850b1e1 (patch) | |
| tree | 85fadd20ace8e9e1067f4f582ed7d211b328a622 | |
| parent | 7a86dad4f92f20bf5d9542b2420a870c034d698e (diff) | |
| download | patched-yasm-25d4c66bfbac64422dcc52adf9d4766d0850b1e1.tar.gz | |
Merge https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51
Review URL: https://chromiumcodereview.appspot.com/9666037
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@126065 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rw-r--r-- | modules/objfmts/macho/macho-objfmt.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/objfmts/macho/macho-objfmt.c b/modules/objfmts/macho/macho-objfmt.c index 4adb38d..82858e9 100644 --- a/modules/objfmts/macho/macho-objfmt.c +++ b/modules/objfmts/macho/macho-objfmt.c @@ -1498,9 +1498,13 @@ macho_objfmt_section_switch(yasm_object *object, yasm_valparamhead *valparams, msd->sectname = f_sectname; msd->flags = flags; yasm_section_set_align(retval, align, line); - } else if (flags_override) - yasm_warn_set(YASM_WARN_GENERAL, - N_("section flags ignored on section redeclaration")); + } else if (flags_override) { + // align is the only value used from overrides. + if (yasm_section_get_align(retval) != align) { + yasm_warn_set(YASM_WARN_GENERAL, + N_("section flags ignored on section redeclaration")); + } + } return retval; } |