Message ID | 20211210233456.4146479-1-shorne@gmail.com |
---|---|
Headers |
Return-Path: <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B9DB63857C75 for <patchwork@sourceware.org>; Fri, 10 Dec 2021 23:35:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B9DB63857C75 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639179329; bh=tedY+k4IrsVgnCR2Nt2HexCU5CftUPOKCaSeEPFyBKs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=UX4h29olE96UBRN1XLocSR8OtjG/XMVX7EHkLCq4FGBCVv/P9gOiOYYKYWUqImgdX xW9hlp/G7bPj/RkDKi2UUpRSTY6PRZZ/rMZX0yxiWo9cMlvpck0E1XXcazdU3VK+Be bU00VJ4A6oRfA96sIm3umj6hIh9JZdqHR+srg/Xc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id 6954B3858405 for <libc-alpha@sourceware.org>; Fri, 10 Dec 2021 23:35:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6954B3858405 Received: by mail-pg1-x52a.google.com with SMTP id a23so4718135pgm.4 for <libc-alpha@sourceware.org>; Fri, 10 Dec 2021 15:35:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tedY+k4IrsVgnCR2Nt2HexCU5CftUPOKCaSeEPFyBKs=; b=O+yIZK30Wtm2qw6pC4BzUDSvY4cq4ClMeQMUJzSrkZqYhEEjdPHxnz9Mhj6sk1ezJc oZb7q9h7SgXwcSY7SRMVQjlg8evSgd0kawuUY8R8Gk0E6XT/aYZUUJIoqmidvAKzgWVp 3+ji3kkp72eMdYCz1h8n6NGWX6fxBPi33yBKaE1/AqYkOvQfZf2XCi5A1EFcfuhsdLp1 CqR13BrjqIVzuZespOjndV6Qyq/s29GzjFJnumIH9ygEsu5gJijoyUxTWIzuDvK8Irs3 Red/yIVn8q8eVCFXBVHQRaVPsd5ZMWeYUjCDw1/mXsPvU0Kjg8PRei1F6xFU2lmwq+bD YQTQ== X-Gm-Message-State: AOAM532DExOWsT4fGoVjSZbhljYL0qGcQOUT4MOKqCfl6YQM1uRyGDLa LHvB4mPFx+CAF5drTjEWgVaXWsIqhPQ= X-Google-Smtp-Source: ABdhPJzaAePLkxDeK0OEqwsb0whuHVmDD7eJXks1y5fls06sJGeFpr0r6RqrC2tXwNvBUzic8Opd2A== X-Received: by 2002:a62:8c55:0:b0:49f:df22:c4ca with SMTP id m82-20020a628c55000000b0049fdf22c4camr21017901pfd.11.1639179304054; Fri, 10 Dec 2021 15:35:04 -0800 (PST) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id y18sm4152209pfp.190.2021.12.10.15.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 15:35:03 -0800 (PST) To: GLIBC patches <libc-alpha@sourceware.org> Subject: [PATCH v3 00/13] Glibc OpenRISC port Date: Sat, 11 Dec 2021 08:34:43 +0900 Message-Id: <20211210233456.4146479-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> From: Stafford Horne via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Stafford Horne <shorne@gmail.com> Cc: Openrisc <openrisc@lists.librecores.org> Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org> |
Series |
Glibc OpenRISC port
|
|
Message
Stafford Horne
Dec. 10, 2021, 11:34 p.m. UTC
This is the OpenRISC port for glibc that I have been working on. Changes since v2: - Fixed suggestions from Joseph Myers: - Fix comment style, and description on top of each file - Make sure macros have parentheses when needed, - Bump required kernel down to 5.4.0 and document - Regenerate arch-syscall.h - Fixed suggestions from Adhemerval: - Remove kernel_stat.h - Just set MMAP2_PAGE_UNIT to 8K - Remove ioctl.c and syscall.c files - Update TCB alignment to 32 bytes Changes since v1: - Update api's as suggested by Florian - Remove hard float support - Updates to get all tests passing - Split patch into managable bits similar to recent ARC port Documentation: Architecture / ABI docs: https://raw.githubusercontent.com/openrisc/doc/master/openrisc-arch-1.3-rev1.pdf Test Results: build-many-glibcs.py: PASS with mainline ang gcc-11. Full test suite: The full suite is running using the gcc-11 branch of GCC, mainline shows issues with math soft-fp. Note, there are a few more failures compared to before, this is due to me running with a timeout of 30 vs usual 300. It allows the tests to complete faster, but I get a few more timeouts. There were 15 timeouts which I confirm do work if I increase the timeoutfactor. The 2 real failures marked with * below. # test start: 2021-12-08T19:59:00+09:00 # failures FAIL:*elf/tst-bz15311 FAIL: locale/tst-localedef-path-norm FAIL: malloc/tst-dynarray-fail FAIL: malloc/tst-dynarray-fail-mem FAIL: nptl/tst-mutex10 FAIL: nss/tst-nss-files-hosts-getent FAIL: nss/tst-nss-files-hosts-multi FAIL: posix/tst-regcomp-truncated FAIL: stdio-common/tst-vfprintf-width-prec FAIL: stdio-common/tst-vfprintf-width-prec-alloc FAIL: stdio-common/tst-vfprintf-width-prec-mem FAIL: string/test-memcpy FAIL: string/test-memcpy-large FAIL: string/test-mempcpy FAIL: string/tst-cmp FAIL: support/tst-support_blob_repeat FAIL:*timezone/tst-tzset # test finish: 2021-12-10T22:04:56+09:00 # test duration: 2 days 2 hours 5 minutes and 56 seconds # test for file: tests.sum # test wrapper: /home/shorne/work/gnu-toolchain/glibc/scripts/cross-test-ssh.sh --timeoutfactor 30 10.0.0.5 # summary 17 FAIL 4063 PASS 28 UNSUPPORTED 18 XFAIL tst-bz15311.out: https://gist.github.com/5a5dacaeef1eac1f2f5d89701d14c0ad tst-tzset.out: https://gist.github.com/b3a548d82cfc9367905e115821a52754 tests.sum: https://gist.github.com/f85a81012c8329b9a95370a30c7b27fe Stafford Horne (13): elf: Add reloc for OpenRISC linux/syscalls: Add or1k_atomic syscall for OpenRISC or1k: ABI Implementation or1k: startup and dynamic linking code or1k: Thread Local Storage support or1k: Atomics and Locking primitives or1k: math soft float support or1k: Linux Syscall Interface or1k: Linux ABI or1k: ABI lists or1k: Build Infrastructure build-many-glibcs.py: add OpenRISC support Documentation for OpenRISC port NEWS | 4 + README | 1 + elf/elf.h | 37 + scripts/build-many-glibcs.py | 5 + sysdeps/or1k/Implies | 3 + sysdeps/or1k/Makefile | 7 + sysdeps/or1k/__longjmp.S | 55 + sysdeps/or1k/atomic-machine.h | 79 + sysdeps/or1k/bits/endianness.h | 11 + sysdeps/or1k/bits/fenv.h | 69 + sysdeps/or1k/bits/link.h | 51 + sysdeps/or1k/bits/setjmp.h | 32 + sysdeps/or1k/bsd-_setjmp.S | 1 + sysdeps/or1k/bsd-setjmp.S | 1 + sysdeps/or1k/dl-machine.h | 323 +++ sysdeps/or1k/dl-start.S | 98 + sysdeps/or1k/dl-tls.h | 27 + sysdeps/or1k/dl-trampoline.S | 79 + sysdeps/or1k/jmpbuf-offsets.h | 23 + sysdeps/or1k/jmpbuf-unwind.h | 36 + sysdeps/or1k/ldsodefs.h | 40 + sysdeps/or1k/libc-tls.c | 34 + sysdeps/or1k/libm-test-ulps | 1112 +++++++++ sysdeps/or1k/libm-test-ulps-name | 1 + sysdeps/or1k/machine-gmon.h | 35 + sysdeps/or1k/memusage.h | 21 + sysdeps/or1k/nofpu/Implies | 1 + sysdeps/or1k/nofpu/math-tests-exceptions.h | 29 + sysdeps/or1k/nofpu/math-tests-rounding.h | 28 + sysdeps/or1k/nptl/Makefile | 21 + sysdeps/or1k/nptl/bits/pthreadtypes-arch.h | 48 + sysdeps/or1k/nptl/pthreaddef.h | 36 + sysdeps/or1k/nptl/tcb-offsets.sym | 6 + sysdeps/or1k/nptl/tls.h | 189 ++ sysdeps/or1k/preconfigure | 34 + sysdeps/or1k/setjmp.S | 56 + sysdeps/or1k/sfp-machine.h | 93 + sysdeps/or1k/sotruss-lib.c | 51 + sysdeps/or1k/stackinfo.h | 34 + sysdeps/or1k/start.S | 99 + sysdeps/or1k/sysdep.h | 83 + sysdeps/or1k/tininess.h | 1 + sysdeps/or1k/tst-audit.h | 24 + sysdeps/unix/sysv/linux/or1k/Implies | 3 + sysdeps/unix/sysv/linux/or1k/Makefile | 12 + sysdeps/unix/sysv/linux/or1k/arch-syscall.h | 325 +++ sysdeps/unix/sysv/linux/or1k/bits/procfs.h | 38 + sysdeps/unix/sysv/linux/or1k/bits/timesize.h | 19 + sysdeps/unix/sysv/linux/or1k/c++-types.data | 67 + sysdeps/unix/sysv/linux/or1k/clone.c | 61 + sysdeps/unix/sysv/linux/or1k/configure | 4 + sysdeps/unix/sysv/linux/or1k/configure.ac | 4 + sysdeps/unix/sysv/linux/or1k/getcontext.S | 72 + sysdeps/unix/sysv/linux/or1k/jmp_buf-macros.h | 41 + sysdeps/unix/sysv/linux/or1k/ld.abilist | 5 + .../sysv/linux/or1k/libBrokenLocale.abilist | 1 + sysdeps/unix/sysv/linux/or1k/libanl.abilist | 1 + sysdeps/unix/sysv/linux/or1k/libc.abilist | 2122 +++++++++++++++++ .../sysv/linux/or1k/libc_malloc_debug.abilist | 26 + sysdeps/unix/sysv/linux/or1k/libcrypt.abilist | 2 + sysdeps/unix/sysv/linux/or1k/libdl.abilist | 0 sysdeps/unix/sysv/linux/or1k/libm.abilist | 759 ++++++ sysdeps/unix/sysv/linux/or1k/libnsl.abilist | 121 + .../unix/sysv/linux/or1k/libpthread.abilist | 0 .../unix/sysv/linux/or1k/libresolv.abilist | 55 + sysdeps/unix/sysv/linux/or1k/librt.abilist | 0 .../unix/sysv/linux/or1k/libthread_db.abilist | 40 + sysdeps/unix/sysv/linux/or1k/libutil.abilist | 1 + sysdeps/unix/sysv/linux/or1k/localplt.data | 14 + sysdeps/unix/sysv/linux/or1k/makecontext.c | 77 + sysdeps/unix/sysv/linux/or1k/mmap_internal.h | 28 + sysdeps/unix/sysv/linux/or1k/or1k_clone.S | 89 + sysdeps/unix/sysv/linux/or1k/setcontext.S | 108 + sysdeps/unix/sysv/linux/or1k/shlib-versions | 2 + sysdeps/unix/sysv/linux/or1k/sigcontextinfo.h | 28 + sysdeps/unix/sysv/linux/or1k/swapcontext.S | 116 + sysdeps/unix/sysv/linux/or1k/sys/ucontext.h | 53 + sysdeps/unix/sysv/linux/or1k/sys/user.h | 1 + sysdeps/unix/sysv/linux/or1k/sysdep.c | 34 + sysdeps/unix/sysv/linux/or1k/sysdep.h | 201 ++ sysdeps/unix/sysv/linux/or1k/ucontext_i.sym | 26 + sysdeps/unix/sysv/linux/syscall-names.list | 1 + 82 files changed, 7575 insertions(+) create mode 100644 sysdeps/or1k/Implies create mode 100644 sysdeps/or1k/Makefile create mode 100644 sysdeps/or1k/__longjmp.S create mode 100644 sysdeps/or1k/atomic-machine.h create mode 100644 sysdeps/or1k/bits/endianness.h create mode 100644 sysdeps/or1k/bits/fenv.h create mode 100644 sysdeps/or1k/bits/link.h create mode 100644 sysdeps/or1k/bits/setjmp.h create mode 100644 sysdeps/or1k/bsd-_setjmp.S create mode 100644 sysdeps/or1k/bsd-setjmp.S create mode 100644 sysdeps/or1k/dl-machine.h create mode 100644 sysdeps/or1k/dl-start.S create mode 100644 sysdeps/or1k/dl-tls.h create mode 100644 sysdeps/or1k/dl-trampoline.S create mode 100644 sysdeps/or1k/jmpbuf-offsets.h create mode 100644 sysdeps/or1k/jmpbuf-unwind.h create mode 100644 sysdeps/or1k/ldsodefs.h create mode 100644 sysdeps/or1k/libc-tls.c create mode 100644 sysdeps/or1k/libm-test-ulps create mode 100644 sysdeps/or1k/libm-test-ulps-name create mode 100644 sysdeps/or1k/machine-gmon.h create mode 100644 sysdeps/or1k/memusage.h create mode 100644 sysdeps/or1k/nofpu/Implies create mode 100644 sysdeps/or1k/nofpu/math-tests-exceptions.h create mode 100644 sysdeps/or1k/nofpu/math-tests-rounding.h create mode 100644 sysdeps/or1k/nptl/Makefile create mode 100644 sysdeps/or1k/nptl/bits/pthreadtypes-arch.h create mode 100644 sysdeps/or1k/nptl/pthreaddef.h create mode 100644 sysdeps/or1k/nptl/tcb-offsets.sym create mode 100644 sysdeps/or1k/nptl/tls.h create mode 100644 sysdeps/or1k/preconfigure create mode 100644 sysdeps/or1k/setjmp.S create mode 100644 sysdeps/or1k/sfp-machine.h create mode 100644 sysdeps/or1k/sotruss-lib.c create mode 100644 sysdeps/or1k/stackinfo.h create mode 100644 sysdeps/or1k/start.S create mode 100644 sysdeps/or1k/sysdep.h create mode 100644 sysdeps/or1k/tininess.h create mode 100644 sysdeps/or1k/tst-audit.h create mode 100644 sysdeps/unix/sysv/linux/or1k/Implies create mode 100644 sysdeps/unix/sysv/linux/or1k/Makefile create mode 100644 sysdeps/unix/sysv/linux/or1k/arch-syscall.h create mode 100644 sysdeps/unix/sysv/linux/or1k/bits/procfs.h create mode 100644 sysdeps/unix/sysv/linux/or1k/bits/timesize.h create mode 100644 sysdeps/unix/sysv/linux/or1k/c++-types.data create mode 100644 sysdeps/unix/sysv/linux/or1k/clone.c create mode 100644 sysdeps/unix/sysv/linux/or1k/configure create mode 100644 sysdeps/unix/sysv/linux/or1k/configure.ac create mode 100644 sysdeps/unix/sysv/linux/or1k/getcontext.S create mode 100644 sysdeps/unix/sysv/linux/or1k/jmp_buf-macros.h create mode 100644 sysdeps/unix/sysv/linux/or1k/ld.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libBrokenLocale.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libanl.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libc.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libc_malloc_debug.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libcrypt.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libdl.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libm.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libnsl.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libpthread.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libresolv.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/librt.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libthread_db.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/libutil.abilist create mode 100644 sysdeps/unix/sysv/linux/or1k/localplt.data create mode 100644 sysdeps/unix/sysv/linux/or1k/makecontext.c create mode 100644 sysdeps/unix/sysv/linux/or1k/mmap_internal.h create mode 100644 sysdeps/unix/sysv/linux/or1k/or1k_clone.S create mode 100644 sysdeps/unix/sysv/linux/or1k/setcontext.S create mode 100644 sysdeps/unix/sysv/linux/or1k/shlib-versions create mode 100644 sysdeps/unix/sysv/linux/or1k/sigcontextinfo.h create mode 100644 sysdeps/unix/sysv/linux/or1k/swapcontext.S create mode 100644 sysdeps/unix/sysv/linux/or1k/sys/ucontext.h create mode 100644 sysdeps/unix/sysv/linux/or1k/sys/user.h create mode 100644 sysdeps/unix/sysv/linux/or1k/sysdep.c create mode 100644 sysdeps/unix/sysv/linux/or1k/sysdep.h create mode 100644 sysdeps/unix/sysv/linux/or1k/ucontext_i.sym
Comments
On 10/12/2021 20:34, Stafford Horne via Libc-alpha wrote: > This is the OpenRISC port for glibc that I have been working on. > > Changes since v2: > - Fixed suggestions from Joseph Myers: > - Fix comment style, and description on top of each file > - Make sure macros have parentheses when needed, > - Bump required kernel down to 5.4.0 and document > - Regenerate arch-syscall.h > - Fixed suggestions from Adhemerval: > - Remove kernel_stat.h > - Just set MMAP2_PAGE_UNIT to 8K > - Remove ioctl.c and syscall.c files > - Update TCB alignment to 32 bytes > > Changes since v1: > - Update api's as suggested by Florian > - Remove hard float support > - Updates to get all tests passing > - Split patch into managable bits similar to recent ARC port > > Documentation: > > Architecture / ABI docs: > https://raw.githubusercontent.com/openrisc/doc/master/openrisc-arch-1.3-rev1.pdf > > Test Results: > > build-many-glibcs.py: > > PASS with mainline ang gcc-11. > > Full test suite: > > The full suite is running using the gcc-11 branch of GCC, mainline shows > issues with math soft-fp. > > Note, there are a few more failures compared to before, this is due to me > running with a timeout of 30 vs usual 300. It allows the tests to complete > faster, but I get a few more timeouts. There were 15 timeouts which I > confirm do work if I increase the timeoutfactor. The 2 real failures marked > with * below. > > # test start: 2021-12-08T19:59:00+09:00 > > # failures > FAIL:*elf/tst-bz15311 This seems to be a real issue, the output shows the new sorting algorithm seems not be enabled (the output shows the destructor order for dynamic_sort=1). We need to figure out what is happening here. > FAIL: locale/tst-localedef-path-norm > FAIL: malloc/tst-dynarray-fail > FAIL: malloc/tst-dynarray-fail-mem > FAIL: nptl/tst-mutex10 > FAIL: nss/tst-nss-files-hosts-getent > FAIL: nss/tst-nss-files-hosts-multi > FAIL: posix/tst-regcomp-truncated > FAIL: stdio-common/tst-vfprintf-width-prec > FAIL: stdio-common/tst-vfprintf-width-prec-alloc > FAIL: stdio-common/tst-vfprintf-width-prec-mem > FAIL: string/test-memcpy > FAIL: string/test-memcpy-large > FAIL: string/test-mempcpy > FAIL: string/tst-cmp > FAIL: support/tst-support_blob_repeat > FAIL:*timezone/tst-tzset It seems the testing file system does not support sparse files or at least has some limits of the file size and support_descriptor_supports_holes is no deteting it. I think we should use a large write_offset and block_headroom, maybe something larger than 32-bit offset to actually check it. Could you check if increasing both values does make the test unsupported. > > # test finish: 2021-12-10T22:04:56+09:00 > # test duration: 2 days 2 hours 5 minutes and 56 seconds > # test for file: tests.sum > # test wrapper: /home/shorne/work/gnu-toolchain/glibc/scripts/cross-test-ssh.sh --timeoutfactor 30 10.0.0.5 > > # summary > 17 FAIL > 4063 PASS > 28 UNSUPPORTED > 18 XFAIL > > tst-bz15311.out: https://gist.github.com/5a5dacaeef1eac1f2f5d89701d14c0ad > tst-tzset.out: https://gist.github.com/b3a548d82cfc9367905e115821a52754 > tests.sum: https://gist.github.com/f85a81012c8329b9a95370a30c7b27fe Since 8d1927d8dc5aad0f01c929123086be3a5b799d18 it will need an additional fix to correctly build glibc: diff --git a/sysdeps/or1k/nptl/tls.h b/sysdeps/or1k/nptl/tls.h index dc11610920..3fc63eb4e8 100644 --- a/sysdeps/or1k/nptl/tls.h +++ b/sysdeps/or1k/nptl/tls.h @@ -150,6 +150,8 @@ register tcbhead_t *__thread_self __asm__("r10"); # define DB_THREAD_SELF \ REGISTER (32, 32, 10 * 4, - TLS_INIT_TCB_SIZE - TLS_PRE_TCB_SIZE) +# include <tcb-access.h> + /* Access to data in the thread descriptor is easy. */ #define THREAD_GETMEM(descr, member) \ With the above fix I can bootstrap a compiler with build-many-glibcs.py. > > Stafford Horne (13): > elf: Add reloc for OpenRISC > linux/syscalls: Add or1k_atomic syscall for OpenRISC > or1k: ABI Implementation > or1k: startup and dynamic linking code > or1k: Thread Local Storage support > or1k: Atomics and Locking primitives > or1k: math soft float support > or1k: Linux Syscall Interface > or1k: Linux ABI > or1k: ABI lists > or1k: Build Infrastructure > build-many-glibcs.py: add OpenRISC support > Documentation for OpenRISC port > > NEWS | 4 + > README | 1 + > elf/elf.h | 37 + > scripts/build-many-glibcs.py | 5 + > sysdeps/or1k/Implies | 3 + > sysdeps/or1k/Makefile | 7 + > sysdeps/or1k/__longjmp.S | 55 + > sysdeps/or1k/atomic-machine.h | 79 + > sysdeps/or1k/bits/endianness.h | 11 + > sysdeps/or1k/bits/fenv.h | 69 + > sysdeps/or1k/bits/link.h | 51 + > sysdeps/or1k/bits/setjmp.h | 32 + > sysdeps/or1k/bsd-_setjmp.S | 1 + > sysdeps/or1k/bsd-setjmp.S | 1 + > sysdeps/or1k/dl-machine.h | 323 +++ > sysdeps/or1k/dl-start.S | 98 + > sysdeps/or1k/dl-tls.h | 27 + > sysdeps/or1k/dl-trampoline.S | 79 + > sysdeps/or1k/jmpbuf-offsets.h | 23 + > sysdeps/or1k/jmpbuf-unwind.h | 36 + > sysdeps/or1k/ldsodefs.h | 40 + > sysdeps/or1k/libc-tls.c | 34 + > sysdeps/or1k/libm-test-ulps | 1112 +++++++++ > sysdeps/or1k/libm-test-ulps-name | 1 + > sysdeps/or1k/machine-gmon.h | 35 + > sysdeps/or1k/memusage.h | 21 + > sysdeps/or1k/nofpu/Implies | 1 + > sysdeps/or1k/nofpu/math-tests-exceptions.h | 29 + > sysdeps/or1k/nofpu/math-tests-rounding.h | 28 + > sysdeps/or1k/nptl/Makefile | 21 + > sysdeps/or1k/nptl/bits/pthreadtypes-arch.h | 48 + > sysdeps/or1k/nptl/pthreaddef.h | 36 + > sysdeps/or1k/nptl/tcb-offsets.sym | 6 + > sysdeps/or1k/nptl/tls.h | 189 ++ > sysdeps/or1k/preconfigure | 34 + > sysdeps/or1k/setjmp.S | 56 + > sysdeps/or1k/sfp-machine.h | 93 + > sysdeps/or1k/sotruss-lib.c | 51 + > sysdeps/or1k/stackinfo.h | 34 + > sysdeps/or1k/start.S | 99 + > sysdeps/or1k/sysdep.h | 83 + > sysdeps/or1k/tininess.h | 1 + > sysdeps/or1k/tst-audit.h | 24 + > sysdeps/unix/sysv/linux/or1k/Implies | 3 + > sysdeps/unix/sysv/linux/or1k/Makefile | 12 + > sysdeps/unix/sysv/linux/or1k/arch-syscall.h | 325 +++ > sysdeps/unix/sysv/linux/or1k/bits/procfs.h | 38 + > sysdeps/unix/sysv/linux/or1k/bits/timesize.h | 19 + > sysdeps/unix/sysv/linux/or1k/c++-types.data | 67 + > sysdeps/unix/sysv/linux/or1k/clone.c | 61 + > sysdeps/unix/sysv/linux/or1k/configure | 4 + > sysdeps/unix/sysv/linux/or1k/configure.ac | 4 + > sysdeps/unix/sysv/linux/or1k/getcontext.S | 72 + > sysdeps/unix/sysv/linux/or1k/jmp_buf-macros.h | 41 + > sysdeps/unix/sysv/linux/or1k/ld.abilist | 5 + > .../sysv/linux/or1k/libBrokenLocale.abilist | 1 + > sysdeps/unix/sysv/linux/or1k/libanl.abilist | 1 + > sysdeps/unix/sysv/linux/or1k/libc.abilist | 2122 +++++++++++++++++ > .../sysv/linux/or1k/libc_malloc_debug.abilist | 26 + > sysdeps/unix/sysv/linux/or1k/libcrypt.abilist | 2 + > sysdeps/unix/sysv/linux/or1k/libdl.abilist | 0 > sysdeps/unix/sysv/linux/or1k/libm.abilist | 759 ++++++ > sysdeps/unix/sysv/linux/or1k/libnsl.abilist | 121 + > .../unix/sysv/linux/or1k/libpthread.abilist | 0 > .../unix/sysv/linux/or1k/libresolv.abilist | 55 + > sysdeps/unix/sysv/linux/or1k/librt.abilist | 0 > .../unix/sysv/linux/or1k/libthread_db.abilist | 40 + > sysdeps/unix/sysv/linux/or1k/libutil.abilist | 1 + > sysdeps/unix/sysv/linux/or1k/localplt.data | 14 + > sysdeps/unix/sysv/linux/or1k/makecontext.c | 77 + > sysdeps/unix/sysv/linux/or1k/mmap_internal.h | 28 + > sysdeps/unix/sysv/linux/or1k/or1k_clone.S | 89 + > sysdeps/unix/sysv/linux/or1k/setcontext.S | 108 + > sysdeps/unix/sysv/linux/or1k/shlib-versions | 2 + > sysdeps/unix/sysv/linux/or1k/sigcontextinfo.h | 28 + > sysdeps/unix/sysv/linux/or1k/swapcontext.S | 116 + > sysdeps/unix/sysv/linux/or1k/sys/ucontext.h | 53 + > sysdeps/unix/sysv/linux/or1k/sys/user.h | 1 + > sysdeps/unix/sysv/linux/or1k/sysdep.c | 34 + > sysdeps/unix/sysv/linux/or1k/sysdep.h | 201 ++ > sysdeps/unix/sysv/linux/or1k/ucontext_i.sym | 26 + > sysdeps/unix/sysv/linux/syscall-names.list | 1 + > 82 files changed, 7575 insertions(+) > create mode 100644 sysdeps/or1k/Implies > create mode 100644 sysdeps/or1k/Makefile > create mode 100644 sysdeps/or1k/__longjmp.S > create mode 100644 sysdeps/or1k/atomic-machine.h > create mode 100644 sysdeps/or1k/bits/endianness.h > create mode 100644 sysdeps/or1k/bits/fenv.h > create mode 100644 sysdeps/or1k/bits/link.h > create mode 100644 sysdeps/or1k/bits/setjmp.h > create mode 100644 sysdeps/or1k/bsd-_setjmp.S > create mode 100644 sysdeps/or1k/bsd-setjmp.S > create mode 100644 sysdeps/or1k/dl-machine.h > create mode 100644 sysdeps/or1k/dl-start.S > create mode 100644 sysdeps/or1k/dl-tls.h > create mode 100644 sysdeps/or1k/dl-trampoline.S > create mode 100644 sysdeps/or1k/jmpbuf-offsets.h > create mode 100644 sysdeps/or1k/jmpbuf-unwind.h > create mode 100644 sysdeps/or1k/ldsodefs.h > create mode 100644 sysdeps/or1k/libc-tls.c > create mode 100644 sysdeps/or1k/libm-test-ulps > create mode 100644 sysdeps/or1k/libm-test-ulps-name > create mode 100644 sysdeps/or1k/machine-gmon.h > create mode 100644 sysdeps/or1k/memusage.h > create mode 100644 sysdeps/or1k/nofpu/Implies > create mode 100644 sysdeps/or1k/nofpu/math-tests-exceptions.h > create mode 100644 sysdeps/or1k/nofpu/math-tests-rounding.h > create mode 100644 sysdeps/or1k/nptl/Makefile > create mode 100644 sysdeps/or1k/nptl/bits/pthreadtypes-arch.h > create mode 100644 sysdeps/or1k/nptl/pthreaddef.h > create mode 100644 sysdeps/or1k/nptl/tcb-offsets.sym > create mode 100644 sysdeps/or1k/nptl/tls.h > create mode 100644 sysdeps/or1k/preconfigure > create mode 100644 sysdeps/or1k/setjmp.S > create mode 100644 sysdeps/or1k/sfp-machine.h > create mode 100644 sysdeps/or1k/sotruss-lib.c > create mode 100644 sysdeps/or1k/stackinfo.h > create mode 100644 sysdeps/or1k/start.S > create mode 100644 sysdeps/or1k/sysdep.h > create mode 100644 sysdeps/or1k/tininess.h > create mode 100644 sysdeps/or1k/tst-audit.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/Implies > create mode 100644 sysdeps/unix/sysv/linux/or1k/Makefile > create mode 100644 sysdeps/unix/sysv/linux/or1k/arch-syscall.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/bits/procfs.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/bits/timesize.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/c++-types.data > create mode 100644 sysdeps/unix/sysv/linux/or1k/clone.c > create mode 100644 sysdeps/unix/sysv/linux/or1k/configure > create mode 100644 sysdeps/unix/sysv/linux/or1k/configure.ac > create mode 100644 sysdeps/unix/sysv/linux/or1k/getcontext.S > create mode 100644 sysdeps/unix/sysv/linux/or1k/jmp_buf-macros.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/ld.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libBrokenLocale.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libanl.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libc.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libc_malloc_debug.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libcrypt.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libdl.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libm.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libnsl.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libpthread.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libresolv.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/librt.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libthread_db.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/libutil.abilist > create mode 100644 sysdeps/unix/sysv/linux/or1k/localplt.data > create mode 100644 sysdeps/unix/sysv/linux/or1k/makecontext.c > create mode 100644 sysdeps/unix/sysv/linux/or1k/mmap_internal.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/or1k_clone.S > create mode 100644 sysdeps/unix/sysv/linux/or1k/setcontext.S > create mode 100644 sysdeps/unix/sysv/linux/or1k/shlib-versions > create mode 100644 sysdeps/unix/sysv/linux/or1k/sigcontextinfo.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/swapcontext.S > create mode 100644 sysdeps/unix/sysv/linux/or1k/sys/ucontext.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/sys/user.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/sysdep.c > create mode 100644 sysdeps/unix/sysv/linux/or1k/sysdep.h > create mode 100644 sysdeps/unix/sysv/linux/or1k/ucontext_i.sym >
On 14/12/2021 17:25, Adhemerval Zanella wrote: > > > On 10/12/2021 20:34, Stafford Horne via Libc-alpha wrote: >> This is the OpenRISC port for glibc that I have been working on. >> >> Changes since v2: >> - Fixed suggestions from Joseph Myers: >> - Fix comment style, and description on top of each file >> - Make sure macros have parentheses when needed, >> - Bump required kernel down to 5.4.0 and document >> - Regenerate arch-syscall.h >> - Fixed suggestions from Adhemerval: >> - Remove kernel_stat.h >> - Just set MMAP2_PAGE_UNIT to 8K >> - Remove ioctl.c and syscall.c files >> - Update TCB alignment to 32 bytes >> >> Changes since v1: >> - Update api's as suggested by Florian >> - Remove hard float support >> - Updates to get all tests passing >> - Split patch into managable bits similar to recent ARC port >> >> Documentation: >> >> Architecture / ABI docs: >> https://raw.githubusercontent.com/openrisc/doc/master/openrisc-arch-1.3-rev1.pdf >> >> Test Results: >> >> build-many-glibcs.py: >> >> PASS with mainline ang gcc-11. >> >> Full test suite: >> >> The full suite is running using the gcc-11 branch of GCC, mainline shows >> issues with math soft-fp. >> >> Note, there are a few more failures compared to before, this is due to me >> running with a timeout of 30 vs usual 300. It allows the tests to complete >> faster, but I get a few more timeouts. There were 15 timeouts which I >> confirm do work if I increase the timeoutfactor. The 2 real failures marked >> with * below. >> >> # test start: 2021-12-08T19:59:00+09:00 >> >> # failures >> FAIL:*elf/tst-bz15311 > > This seems to be a real issue, the output shows the new sorting algorithm seems > not be enabled (the output shows the destructor order for dynamic_sort=1). We > need to figure out what is happening here. It does like the destructor ordering issue Florian has posted a patch [1]. [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134165.html > >> FAIL: locale/tst-localedef-path-norm >> FAIL: malloc/tst-dynarray-fail >> FAIL: malloc/tst-dynarray-fail-mem >> FAIL: nptl/tst-mutex10 >> FAIL: nss/tst-nss-files-hosts-getent >> FAIL: nss/tst-nss-files-hosts-multi >> FAIL: posix/tst-regcomp-truncated >> FAIL: stdio-common/tst-vfprintf-width-prec >> FAIL: stdio-common/tst-vfprintf-width-prec-alloc >> FAIL: stdio-common/tst-vfprintf-width-prec-mem >> FAIL: string/test-memcpy >> FAIL: string/test-memcpy-large >> FAIL: string/test-mempcpy >> FAIL: string/tst-cmp >> FAIL: support/tst-support_blob_repeat >> FAIL:*timezone/tst-tzset > > It seems the testing file system does not support sparse files or at least > has some limits of the file size and support_descriptor_supports_holes is > no deteting it. > > I think we should use a large write_offset and block_headroom, maybe > something larger than 32-bit offset to actually check it. Could you > check if increasing both values does make the test unsupported. > >> >> # test finish: 2021-12-10T22:04:56+09:00 >> # test duration: 2 days 2 hours 5 minutes and 56 seconds >> # test for file: tests.sum >> # test wrapper: /home/shorne/work/gnu-toolchain/glibc/scripts/cross-test-ssh.sh --timeoutfactor 30 10.0.0.5 >> >> # summary >> 17 FAIL >> 4063 PASS >> 28 UNSUPPORTED >> 18 XFAIL >> >> tst-bz15311.out: https://gist.github.com/5a5dacaeef1eac1f2f5d89701d14c0ad >> tst-tzset.out: https://gist.github.com/b3a548d82cfc9367905e115821a52754 >> tests.sum: https://gist.github.com/f85a81012c8329b9a95370a30c7b27fe > > Since 8d1927d8dc5aad0f01c929123086be3a5b799d18 it will need an additional > fix to correctly build glibc: > > diff --git a/sysdeps/or1k/nptl/tls.h b/sysdeps/or1k/nptl/tls.h > index dc11610920..3fc63eb4e8 100644 > --- a/sysdeps/or1k/nptl/tls.h > +++ b/sysdeps/or1k/nptl/tls.h > @@ -150,6 +150,8 @@ register tcbhead_t *__thread_self __asm__("r10"); > # define DB_THREAD_SELF \ > REGISTER (32, 32, 10 * 4, - TLS_INIT_TCB_SIZE - TLS_PRE_TCB_SIZE) > > +# include <tcb-access.h> > + > /* Access to data in the thread descriptor is easy. */ > > #define THREAD_GETMEM(descr, member) \ > > With the above fix I can bootstrap a compiler with build-many-glibcs.py. > >> >> Stafford Horne (13): >> elf: Add reloc for OpenRISC >> linux/syscalls: Add or1k_atomic syscall for OpenRISC >> or1k: ABI Implementation >> or1k: startup and dynamic linking code >> or1k: Thread Local Storage support >> or1k: Atomics and Locking primitives >> or1k: math soft float support >> or1k: Linux Syscall Interface >> or1k: Linux ABI >> or1k: ABI lists >> or1k: Build Infrastructure >> build-many-glibcs.py: add OpenRISC support >> Documentation for OpenRISC port >> >> NEWS | 4 + >> README | 1 + >> elf/elf.h | 37 + >> scripts/build-many-glibcs.py | 5 + >> sysdeps/or1k/Implies | 3 + >> sysdeps/or1k/Makefile | 7 + >> sysdeps/or1k/__longjmp.S | 55 + >> sysdeps/or1k/atomic-machine.h | 79 + >> sysdeps/or1k/bits/endianness.h | 11 + >> sysdeps/or1k/bits/fenv.h | 69 + >> sysdeps/or1k/bits/link.h | 51 + >> sysdeps/or1k/bits/setjmp.h | 32 + >> sysdeps/or1k/bsd-_setjmp.S | 1 + >> sysdeps/or1k/bsd-setjmp.S | 1 + >> sysdeps/or1k/dl-machine.h | 323 +++ >> sysdeps/or1k/dl-start.S | 98 + >> sysdeps/or1k/dl-tls.h | 27 + >> sysdeps/or1k/dl-trampoline.S | 79 + >> sysdeps/or1k/jmpbuf-offsets.h | 23 + >> sysdeps/or1k/jmpbuf-unwind.h | 36 + >> sysdeps/or1k/ldsodefs.h | 40 + >> sysdeps/or1k/libc-tls.c | 34 + >> sysdeps/or1k/libm-test-ulps | 1112 +++++++++ >> sysdeps/or1k/libm-test-ulps-name | 1 + >> sysdeps/or1k/machine-gmon.h | 35 + >> sysdeps/or1k/memusage.h | 21 + >> sysdeps/or1k/nofpu/Implies | 1 + >> sysdeps/or1k/nofpu/math-tests-exceptions.h | 29 + >> sysdeps/or1k/nofpu/math-tests-rounding.h | 28 + >> sysdeps/or1k/nptl/Makefile | 21 + >> sysdeps/or1k/nptl/bits/pthreadtypes-arch.h | 48 + >> sysdeps/or1k/nptl/pthreaddef.h | 36 + >> sysdeps/or1k/nptl/tcb-offsets.sym | 6 + >> sysdeps/or1k/nptl/tls.h | 189 ++ >> sysdeps/or1k/preconfigure | 34 + >> sysdeps/or1k/setjmp.S | 56 + >> sysdeps/or1k/sfp-machine.h | 93 + >> sysdeps/or1k/sotruss-lib.c | 51 + >> sysdeps/or1k/stackinfo.h | 34 + >> sysdeps/or1k/start.S | 99 + >> sysdeps/or1k/sysdep.h | 83 + >> sysdeps/or1k/tininess.h | 1 + >> sysdeps/or1k/tst-audit.h | 24 + >> sysdeps/unix/sysv/linux/or1k/Implies | 3 + >> sysdeps/unix/sysv/linux/or1k/Makefile | 12 + >> sysdeps/unix/sysv/linux/or1k/arch-syscall.h | 325 +++ >> sysdeps/unix/sysv/linux/or1k/bits/procfs.h | 38 + >> sysdeps/unix/sysv/linux/or1k/bits/timesize.h | 19 + >> sysdeps/unix/sysv/linux/or1k/c++-types.data | 67 + >> sysdeps/unix/sysv/linux/or1k/clone.c | 61 + >> sysdeps/unix/sysv/linux/or1k/configure | 4 + >> sysdeps/unix/sysv/linux/or1k/configure.ac | 4 + >> sysdeps/unix/sysv/linux/or1k/getcontext.S | 72 + >> sysdeps/unix/sysv/linux/or1k/jmp_buf-macros.h | 41 + >> sysdeps/unix/sysv/linux/or1k/ld.abilist | 5 + >> .../sysv/linux/or1k/libBrokenLocale.abilist | 1 + >> sysdeps/unix/sysv/linux/or1k/libanl.abilist | 1 + >> sysdeps/unix/sysv/linux/or1k/libc.abilist | 2122 +++++++++++++++++ >> .../sysv/linux/or1k/libc_malloc_debug.abilist | 26 + >> sysdeps/unix/sysv/linux/or1k/libcrypt.abilist | 2 + >> sysdeps/unix/sysv/linux/or1k/libdl.abilist | 0 >> sysdeps/unix/sysv/linux/or1k/libm.abilist | 759 ++++++ >> sysdeps/unix/sysv/linux/or1k/libnsl.abilist | 121 + >> .../unix/sysv/linux/or1k/libpthread.abilist | 0 >> .../unix/sysv/linux/or1k/libresolv.abilist | 55 + >> sysdeps/unix/sysv/linux/or1k/librt.abilist | 0 >> .../unix/sysv/linux/or1k/libthread_db.abilist | 40 + >> sysdeps/unix/sysv/linux/or1k/libutil.abilist | 1 + >> sysdeps/unix/sysv/linux/or1k/localplt.data | 14 + >> sysdeps/unix/sysv/linux/or1k/makecontext.c | 77 + >> sysdeps/unix/sysv/linux/or1k/mmap_internal.h | 28 + >> sysdeps/unix/sysv/linux/or1k/or1k_clone.S | 89 + >> sysdeps/unix/sysv/linux/or1k/setcontext.S | 108 + >> sysdeps/unix/sysv/linux/or1k/shlib-versions | 2 + >> sysdeps/unix/sysv/linux/or1k/sigcontextinfo.h | 28 + >> sysdeps/unix/sysv/linux/or1k/swapcontext.S | 116 + >> sysdeps/unix/sysv/linux/or1k/sys/ucontext.h | 53 + >> sysdeps/unix/sysv/linux/or1k/sys/user.h | 1 + >> sysdeps/unix/sysv/linux/or1k/sysdep.c | 34 + >> sysdeps/unix/sysv/linux/or1k/sysdep.h | 201 ++ >> sysdeps/unix/sysv/linux/or1k/ucontext_i.sym | 26 + >> sysdeps/unix/sysv/linux/syscall-names.list | 1 + >> 82 files changed, 7575 insertions(+) >> create mode 100644 sysdeps/or1k/Implies >> create mode 100644 sysdeps/or1k/Makefile >> create mode 100644 sysdeps/or1k/__longjmp.S >> create mode 100644 sysdeps/or1k/atomic-machine.h >> create mode 100644 sysdeps/or1k/bits/endianness.h >> create mode 100644 sysdeps/or1k/bits/fenv.h >> create mode 100644 sysdeps/or1k/bits/link.h >> create mode 100644 sysdeps/or1k/bits/setjmp.h >> create mode 100644 sysdeps/or1k/bsd-_setjmp.S >> create mode 100644 sysdeps/or1k/bsd-setjmp.S >> create mode 100644 sysdeps/or1k/dl-machine.h >> create mode 100644 sysdeps/or1k/dl-start.S >> create mode 100644 sysdeps/or1k/dl-tls.h >> create mode 100644 sysdeps/or1k/dl-trampoline.S >> create mode 100644 sysdeps/or1k/jmpbuf-offsets.h >> create mode 100644 sysdeps/or1k/jmpbuf-unwind.h >> create mode 100644 sysdeps/or1k/ldsodefs.h >> create mode 100644 sysdeps/or1k/libc-tls.c >> create mode 100644 sysdeps/or1k/libm-test-ulps >> create mode 100644 sysdeps/or1k/libm-test-ulps-name >> create mode 100644 sysdeps/or1k/machine-gmon.h >> create mode 100644 sysdeps/or1k/memusage.h >> create mode 100644 sysdeps/or1k/nofpu/Implies >> create mode 100644 sysdeps/or1k/nofpu/math-tests-exceptions.h >> create mode 100644 sysdeps/or1k/nofpu/math-tests-rounding.h >> create mode 100644 sysdeps/or1k/nptl/Makefile >> create mode 100644 sysdeps/or1k/nptl/bits/pthreadtypes-arch.h >> create mode 100644 sysdeps/or1k/nptl/pthreaddef.h >> create mode 100644 sysdeps/or1k/nptl/tcb-offsets.sym >> create mode 100644 sysdeps/or1k/nptl/tls.h >> create mode 100644 sysdeps/or1k/preconfigure >> create mode 100644 sysdeps/or1k/setjmp.S >> create mode 100644 sysdeps/or1k/sfp-machine.h >> create mode 100644 sysdeps/or1k/sotruss-lib.c >> create mode 100644 sysdeps/or1k/stackinfo.h >> create mode 100644 sysdeps/or1k/start.S >> create mode 100644 sysdeps/or1k/sysdep.h >> create mode 100644 sysdeps/or1k/tininess.h >> create mode 100644 sysdeps/or1k/tst-audit.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/Implies >> create mode 100644 sysdeps/unix/sysv/linux/or1k/Makefile >> create mode 100644 sysdeps/unix/sysv/linux/or1k/arch-syscall.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/bits/procfs.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/bits/timesize.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/c++-types.data >> create mode 100644 sysdeps/unix/sysv/linux/or1k/clone.c >> create mode 100644 sysdeps/unix/sysv/linux/or1k/configure >> create mode 100644 sysdeps/unix/sysv/linux/or1k/configure.ac >> create mode 100644 sysdeps/unix/sysv/linux/or1k/getcontext.S >> create mode 100644 sysdeps/unix/sysv/linux/or1k/jmp_buf-macros.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/ld.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libBrokenLocale.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libanl.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libc.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libc_malloc_debug.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libcrypt.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libdl.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libm.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libnsl.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libpthread.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libresolv.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/librt.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libthread_db.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/libutil.abilist >> create mode 100644 sysdeps/unix/sysv/linux/or1k/localplt.data >> create mode 100644 sysdeps/unix/sysv/linux/or1k/makecontext.c >> create mode 100644 sysdeps/unix/sysv/linux/or1k/mmap_internal.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/or1k_clone.S >> create mode 100644 sysdeps/unix/sysv/linux/or1k/setcontext.S >> create mode 100644 sysdeps/unix/sysv/linux/or1k/shlib-versions >> create mode 100644 sysdeps/unix/sysv/linux/or1k/sigcontextinfo.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/swapcontext.S >> create mode 100644 sysdeps/unix/sysv/linux/or1k/sys/ucontext.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/sys/user.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/sysdep.c >> create mode 100644 sysdeps/unix/sysv/linux/or1k/sysdep.h >> create mode 100644 sysdeps/unix/sysv/linux/or1k/ucontext_i.sym >>
On Tue, Dec 14, 2021 at 10:19:03PM -0300, Adhemerval Zanella wrote: > > > On 14/12/2021 17:25, Adhemerval Zanella wrote: > > > > > > On 10/12/2021 20:34, Stafford Horne via Libc-alpha wrote: > >> This is the OpenRISC port for glibc that I have been working on. > >> > >> Changes since v2: > >> - Fixed suggestions from Joseph Myers: > >> - Fix comment style, and description on top of each file > >> - Make sure macros have parentheses when needed, > >> - Bump required kernel down to 5.4.0 and document > >> - Regenerate arch-syscall.h > >> - Fixed suggestions from Adhemerval: > >> - Remove kernel_stat.h > >> - Just set MMAP2_PAGE_UNIT to 8K > >> - Remove ioctl.c and syscall.c files > >> - Update TCB alignment to 32 bytes > >> > >> Changes since v1: > >> - Update api's as suggested by Florian > >> - Remove hard float support > >> - Updates to get all tests passing > >> - Split patch into managable bits similar to recent ARC port > >> > >> Documentation: > >> > >> Architecture / ABI docs: > >> https://raw.githubusercontent.com/openrisc/doc/master/openrisc-arch-1.3-rev1.pdf > >> > >> Test Results: > >> > >> build-many-glibcs.py: > >> > >> PASS with mainline ang gcc-11. > >> > >> Full test suite: > >> > >> The full suite is running using the gcc-11 branch of GCC, mainline shows > >> issues with math soft-fp. > >> > >> Note, there are a few more failures compared to before, this is due to me > >> running with a timeout of 30 vs usual 300. It allows the tests to complete > >> faster, but I get a few more timeouts. There were 15 timeouts which I > >> confirm do work if I increase the timeoutfactor. The 2 real failures marked > >> with * below. > >> > >> # test start: 2021-12-08T19:59:00+09:00 > >> > >> # failures > >> FAIL:*elf/tst-bz15311 > > > > This seems to be a real issue, the output shows the new sorting algorithm seems > > not be enabled (the output shows the destructor order for dynamic_sort=1). We > > need to figure out what is happening here. > > It does like the destructor ordering issue Florian has posted a patch [1]. > > [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134165.html I confirm applying these 2 patches from Florian does fix elf/tst-bz15311 for me. Thanks for the heads up. -Stafford
On Tue, Dec 14, 2021 at 05:25:09PM -0300, Adhemerval Zanella wrote: > > > On 10/12/2021 20:34, Stafford Horne via Libc-alpha wrote: > > This is the OpenRISC port for glibc that I have been working on. > > > > Changes since v2: > > - Fixed suggestions from Joseph Myers: > > - Fix comment style, and description on top of each file > > - Make sure macros have parentheses when needed, > > - Bump required kernel down to 5.4.0 and document > > - Regenerate arch-syscall.h > > - Fixed suggestions from Adhemerval: > > - Remove kernel_stat.h > > - Just set MMAP2_PAGE_UNIT to 8K > > - Remove ioctl.c and syscall.c files > > - Update TCB alignment to 32 bytes > > > > Changes since v1: > > - Update api's as suggested by Florian > > - Remove hard float support > > - Updates to get all tests passing > > - Split patch into managable bits similar to recent ARC port > > > > Documentation: > > > > Architecture / ABI docs: > > https://raw.githubusercontent.com/openrisc/doc/master/openrisc-arch-1.3-rev1.pdf > > > > Test Results: > > > > build-many-glibcs.py: > > > > PASS with mainline ang gcc-11. > > > > Full test suite: > > > > The full suite is running using the gcc-11 branch of GCC, mainline shows > > issues with math soft-fp. > > > > Note, there are a few more failures compared to before, this is due to me > > running with a timeout of 30 vs usual 300. It allows the tests to complete > > faster, but I get a few more timeouts. There were 15 timeouts which I > > confirm do work if I increase the timeoutfactor. The 2 real failures marked > > with * below. > > > > # test start: 2021-12-08T19:59:00+09:00 > > > > # failures > > FAIL:*elf/tst-bz15311 > > This seems to be a real issue, the output shows the new sorting algorithm seems > not be enabled (the output shows the destructor order for dynamic_sort=1). We > need to figure out what is happening here. > > > FAIL: locale/tst-localedef-path-norm > > FAIL: malloc/tst-dynarray-fail > > FAIL: malloc/tst-dynarray-fail-mem > > FAIL: nptl/tst-mutex10 > > FAIL: nss/tst-nss-files-hosts-getent > > FAIL: nss/tst-nss-files-hosts-multi > > FAIL: posix/tst-regcomp-truncated > > FAIL: stdio-common/tst-vfprintf-width-prec > > FAIL: stdio-common/tst-vfprintf-width-prec-alloc > > FAIL: stdio-common/tst-vfprintf-width-prec-mem > > FAIL: string/test-memcpy > > FAIL: string/test-memcpy-large > > FAIL: string/test-mempcpy > > FAIL: string/tst-cmp > > FAIL: support/tst-support_blob_repeat > > FAIL:*timezone/tst-tzset > > It seems the testing file system does not support sparse files or at least > has some limits of the file size and support_descriptor_supports_holes is > no deteting it. Let me see if I can figure out the sparse file support. If that can work then it would be good. The filesystem I am using is: tmpfs on /tmp type tmpfs (rw,relatime) > I think we should use a large write_offset and block_headroom, maybe > something larger than 32-bit offset to actually check it. Could you > check if increasing both values does make the test unsupported. I will check. -Stafford
On Wed, Dec 15, 2021 at 02:37:23PM +0900, Stafford Horne wrote: > On Tue, Dec 14, 2021 at 05:25:09PM -0300, Adhemerval Zanella wrote: > > > > > > On 10/12/2021 20:34, Stafford Horne via Libc-alpha wrote: > > > This is the OpenRISC port for glibc that I have been working on. > > > > > > Changes since v2: > > > - Fixed suggestions from Joseph Myers: > > > - Fix comment style, and description on top of each file > > > - Make sure macros have parentheses when needed, > > > - Bump required kernel down to 5.4.0 and document > > > - Regenerate arch-syscall.h > > > - Fixed suggestions from Adhemerval: > > > - Remove kernel_stat.h > > > - Just set MMAP2_PAGE_UNIT to 8K > > > - Remove ioctl.c and syscall.c files > > > - Update TCB alignment to 32 bytes > > > > > > Changes since v1: > > > - Update api's as suggested by Florian > > > - Remove hard float support > > > - Updates to get all tests passing > > > - Split patch into managable bits similar to recent ARC port > > > > > > Documentation: > > > > > > Architecture / ABI docs: > > > https://raw.githubusercontent.com/openrisc/doc/master/openrisc-arch-1.3-rev1.pdf > > > > > > Test Results: > > > > > > build-many-glibcs.py: > > > > > > PASS with mainline ang gcc-11. > > > > > > Full test suite: > > > > > > The full suite is running using the gcc-11 branch of GCC, mainline shows > > > issues with math soft-fp. > > > > > > Note, there are a few more failures compared to before, this is due to me > > > running with a timeout of 30 vs usual 300. It allows the tests to complete > > > faster, but I get a few more timeouts. There were 15 timeouts which I > > > confirm do work if I increase the timeoutfactor. The 2 real failures marked > > > with * below. > > > > > > # test start: 2021-12-08T19:59:00+09:00 > > > > > > # failures > > > FAIL:*elf/tst-bz15311 > > > > This seems to be a real issue, the output shows the new sorting algorithm seems > > not be enabled (the output shows the destructor order for dynamic_sort=1). We > > need to figure out what is happening here. > > > > > FAIL: locale/tst-localedef-path-norm > > > FAIL: malloc/tst-dynarray-fail > > > FAIL: malloc/tst-dynarray-fail-mem > > > FAIL: nptl/tst-mutex10 > > > FAIL: nss/tst-nss-files-hosts-getent > > > FAIL: nss/tst-nss-files-hosts-multi > > > FAIL: posix/tst-regcomp-truncated > > > FAIL: stdio-common/tst-vfprintf-width-prec > > > FAIL: stdio-common/tst-vfprintf-width-prec-alloc > > > FAIL: stdio-common/tst-vfprintf-width-prec-mem > > > FAIL: string/test-memcpy > > > FAIL: string/test-memcpy-large > > > FAIL: string/test-mempcpy > > > FAIL: string/tst-cmp > > > FAIL: support/tst-support_blob_repeat > > > FAIL:*timezone/tst-tzset > > > > It seems the testing file system does not support sparse files or at least > > has some limits of the file size and support_descriptor_supports_holes is > > no deteting it. > > Let me see if I can figure out the sparse file support. If that can work > then it would be good. The filesystem I am using is: > > tmpfs on /tmp type tmpfs (rw,relatime) > > > I think we should use a large write_offset and block_headroom, maybe > > something larger than 32-bit offset to actually check it. Could you > > check if increasing both values does make the test unsupported. > > I will check. I looked into this, the following patch seems to help. Below are some notes I was keeping as I debugged it. It seems the write to the tmp file was failing due the re-open not passing O_LARGEFILE. I am running with this patch now, and instead of failing it is working on creating the file, but taking a long time. I will let it run, but need to step away now. diff --git a/timezone/tst-tzset.c b/timezone/tst-tzset.c index 3dad42e041..65633c4a25 100644 --- a/timezone/tst-tzset.c +++ b/timezone/tst-tzset.c @@ -44,7 +44,7 @@ create_tz_file (off64_t size) // Reopen for large-file support. close (fd); - fd = open64 (path, O_WRONLY); + fd = open64 (path, O_WRONLY|O_LARGEFILE); if (fd < 0) { printf ("open64 (%s) failed: %m\n", path); Debugging The patch below and notes are how I got to the conclusion. - tmsfs does support sparse files, but I am not able to write files larger than 4GiB. But also as per below 2GiB seems to be a boundary. - We get an write error 'File too large' - Looking at ther kernel code I see two paths that generate this error but it doesn't look like I should be hitting them. * write size exceeds RLIMIT - though I have it set to unlimited * write size exceeds fs_maxbytes - on tmpfs sb->s_maxbytes = MAX_LFS_FILESIZE on 32-bit MAX_LFS_FILESIZE ((loff_t)ULONG_MAX << PAGE_SHIFT) - support_descriptor_supports_holes will not fail unless we run it on files re-opened with open64. - This is where I noticed that open64 was missing O_LARGEFILE. Output with write_offset = 2LL * 1024 * 1024 * 1024 - 2; File size : 16 limit 160 1x: File size : 32/2147483646 limit 160 2x: File size : 32/4294967292 limit 160 File size : 16 limit 160 1x: File size : 32/2147483646 limit 160 2x: File size : 32/4294967292 limit 160 Single-byte write failed creating timezone file of size: 4095MiB failed. Output with write_offset = 2LL * 1024 * 1024 * 1024 - 1; File size : 16 limit 160 error: xwrite.c:32: write of 1 bytes failed after 0: File too large error: 1 test failures Strace of running the patch, we see no O_LARGEFILE after re-open. [pid 11318] openat(AT_FDCWD, "/tmp/tst-tzset-v0uEVn", O_RDWR|O_CREAT|O_EXCL|O_LARGEFILE, 0600) = 3 [pid 11318] getpid() = 11318 [pid 11318] close(3) = 0 [pid 11318] openat(AT_FDCWD, "/tmp/tst-tzset-v0uEVn", O_WRONLY) = 3 [pid 11318] statx(3, "", AT_STATX_SYNC_AS_STAT|AT_NO_AUTOMOUNT|AT_EMPTY_PATH, STATX_BASIC_STATS, {stx_mask=STATX_BASIC_STATS|STATX_MNT_ID, stx_attributes=0, stx_mode=S_IFREG|0600, stx_size=0, ...}) = 0 [pid 11318] _llseek(3, 0, [0], SEEK_SET) = 0 [pid 11318] write(3, "@", 1) = 1 [pid 11318] fsync(3) = 0 [pid 11318] statx(3, "", AT_STATX_SYNC_AS_STAT|AT_NO_AUTOMOUNT|AT_EMPTY_PATH, STATX_BASIC_STATS, {stx_mask=STATX_BASIC_STATS|STATX_MNT_ID, stx_attributes=0, stx_mode=S_IFREG|0600, stx_size=1, ...}) = 0 [pid 11318] write(1, "File size : 16 limit 160\n", 25File size : 16 limit 160 ) = 25 [pid 11318] _llseek(3, 2147483647, [2147483647], SEEK_SET) = 0 [pid 11318] write(3, "@", 1) = -1 EFBIG (File too large) diff --git a/support/support_descriptor_supports_holes.c b/support/support_descriptor_supports_holes.c index 83bdcc71dc..46fdb6174a 100644 --- a/support/support_descriptor_supports_holes.c +++ b/support/support_descriptor_supports_holes.c @@ -31,15 +31,17 @@ support_descriptor_supports_holes (int fd) and hopefully large enough to trigger the creation of holes. We cannot use the file system block size as a reference here because it is incorrect for network file systems. */ - write_offset = 16 * 1024 * 1024, + // write_offset = 125 * 1024 * 1024, /* Our write may add this number of additional blocks (see block_limit below): writing at offset 16M can require two data block indirections, each of which can be as large as 8KB on ext2, thus 32 512B sectors. */ - block_headroom = 32, + block_headroom = 128, }; + unsigned long long int write_offset = 2LL * 1024 * 1024 * 1024 - 1; + struct stat64 st; xfstat (fd, &st); if (!S_ISREG (st.st_mode)) @@ -66,6 +68,7 @@ support_descriptor_supports_holes (int fd) the write offset. */ unsigned long long int block_limit = 2 * st.st_blocks + block_headroom; +printf ("File size : %lld limit %lld\n", (long long int) st.st_blocks, block_limit); /* Write a single byte at 16 megabytes. */ xlseek (fd, write_offset, SEEK_SET); xwrite (fd, &b, 1); @@ -74,6 +77,8 @@ support_descriptor_supports_holes (int fd) xfstat (fd, &st); bool supports_holes = st.st_blocks <= block_limit; +printf ("1x: File size : %lld/%lld limit %lld\n", (long long int) st.st_blocks, write_offset, block_limit); + /* Also check that extending the file does not fill up holes. */ xftruncate (fd, 2 * write_offset); /* Attempt to bypass delayed allocation. */ @@ -81,6 +86,8 @@ support_descriptor_supports_holes (int fd) xfstat (fd, &st); supports_holes = supports_holes && st.st_blocks <= block_limit; +printf ("2x: File size : %lld/%lld limit %lld\n", (long long int) st.st_blocks, 2 * write_offset, block_limit); + /* Return to a zero-length file. */ xftruncate (fd, 0); xlseek (fd, 0, SEEK_SET); diff --git a/timezone/tst-tzset.c b/timezone/tst-tzset.c index 3dad42e041..0fa06f7206 100644 --- a/timezone/tst-tzset.c +++ b/timezone/tst-tzset.c @@ -39,8 +39,6 @@ create_tz_file (off64_t size) int fd = create_temp_file ("tst-tzset-", &path); if (fd < 0) exit (1); - if (!support_descriptor_supports_holes (fd)) - FAIL_UNSUPPORTED ("File %s does not support holes", path); // Reopen for large-file support. close (fd); @@ -51,6 +49,9 @@ create_tz_file (off64_t size) exit (1); } + if (!support_descriptor_supports_holes (fd)) + FAIL_UNSUPPORTED ("File %s does not support holes", path); + static const char data[] = { 0x54, 0x5a, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
On Dez 24 2021, Stafford Horne via Libc-alpha wrote: > It seems the write to the tmp file was failing due the re-open not passing > O_LARGEFILE. open64 implies O_LARGEFILE, so if that is making a difference, then your open64 is broken.
On Thu, Dec 23, 2021 at 04:57:56PM +0100, Andreas Schwab wrote: > On Dez 24 2021, Stafford Horne via Libc-alpha wrote: > > > It seems the write to the tmp file was failing due the re-open not passing > > O_LARGEFILE. > > open64 implies O_LARGEFILE, so if that is making a difference, then your > open64 is broken. Right, that is what the docs say. This architecuture is 32-bits. And the open64 path is generic. Possibly this bit removing O_LARGEFILE is wrong? In sysdeps/unix/sysv/linux/open64.c: 27 #ifdef __OFF_T_MATCHES_OFF64_T 28 # define EXTRA_OPEN_FLAGS 0 29 #else 30 # define EXTRA_OPEN_FLAGS O_LARGEFILE 31 #endif Otherwise there is something is wrong on linux. It is explicitly checking for the precense of O_LARGEFILE. in fs/read_write.c in generic_write_check_limits: if (!(file->f_flags & O_LARGEFILE)) max_size = MAX_NON_LFS; > -- > Andreas Schwab, schwab@linux-m68k.org > GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 > "And now for something completely different."
On Fri, Dec 24, 2021, 6:26 AM Stafford Horne <shorne@gmail.com> wrote: > On Thu, Dec 23, 2021 at 04:57:56PM +0100, Andreas Schwab wrote: > > On Dez 24 2021, Stafford Horne via Libc-alpha wrote: > > > > > It seems the write to the tmp file was failing due the re-open not > passing > > > O_LARGEFILE. > > > > open64 implies O_LARGEFILE, so if that is making a difference, then your > > open64 is broken. > > Right, that is what the docs say. This architecuture is 32-bits. > > And the open64 path is generic. > > Possibly this bit removing O_LARGEFILE is wrong? > > In sysdeps/unix/sysv/linux/open64.c: > > 27 #ifdef __OFF_T_MATCHES_OFF64_T > 28 # define EXTRA_OPEN_FLAGS 0 > 29 #else > 30 # define EXTRA_OPEN_FLAGS O_LARGEFILE > 31 #endif > > Otherwise there is something is wrong on linux. It is explicitly checking > for the precense of O_LARGEFILE. > > in fs/read_write.c in generic_write_check_limits: > > if (!(file->f_flags & O_LARGEFILE)) > max_size = MAX_NON_LFS; > There's something wrong with __OFF_T_MATCHES_OFF64_T in this port. We have 32-bit off_t in Linux. So __OFF_T_MATCHES_OFF64_T should be undefined I think. I'll look into. -Stafford >
On Sat, Dec 25, 2021 at 04:24:35PM +0900, Stafford Horne wrote: > On Fri, Dec 24, 2021, 6:26 AM Stafford Horne <shorne@gmail.com> wrote: > > > On Thu, Dec 23, 2021 at 04:57:56PM +0100, Andreas Schwab wrote: > > > On Dez 24 2021, Stafford Horne via Libc-alpha wrote: > > > > > > > It seems the write to the tmp file was failing due the re-open not > > passing > > > > O_LARGEFILE. > > > > > > open64 implies O_LARGEFILE, so if that is making a difference, then your > > > open64 is broken. > > > > Right, that is what the docs say. This architecuture is 32-bits. > > > > And the open64 path is generic. > > > > Possibly this bit removing O_LARGEFILE is wrong? > > > > In sysdeps/unix/sysv/linux/open64.c: > > > > 27 #ifdef __OFF_T_MATCHES_OFF64_T > > 28 # define EXTRA_OPEN_FLAGS 0 > > 29 #else > > 30 # define EXTRA_OPEN_FLAGS O_LARGEFILE > > 31 #endif > > > > Otherwise there is something is wrong on linux. It is explicitly checking > > for the precense of O_LARGEFILE. > > > > in fs/read_write.c in generic_write_check_limits: > > > > if (!(file->f_flags & O_LARGEFILE)) > > max_size = MAX_NON_LFS; > > > > There's something wrong with __OFF_T_MATCHES_OFF64_T in this port. We have > 32-bit off_t in Linux. So __OFF_T_MATCHES_OFF64_T should be undefined I > think. I'll look into. So, __OFF_T_MATCHES_OFF64_T if defined if TIMESIZE==64 && WORDSIZE==32, and it's correct from glibc's perspective as off_t is 64-bits in the user API. However, it is not correct for use for setting O_LARGEFILE. In linux the O_LARGEFILE flag is forced based on architecture configuration ARCH_32BIT_OFF_T. #define force_o_largefile() (!IS_ENABLED(CONFIG_ARCH_32BIT_OFF_T)) Then it is used in syscalls: SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, flags, umode_t, mode) { if (force_o_largefile()) flags |= O_LARGEFILE; return do_sys_open(dfd, filename, flags, mode); } On most 32-bit architectures ARCH_32BIT_OFF_T is configured. SO I think there is something wrong with how we are setting up EXTRA_OPEN_FLAGS based on __OFF_T_MATCHES_OFF64_T only. Maybe it should be changed to WORDSIZE==32 or a combination. I will send a separate patch to discuss. -Stafford