Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1455)

Unified Diff: modules/objfmts/macho/macho-objfmt.c

Issue 9666037: Merge https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/yasm/patched-yasm/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/objfmts/macho/macho-objfmt.c
===================================================================
--- modules/objfmts/macho/macho-objfmt.c (revision 124750)
+++ modules/objfmts/macho/macho-objfmt.c (working copy)
@@ -1498,9 +1498,13 @@
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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698