devel/wasi-libcxx: update to 14.0.6

[vishwin]

Summary

Standalone builds are deprecated, switch to CMAKE_SOURCE_PATH=${WRKSRC}/runtimes and clean up unused cmake variables.

14.0.3 is the latest release but keep in sync with devel/llvm14.

Test Plan

Results in functional gecko ports, allows LTO to work again. With correspondingly updated wasi- ports of course.

[vishwin]

update to 14.0.6 (sync with devel/llvm14)

[2khramtsov_gmail.com]

`Missing license file for LLVM2 in /wrkdirs/usr/ports/devel/wasi-libcxx/work/llvm-project-14.0.6.src/LICENSE.TXT`

[2khramtsov_gmail.com]

After pointing to a license file, fails to build in clean 13.1/amd64 jail and clean ports 949904de1fdf + all the last revisions in stack:

/usr/local/bin/clang++14 -std=gnu++17 --target=wasm32-wasi --sysroot=/usr/local/share/wasi-sysroot -o rlbox.wasm -Wl,--export-all -Wl,--stack-first -Wl,-z,stack-size=262144 -Wl,--no-entry -Wl,--growable-table ogg_alloc.wasm ogg_bitwise.wasm ogg_framing.wasm xmlparse.wasm xmlrole.wasm xmltok.wasm wasm2c_sandbox_wrapper.wasm mozHunspellRLBoxSandbox.wasm affentry.wasm affixmgr.wasm csutil.wasm hashmgr.wasm hunspell.wasm phonet.wasm replist.wasm suggestmgr.wasm GraphiteExtra.wasm CmapCache.wasm Code.wasm Collider.wasm Decompressor.wasm Face.wasm FeatureMap.wasm FileFace.wasm Font.wasm GlyphCache.wasm GlyphFace.wasm Intervals.wasm Justifier.wasm NameTable.wasm Pass.wasm Position.wasm Segment.wasm Silf.wasm Slot.wasm Sparse.wasm TtfUtil.wasm UtfCodec.wasm call_machine.wasm gr_char_info.wasm gr_face.wasm gr_features.wasm gr_font.wasm gr_logging.wasm gr_segment.wasm gr_slot.wasm json.wasm RLBoxWOFF2Sandbox.wasm table_tags.wasm variable_length.wasm woff2_common.wasm woff2_dec.wasm woff2_out.wasm -lwasi-emulated-process-clocks
../../dist/host/bin/wasm2c -o rlbox.wasm.c rlbox.wasm
0105557: error: unexpected opcode: 0xfc 0xa
gmake[4]: *** [/wrkdirs/usr/ports/www/firefox/work/firefox-102.0.1/config/rules.mk:501: rlbox.wasm.c] Error 1

LLVM and/or WASI 14.0.5 seems to be last known good version to build as of https://bugzilla.mozilla.org/show_bug.cgi?id=1771649#c10
For now I locally reverted LLVM to 14.0.5 and updated 14.0.2-era revisions to 14.0.5, so the build can pass.

Maybe investigate if the current devel/llvm14 14.0.6 can build with WASI from 14.0.5, as I don't currently have plans to do that.

[vishwin]

I got this too. Just reverting wasi-libc to the previous month "fixes" it, so something during the month went afoul.

[vishwin]

Superseded by D40098

devel/wasi-libcxx/Makefile

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <libgen.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "elfcopy.h"
 
 ELFTC_VCSID("$Id: sections.c 3758 2019-06-28 01:16:50Z emaste $");
 

 {
         struct section  *s;
         const char      *name;
         Elf_Scn         *is;
         GElf_Shdr        ish;
         size_t           indx;
         uint64_t         oldndx, newndx;
         int                 elferr, sec_flags, reorder;
+        bool             sections_added;
 
         /*
          * Insert a pseudo section that contains the ELF header
          * and program header. Used as reference for section offset
          * or load address adjustment.
          */
         if ((s = calloc(1, sizeof(*s))) == NULL)
                 err(EXIT_FAILURE, "calloc failed");
         s->off = 0;
         s->sz = gelf_fsize(ecp->eout, ELF_T_EHDR, 1, EV_CURRENT) +
             gelf_fsize(ecp->eout, ELF_T_PHDR, ecp->ophnum, EV_CURRENT);
         s->align = 1;
         s->pseudo = 1;
         s->loadable = add_to_inseg_list(ecp, s);
         insert_to_sec_list(ecp, s, 0);
 
         /* Create internal .shstrtab section. */
         init_shstrtab(ecp);
 
         if (elf_getshstrndx(ecp->ein, &indx) == 0)
                 errx(EXIT_FAILURE, "elf_getshstrndx failed: %s",
                     elf_errmsg(-1));
 
+        sections_added = false;
         reorder = 0;
         is = NULL;
         while ((is = elf_nextscn(ecp->ein, is)) != NULL) {
                 if (gelf_getshdr(is, &ish) == NULL)
                         errx(EXIT_FAILURE, "gelf_getshdr failed: %s",
                             elf_errmsg(-1));
                 if ((name = elf_strptr(ecp->ein, indx, ish.sh_name)) == NULL)
                         errx(EXIT_FAILURE, "elf_strptr failed: %s",
if (strcmp(name, ".shstrtab") != 0) {
                         /* Assuming .shstrtab is "unloadable". */
                         s               = ecp->shstrtab;
                         s->off                = ish.sh_offset;
                 }
 
                 oldndx = newndx = SHN_UNDEF;
                 if (strcmp(name, ".symtab") != 0 &&
                     strcmp(name, ".strtab") != 0) {
+                        /* Add new sections before .shstrtab if we have one. */
                         if (!strcmp(name, ".shstrtab")) {
                                 /*
                                  * Add sections specified by --add-section and
                                  * gnu debuglink. we want these sections have
                                  * smaller index than .shstrtab section.
                                  */
+                                sections_added = true;
                                 if (ecp->debuglink != NULL)
                                         add_gnu_debuglink(ecp);
                                 if (ecp->flags & SEC_ADD)
                                         insert_sections(ecp);
                         }
                          if ((s->os = elf_newscn(ecp->eout)) == NULL)
                                 errx(EXIT_FAILURE, "elf_newscn failed: %s",
                                     elf_errmsg(-1));
while ((is = elf_nextscn(ecp->ein, is)) != NULL) {
                 if (strcmp(name, ".symtab") == 0) {
                         ecp->flags |= SYMTAB_EXIST;
                         ecp->symtab = s;
                 }
                 if (strcmp(name, ".strtab") == 0)
                         ecp->strtab = s;
 
                 insert_to_sec_list(ecp, s, 0);
+        }
+        if (!sections_added) {
+                if (ecp->debuglink != NULL)
+                        add_gnu_debuglink(ecp);
+                if (ecp->flags & SEC_ADD)
+                        insert_sections(ecp);
         }
         elferr = elf_errno();
         if (elferr != 0)
                 errx(EXIT_FAILURE, "elf_nextscn failed: %s",
                     elf_errmsg(elferr));
 }
 
 struct section *

devel/wasi-libcxx/distinfo

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <libgen.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "elfcopy.h"
 
 ELFTC_VCSID("$Id: sections.c 3758 2019-06-28 01:16:50Z emaste $");
 

 {
         struct section  *s;
         const char      *name;
         Elf_Scn         *is;
         GElf_Shdr        ish;
         size_t           indx;
         uint64_t         oldndx, newndx;
         int                 elferr, sec_flags, reorder;
+        bool             sections_added;
 
         /*
          * Insert a pseudo section that contains the ELF header
          * and program header. Used as reference for section offset
          * or load address adjustment.
          */
         if ((s = calloc(1, sizeof(*s))) == NULL)
                 err(EXIT_FAILURE, "calloc failed");
         s->off = 0;
         s->sz = gelf_fsize(ecp->eout, ELF_T_EHDR, 1, EV_CURRENT) +
             gelf_fsize(ecp->eout, ELF_T_PHDR, ecp->ophnum, EV_CURRENT);
         s->align = 1;
         s->pseudo = 1;
         s->loadable = add_to_inseg_list(ecp, s);
         insert_to_sec_list(ecp, s, 0);
 
         /* Create internal .shstrtab section. */
         init_shstrtab(ecp);
 
         if (elf_getshstrndx(ecp->ein, &indx) == 0)
                 errx(EXIT_FAILURE, "elf_getshstrndx failed: %s",
                     elf_errmsg(-1));
 
+        sections_added = false;
         reorder = 0;
         is = NULL;
         while ((is = elf_nextscn(ecp->ein, is)) != NULL) {
                 if (gelf_getshdr(is, &ish) == NULL)
                         errx(EXIT_FAILURE, "gelf_getshdr failed: %s",
                             elf_errmsg(-1));
                 if ((name = elf_strptr(ecp->ein, indx, ish.sh_name)) == NULL)
                         errx(EXIT_FAILURE, "elf_strptr failed: %s",
if (strcmp(name, ".shstrtab") != 0) {
                         /* Assuming .shstrtab is "unloadable". */
                         s               = ecp->shstrtab;
                         s->off                = ish.sh_offset;
                 }
 
                 oldndx = newndx = SHN_UNDEF;
                 if (strcmp(name, ".symtab") != 0 &&
                     strcmp(name, ".strtab") != 0) {
+                        /* Add new sections before .shstrtab if we have one. */
                         if (!strcmp(name, ".shstrtab")) {
                                 /*
                                  * Add sections specified by --add-section and
                                  * gnu debuglink. we want these sections have
                                  * smaller index than .shstrtab section.
                                  */
+                                sections_added = true;
                                 if (ecp->debuglink != NULL)
                                         add_gnu_debuglink(ecp);
                                 if (ecp->flags & SEC_ADD)
                                         insert_sections(ecp);
                         }
                          if ((s->os = elf_newscn(ecp->eout)) == NULL)
                                 errx(EXIT_FAILURE, "elf_newscn failed: %s",
                                     elf_errmsg(-1));
while ((is = elf_nextscn(ecp->ein, is)) != NULL) {
                 if (strcmp(name, ".symtab") == 0) {
                         ecp->flags |= SYMTAB_EXIST;
                         ecp->symtab = s;
                 }
                 if (strcmp(name, ".strtab") == 0)
                         ecp->strtab = s;
 
                 insert_to_sec_list(ecp, s, 0);
+        }
+        if (!sections_added) {
+                if (ecp->debuglink != NULL)
+                        add_gnu_debuglink(ecp);
+                if (ecp->flags & SEC_ADD)
+                        insert_sections(ecp);
         }
         elferr = elf_errno();
         if (elferr != 0)
                 errx(EXIT_FAILURE, "elf_nextscn failed: %s",
                     elf_errmsg(elferr));
 }
 
 struct section *

devel/wasi-libcxx/pkg-plist

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <libgen.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "elfcopy.h"
 
 ELFTC_VCSID("$Id: sections.c 3758 2019-06-28 01:16:50Z emaste $");
 

 {
         struct section  *s;
         const char      *name;
         Elf_Scn         *is;
         GElf_Shdr        ish;
         size_t           indx;
         uint64_t         oldndx, newndx;
         int                 elferr, sec_flags, reorder;
+        bool             sections_added;
 
         /*
          * Insert a pseudo section that contains the ELF header
          * and program header. Used as reference for section offset
          * or load address adjustment.
          */
         if ((s = calloc(1, sizeof(*s))) == NULL)
                 err(EXIT_FAILURE, "calloc failed");
         s->off = 0;
         s->sz = gelf_fsize(ecp->eout, ELF_T_EHDR, 1, EV_CURRENT) +
             gelf_fsize(ecp->eout, ELF_T_PHDR, ecp->ophnum, EV_CURRENT);
         s->align = 1;
         s->pseudo = 1;
         s->loadable = add_to_inseg_list(ecp, s);
         insert_to_sec_list(ecp, s, 0);
 
         /* Create internal .shstrtab section. */
         init_shstrtab(ecp);
 
         if (elf_getshstrndx(ecp->ein, &indx) == 0)
                 errx(EXIT_FAILURE, "elf_getshstrndx failed: %s",
                     elf_errmsg(-1));
 
+        sections_added = false;
         reorder = 0;
         is = NULL;
         while ((is = elf_nextscn(ecp->ein, is)) != NULL) {
                 if (gelf_getshdr(is, &ish) == NULL)
                         errx(EXIT_FAILURE, "gelf_getshdr failed: %s",
                             elf_errmsg(-1));
                 if ((name = elf_strptr(ecp->ein, indx, ish.sh_name)) == NULL)
                         errx(EXIT_FAILURE, "elf_strptr failed: %s",
if (strcmp(name, ".shstrtab") != 0) {
                         /* Assuming .shstrtab is "unloadable". */
                         s               = ecp->shstrtab;
                         s->off                = ish.sh_offset;
                 }
 
                 oldndx = newndx = SHN_UNDEF;
                 if (strcmp(name, ".symtab") != 0 &&
                     strcmp(name, ".strtab") != 0) {
+                        /* Add new sections before .shstrtab if we have one. */
                         if (!strcmp(name, ".shstrtab")) {
                                 /*
                                  * Add sections specified by --add-section and
                                  * gnu debuglink. we want these sections have
                                  * smaller index than .shstrtab section.
                                  */
+                                sections_added = true;
                                 if (ecp->debuglink != NULL)
                                         add_gnu_debuglink(ecp);
                                 if (ecp->flags & SEC_ADD)
                                         insert_sections(ecp);
                         }
                          if ((s->os = elf_newscn(ecp->eout)) == NULL)
                                 errx(EXIT_FAILURE, "elf_newscn failed: %s",
                                     elf_errmsg(-1));
while ((is = elf_nextscn(ecp->ein, is)) != NULL) {
                 if (strcmp(name, ".symtab") == 0) {
                         ecp->flags |= SYMTAB_EXIST;
                         ecp->symtab = s;
                 }
                 if (strcmp(name, ".strtab") == 0)
                         ecp->strtab = s;
 
                 insert_to_sec_list(ecp, s, 0);
+        }
+        if (!sections_added) {
+                if (ecp->debuglink != NULL)
+                        add_gnu_debuglink(ecp);
+                if (ecp->flags & SEC_ADD)
+                        insert_sections(ecp);
         }
         elferr = elf_errno();
         if (elferr != 0)
                 errx(EXIT_FAILURE, "elf_nextscn failed: %s",
                     elf_errmsg(elferr));
 }
 
 struct section *