Changes in / [96daa1c:d3dd170f] in mainline


Ignore:
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/src/main/kinit.c

    r96daa1c rd3dd170f  
    8686
    8787#ifdef CONFIG_KCONSOLE
    88 static char alive[ALIVE_CHARS] __attribute__((nonstring)) = "-\\|/";
     88static char alive[ALIVE_CHARS] = "-\\|/";
    8989#endif
    9090

  • tools/toolchain.sh

    r96daa1c rd3dd170f  
    3131BINUTILS_GDB_GIT="https://github.com/HelenOS/binutils-gdb.git"
    3232
    33 BINUTILS_BRANCH="binutils-2_45-helenos"
    34 BINUTILS_VERSION="2.45"
     33BINUTILS_BRANCH="binutils-2_43-helenos"
     34BINUTILS_VERSION="2.43"
     35
     36GDB_BRANCH="gdb-13.2-helenos"
     37GDB_VERSION="13.2"
    3538
    3639GCC_GIT="https://github.com/HelenOS/gcc.git"
    37 GCC_BRANCH="15_2_0-helenos"
    38 GCC_VERSION="15.2"
     40GCC_BRANCH="14_2_0-helenos"
     41GCC_VERSION="14.2"
    3942
    4043BASEDIR="$PWD"
    … …  
    4851SYSTEM_INSTALL=false
    4952
     53BUILD_GDB=false
    5054BUILD_BINUTILS=true
    5155BUILD_GCC=true
    … …  
    6872        echo
    6973        echo "Syntax:"
     74        echo " $0 [--system-wide] [--with-gdb|--only-gdb] <platform>"
    7075        echo " $0 [--system-wide] --test-version [<platform>]"
    7176        echo
    … …  
    142147                test_app_version "Binutils" "ld" "GNU ld (.*) \([.0-9]*\)" "$BINUTILS_VERSION"
    143148                test_app_version "GCC" "gcc" "gcc version \([.0-9]*\)" "$GCC_VERSION"
     149                test_app_version "GDB" "gdb" "GNU gdb (.*)[[:space:]]\+\([.0-9]*\)" "$GDB_VERSION"
    144150        done
    145151}
    … …  
    258264                ( set -x ; sudo -k mkdir -p "${CROSS_PREFIX}" )
    259265        else
    260                 ( set -x ; mkdir -p "${CROSS_PREFIX}" )
     266                mkdir -p "${CROSS_PREFIX}"
    261267        fi
    262268
    … …  
    304310                ./contrib/download_prerequisites
    305311                cd ..
     312        fi
     313
     314        if $BUILD_GDB ; then
     315                git clone --depth 1 -b "$GDB_BRANCH" "$BINUTILS_GDB_GIT" "gdb-$GDB_VERSION"
     316                git -C "gdb-$GDB_VERSION" pull
    306317        fi
    307318
    … …  
    455466}
    456467
     468build_gdb() {
     469        # This sets the TARGET variable
     470        set_target_from_platform "$1"
     471
     472        WORKDIR="${BASEDIR}/${TARGET}"
     473        GDBDIR="${WORKDIR}/gdb-${GDB_VERSION}"
     474
     475        echo ">>> Removing previous content"
     476        cleanup_dir "${WORKDIR}"
     477        mkdir -p "${WORKDIR}"
     478
     479        echo ">>> Processing GDB (${TARGET})"
     480        mkdir -p "${GDBDIR}"
     481        cd "${GDBDIR}"
     482        check_error $? "Change directory failed."
     483
     484        change_title "GDB: configure (${TARGET})"
     485        CFLAGS="-fcommon" "${BASEDIR}/downloads/gdb-${GDB_VERSION}/configure" \
     486                "--target=${TARGET}" \
     487                "--prefix=${CROSS_PREFIX}" \
     488                "--program-prefix=${TARGET}-" \
     489                --enable-werror=no
     490        check_error $? "Error configuring GDB."
     491
     492        change_title "GDB: make (${TARGET})"
     493        make all-gdb -j$JOBS
     494        check_error $? "Error compiling GDB."
     495
     496        change_title "GDB: install (${TARGET})"
     497        make install-gdb $DESTDIR_SPEC
     498        check_error $? "Error installing GDB."
     499}
     500
    457501install_pkg() {
    458502        echo ">>> Moving to the destination directory."
    459503        if $SYSTEM_INSTALL ; then
    460504                ring_bell
    461                 ( set -x ; tar -C "${INSTALL_DIR}${CROSS_PREFIX}" -cpf - . | sudo -k tar -C "${CROSS_PREFIX}" -xpf - )
     505                ( set -x ; sudo -k cp -r -t "${CROSS_PREFIX}" "${INSTALL_DIR}${CROSS_PREFIX}/"* )
    462506        else
    463                 ( set -x ; tar -C "${INSTALL_DIR}${CROSS_PREFIX}" -cpf - . | tar -C "${CROSS_PREFIX}" -xpf - )
     507                ( set -x ; cp -r -t "${CROSS_PREFIX}" "${INSTALL_DIR}${CROSS_PREFIX}/"* )
    464508        fi
    465509}
    … …  
    486530                        exit
    487531                        ;;
     532                --with-gdb)
     533                        BUILD_GDB=true
     534                        shift
     535                        ;;
     536                --only-gdb)
     537                        BUILD_GDB=true
     538                        BUILD_BINUTILS=false
     539                        BUILD_GCC=false
     540                        shift
     541                        ;;
    488542                *)
    489543                        show_usage
    … …  
    560614
    561615                $RUNNER build_libgcc
     616        fi
     617
     618        if $BUILD_GDB ; then
     619                $RUNNER build_gdb
    562620        fi
    563621

  • uspace/drv/bus/usb/vhc/conndev.c

    r96daa1c rd3dd170f  
    4343#include "vhcd.h"
    4444
     45static fibril_local uintptr_t plugged_device_handle = 0;
    4546#define PLUGGED_DEVICE_NAME_MAXLEN 256
    46 
    47 static fibril_local uintptr_t plugged_device_handle = 0;
    48 
    49 /*
    50  * The explicit "initial-exec" TLS model attribute is a temporary workaround
    51  * for a bug in GCC (observed in 14.2 and 15.2) that manifests in combination
    52  * with the binutils 2.45 linker on MIPS.
    53  *
    54  * Without the attribute, the linker reports the following error:
    55  *
    56  *  can't find matching LO16 reloc against `plugged_device_name' for
    57  *  R_MIPS_TLS_TPREL_HI16 at 0x238 in section
    58  *  `.text.default_connection_handler'
    59  *
    60  * The immediate cause is a missing R_MIPS_TLS_TPREL_LO16 relocation that
    61  * matches the R_MIPS_TLS_TPREL_HI16 relocation. The root cause is probably
    62  * an aggressive optimization in the compiler that removes the relocation
    63  * despite being needed.
    64  */
    65 static fibril_local char plugged_device_name[PLUGGED_DEVICE_NAME_MAXLEN + 1]
    66     __attribute__((tls_model("initial-exec"))) = "<unknown>";
     47static fibril_local char plugged_device_name[PLUGGED_DEVICE_NAME_MAXLEN + 1] = "<unknown>";
    6748
    6849/** Receive device name.

  • uspace/drv/bus/usb/xhci/hc.c

    r96daa1c rd3dd170f  
    166166                                        speeds[psiv].major = major;
    167167                                        speeds[psiv].minor = minor;
    168                                         memcpy(speeds[psiv].name, name.str, 4);
     168                                        str_ncpy(speeds[psiv].name, 4, name.str, 4);
    169169                                        speeds[psiv].usb_speed = USB_SPEED_MAX;
    170170

  • uspace/drv/bus/usb/xhci/hw_struct/regs.h

    r96daa1c rd3dd170f  
    551551
    552552typedef union {
    553         char str[4] __attribute__((nonstring));
     553        char str [4];
    554554        uint32_t packed;
    555555} xhci_sp_name_t;

  • uspace/drv/bus/usb/xhci/rh.h

    r96daa1c rd3dd170f  
    5151 */
    5252typedef struct xhci_port_speed {
    53         char name[4] __attribute__((nonstring));
     53        char name [4];
    5454        uint8_t major, minor;
    5555        uint64_t rx_bps, tx_bps;

  • uspace/lib/cpp/include/__bits/adt/bitset.hpp

    r96daa1c rd3dd170f  
    4242    class bitset
    4343    {
    44         private:
    45             /**
    46              * While this might be a bit more wasteful
    47              * than using unsigned or unsigned long,
    48              * it will make parts of out code easier
    49              * to read.
    50              */
    51             using data_type = unsigned long long;
    52 
    5344        public:
    5445            class reference
    … …  
    374365
    375366        private:
     367            /**
     368             * While this might be a bit more wasteful
     369             * than using unsigned or unsigned long,
     370             * it will make parts of out code easier
     371             * to read.
     372             */
     373            using data_type = unsigned long long;
     374
    376375            static constexpr size_t bits_in_data_type_ = sizeof(data_type) * 8;
    377376            static constexpr size_t data_size_ = N / bits_in_data_type_ + 1;
Note: See TracChangeset for help on using the changeset viewer.