Unified · Split
| @@ -1714,8 +1714,15 @@ static void collect_sections(TCCState *s1, struct macho *mo) · 1713 unmodified lines | ||
| 1714 | 1714 | for (sk = sk_unknown; sk < sk_last; sk++) { |
| 1715 | 1715 | struct section_64 *sec = NULL; |
| 1716 | 1716 | if (seg) { |
| 1717 | +#ifdef CONFIG_NEW_MACHO | |
| 1717 | 1718 | seg->vmsize = curaddr - seg->vmaddr; |
| 1718 | 1719 | seg->filesize = fileofs - seg->fileoff; |
| 1720 | +#else | |
| 1721 | + seg->vmsize = (curaddr - seg->vmaddr + SEG_PAGE_SIZE - 1) & -SEG_PAGE_SIZE; | |
| 1722 | + seg->filesize = (fileofs - seg->fileoff + SEG_PAGE_SIZE - 1) & -SEG_PAGE_SIZE; | |
| 1723 | + curaddr = seg->vmaddr + seg->vmsize; | |
| 1724 | + fileofs = seg->fileoff + seg->filesize; | |
| 1725 | +#endif | |
| 1719 | 1726 | } |
| 1720 | 1727 | #ifdef CONFIG_NEW_MACHO |
| 1721 | 1728 | if (sk == sk_linkedit) { |