diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-04-03 22:06:11 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-04-03 22:11:48 +0000 |
| commit | 47644c2a782d42cef6171070446352a68326cba5 (patch) | |
| tree | 7f62d58c6876f471fecbe6c01c5b3b3704fabf7a /usr/src/cmd/sgs/libld/common/files.c | |
| parent | 600f674f095b115b06a857c84f6ac041040b0269 (diff) | |
| parent | b075ad5b007248d50e4c2e838b460c9c7cfd9fad (diff) | |
| download | illumos-joyent-release-20130404.tar.gz | |
[illumos-gate merge]20130404release-20130404
commit b075ad5b007248d50e4c2e838b460c9c7cfd9fad
3665 Implement O_CLOEXEC as an open() flag
commit 3cc3202e63472d673bcac160bfb86d1865dd9fe7
918 Need better IP fanout (esp. with VLANs present)
commit a8c23f9d905fadb090654516236f546ef3f0a1b2
3638 ld confuses files with group sections and files that should lazy load
Conflicts:
usr/src/uts/common/io/mac/mac_sched.c
Diffstat (limited to 'usr/src/cmd/sgs/libld/common/files.c')
| -rw-r--r-- | usr/src/cmd/sgs/libld/common/files.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/sgs/libld/common/files.c b/usr/src/cmd/sgs/libld/common/files.c index c1e66ecfea..99e6e89f9d 100644 --- a/usr/src/cmd/sgs/libld/common/files.c +++ b/usr/src/cmd/sgs/libld/common/files.c @@ -2343,7 +2343,7 @@ process_group(const char *name, Ifl_desc *ifl, Shdr *shdr, Elf_Scn *scn, * Indicate that this input file has groups to process. Groups are * processed after all input sections have been processed. */ - ifl->ifl_flags |= FLG_IS_GROUPS; + ifl->ifl_flags |= FLG_IF_GROUPS; return (1); } @@ -2807,7 +2807,7 @@ process_elf(Ifl_desc *ifl, Elf *elf, Ofl_desc *ofl) * of placement. In addition, COMDAT names may require transformation * to indicate different output section placement. */ - if (ifl->ifl_flags & FLG_IS_GROUPS) { + if (ifl->ifl_flags & FLG_IF_GROUPS) { for (ndx = 1; ndx < ifl->ifl_shnum; ndx++) { Is_desc *isp; |