Choose small or large file support based on capabilities of compiler and target platform.
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.