Changeset bb43b51e in rtems


Ignore:
Timestamp:
Apr 28, 2012, 3:06:44 AM (8 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.11, master
Children:
70f5ab38
Parents:
3756041 (diff), 0b61e27 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ssh://rgit/data/git/rtems

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/shared/include/stackalloc.h

    r3756041 rbb43b51e  
    5353
    5454/**
     55 * @brief Task stack allocator initialization for
     56 * @ref CONFIGURE_TASK_STACK_ALLOCATOR_INIT.
     57 */
     58void bsp_stack_allocate_init(size_t stack_space_size);
     59
     60/**
    5561 * @brief Task stack allocator for @ref CONFIGURE_TASK_STACK_ALLOCATOR.
    5662 *
     
    6470 */
    6571void bsp_stack_free(void *stack);
     72
     73/**
     74 * @brief Task stack allocator initialization configuration option.
     75 */
     76#define CONFIGURE_TASK_STACK_ALLOCATOR_INIT bsp_stack_allocate_init
    6677
    6778/**
  • c/src/lib/libbsp/shared/src/stackalloc.c

    r3756041 rbb43b51e  
    2828#include <bsp/linker-symbols.h>
    2929
    30 #define BSP_STACK_MAGIC 0xdeadbeef
     30static Heap_Control bsp_stack_heap;
    3131
    32 static Heap_Control bsp_stack_heap = {
    33   .page_size = BSP_STACK_MAGIC
    34 };
     32void bsp_stack_allocate_init(size_t stack_space_size)
     33{
     34  _Heap_Initialize(
     35    &bsp_stack_heap,
     36    bsp_section_stack_begin,
     37    (uintptr_t) bsp_section_stack_size,
     38    CPU_STACK_ALIGNMENT
     39  );
     40}
    3541
    3642void *bsp_stack_allocate(size_t size)
     
    3844  void *stack = NULL;
    3945
    40   if (bsp_stack_heap.page_size == BSP_STACK_MAGIC) {
    41     uintptr_t rv = _Heap_Initialize(
    42       &bsp_stack_heap,
    43       bsp_section_stack_begin,
    44       (uintptr_t) bsp_section_stack_size,
    45       CPU_STACK_ALIGNMENT
    46     );
    47     if (rv == 0) {
    48       return NULL;
    49     }
     46  if (bsp_stack_heap.area_begin != 0) {
     47    stack = _Heap_Allocate(&bsp_stack_heap, size);
    5048  }
    51 
    52   stack = _Heap_Allocate(&bsp_stack_heap, size);
    5349
    5450  if (stack == NULL) {
  • config.guess

    r3756041 rbb43b51e  
    55#   2011, 2012 Free Software Foundation, Inc.
    66
    7 timestamp='2012-01-01'
     7timestamp='2012-02-10'
    88
    99# This file is free software; you can redistribute it and/or modify it
     
    1818#
    1919# You should have received a copy of the GNU General Public License
    20 # along with this program; if not, write to the Free Software
    21 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    22 # 02110-1301, USA.
     20# along with this program; if not, see <http://www.gnu.org/licenses/>.
    2321#
    2422# As a special exception to the GNU General Public License, if you
     
    864862        echo ${UNAME_MACHINE}-pc-minix
    865863        exit ;;
     864    aarch64:Linux:*:*)
     865        echo ${UNAME_MACHINE}-unknown-linux-gnu
     866        exit ;;
     867    aarch64_be:Linux:*:*)
     868        UNAME_MACHINE=aarch64_be
     869        echo ${UNAME_MACHINE}-unknown-linux-gnu
     870        exit ;;
    866871    alpha:Linux:*:*)
    867872        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
     
    13211326        echo ${UNAME_MACHINE}-pc-aros
    13221327        exit ;;
     1328    x86_64:VMkernel:*:*)
     1329        echo ${UNAME_MACHINE}-unknown-esx
     1330        exit ;;
    13231331esac
    13241332
  • config.sub

    r3756041 rbb43b51e  
    55#   2011, 2012 Free Software Foundation, Inc.
    66
    7 timestamp='2012-01-01'
     7timestamp='2012-02-10'
    88
    99# This file is (in principle) common to ALL GNU software.
     
    2222#
    2323# You should have received a copy of the GNU General Public License
    24 # along with this program; if not, write to the Free Software
    25 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    26 # 02110-1301, USA.
     24# along with this program; if not, see <http://www.gnu.org/licenses/>.
    2725#
    2826# As a special exception to the GNU General Public License, if you
     
    133131    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    134132    ;;
     133  android-linux)
     134    os=-linux-android
     135    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     136    ;;
    135137  *)
    136138    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     
    248250        1750a | 580 \
    249251        | a29k \
     252        | aarch64 | aarch64_be \
    250253        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
    251254        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
     
    320323                basic_machine=tic6x-unknown
    321324                ;;
    322         m6811 | m68hc11 | m6812 | m68hc12 | picochip)
     325        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
    323326                basic_machine=$basic_machine-unknown
    324327                os=-none
     
    333336                basic_machine=arm-unknown
    334337                ;;
    335 
     338        xgate)
     339                basic_machine=$basic_machine-unknown
     340                os=-none
     341                ;;
    336342        xscaleeb)
    337343                basic_machine=armeb-unknown
     
    356362        580-* \
    357363        | a29k-* \
     364        | aarch64-* | aarch64_be-* \
    358365        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
    359366        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
Note: See TracChangeset for help on using the changeset viewer.