Changeset 6ba9c27 in rtems


Ignore:
Timestamp:
Jun 27, 2002, 9:21:45 PM (17 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
7990ddd
Parents:
d33dd2f
Message:

2002-06-27 Joel Sherrill <joel@…>

  • Makefile.am, cpu.c, cpu_asm.S, rtems.S: Modified to make this all compile again. It has been a while since we have had a semi-working hppa1.1-rtems cross compiler. :)
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/cpu/hppa1.1/ChangeLog

    rd33dd2f r6ba9c27  
     12002-06-27      Joel Sherrill <joel@OARcorp.com>
     2
     3        * Makefile.am, cpu.c, cpu_asm.S, rtems.S: Modified to make
     4        this all compile again.  It has been a while since we have
     5        had a semi-working hppa1.1-rtems cross compiler. :)
     6
    172002-06-27      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28
  • c/src/exec/score/cpu/hppa1.1/Makefile.am

    rd33dd2f r6ba9c27  
    2121        $(mkinstalldirs) $@
    2222
    23 include_HEADERS= asm.h
     23include_HEADERS=
    2424PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
    2525
     
    3333PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
    3434    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
     35
     36$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
     37        $(INSTALL_DATA) $< $@
    3538
    3639C_FILES = cpu.c
     
    4952TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o
    5053
    51 all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) \
     54all-local: $(ARCH) rtems/score/offsets.h $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
    5255    $(TMPINSTALL_FILES)
    5356
     
    6063
    6164GENERIC_H_FILES = rtems/score/offsets.h
    62 rtems/score/offsets.h: $(GENOFFSETS) cpu.h
    63         @(mkinstalldirs) rtems/score
     65rtems/score/offsets.h: $(GENOFFSETS) rtems/score/cpu.h
     66        $(mkinstalldirs) rtems/score
    6467        $(RM) $@
    6568        $(GENOFFSETS) > $@
  • c/src/exec/score/cpu/hppa1.1/cpu.c

    rd33dd2f r6ba9c27  
    179179     * the simulator stops, it shows the label name specified
    180180     */
    181     HPPA_ASM_LABEL("_hppa_cpu_halt");
     181    /* HPPA_ASM_LABEL("_asm_hppa_cpu_halt");*/
    182182    HPPA_ASM_BREAK(0, 0);
    183183}
  • c/src/exec/score/cpu/hppa1.1/cpu_asm.S

    rd33dd2f r6ba9c27  
    2424#include <rtems/score/offsets.h>
    2525
     26#if 0
     27#define TEXT_SEGMENT \
     28        .SPACE  $TEXT$          !\
     29        .SUBSPA $CODE$
     30#define RO_SEGMENT \
     31        .SPACE  $TEXT$          !\
     32        .SUBSPA $lit$
     33#define DATA_SEGMENT \
     34        .SPACE  $PRIVATE$          !\
     35        .SUBSPA $data$
     36#define BSS_SEGMENT \
     37        .SPACE  $PRIVATE$          !\
     38        .SUBSPA $bss$
     39#else
     40#define TEXT_SEGMENT .text
     41#define RO_SEGMENT .rodata
     42#define DATA_SEGMENT .data
     43#define BSS_SEGMENT .bss
     44#endif
     45 
     46 
     47
     48#if 0
    2649        .SPACE $PRIVATE$
    2750        .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
     
    3255        .SPACE $TEXT$
    3356        .SUBSPA $CODE$
     57
     58#endif
     59        TEXT_SEGMENT
    3460
    3561/*
     
    312338        ldil      L%_ISR_Vector_table,%r8
    313339        ldo       R%_ISR_Vector_table(%r8),%r8
    314         ldw       (%r8),%r8
     340        ldw       0(%r8),%r8
    315341        ldwx,s    %r9(%r8),%r8
    316342
  • c/src/exec/score/cpu/hppa1.1/rtems.S

    rd33dd2f r6ba9c27  
    1717#include <rtems/score/cpu_asm.h>
    1818
     19#if 0
     20#define TEXT_SEGMENT \
     21        .SPACE  $TEXT$          !\
     22        .SUBSPA $CODE$
     23#define RO_SEGMENT \
     24        .SPACE  $TEXT$          !\
     25        .SUBSPA $lit$
     26#define DATA_SEGMENT \
     27        .SPACE  $PRIVATE$          !\
     28        .SUBSPA $data$
     29#define BSS_SEGMENT \
     30        .SPACE  $PRIVATE$          !\
     31        .SUBSPA $bss$
     32#else
     33#define TEXT_SEGMENT .text
     34#define RO_SEGMENT .rodata
     35#define DATA_SEGMENT .data
     36#define BSS_SEGMENT .bss
     37#endif
     38
     39
     40#if 0
    1941        .SPACE $PRIVATE$
    2042        .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
     
    2547        .SPACE $TEXT$
    2648        .SUBSPA $CODE$
     49#endif
    2750
     51        TEXT_SEGMENT
    2852        .align 32
    2953        .EXPORT cpu_jump_to_directive,ENTRY,PRIV_LEV=0
     
    3256        .CALLINFO FRAME=0,NO_CALLS
    3357        .ENTRY
     58
    3459
    3560# invoke user interrupt handler
  • cpukit/score/cpu/hppa1.1/ChangeLog

    rd33dd2f r6ba9c27  
     12002-06-27      Joel Sherrill <joel@OARcorp.com>
     2
     3        * Makefile.am, cpu.c, cpu_asm.S, rtems.S: Modified to make
     4        this all compile again.  It has been a while since we have
     5        had a semi-working hppa1.1-rtems cross compiler. :)
     6
    172002-06-27      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28
  • cpukit/score/cpu/hppa1.1/Makefile.am

    rd33dd2f r6ba9c27  
    2121        $(mkinstalldirs) $@
    2222
    23 include_HEADERS= asm.h
     23include_HEADERS=
    2424PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
    2525
     
    3333PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
    3434    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
     35
     36$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
     37        $(INSTALL_DATA) $< $@
    3538
    3639C_FILES = cpu.c
     
    4952TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o
    5053
    51 all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) \
     54all-local: $(ARCH) rtems/score/offsets.h $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
    5255    $(TMPINSTALL_FILES)
    5356
     
    6063
    6164GENERIC_H_FILES = rtems/score/offsets.h
    62 rtems/score/offsets.h: $(GENOFFSETS) cpu.h
    63         @(mkinstalldirs) rtems/score
     65rtems/score/offsets.h: $(GENOFFSETS) rtems/score/cpu.h
     66        $(mkinstalldirs) rtems/score
    6467        $(RM) $@
    6568        $(GENOFFSETS) > $@
  • cpukit/score/cpu/hppa1.1/cpu.c

    rd33dd2f r6ba9c27  
    179179     * the simulator stops, it shows the label name specified
    180180     */
    181     HPPA_ASM_LABEL("_hppa_cpu_halt");
     181    /* HPPA_ASM_LABEL("_asm_hppa_cpu_halt");*/
    182182    HPPA_ASM_BREAK(0, 0);
    183183}
  • cpukit/score/cpu/hppa1.1/cpu_asm.S

    rd33dd2f r6ba9c27  
    2424#include <rtems/score/offsets.h>
    2525
     26#if 0
     27#define TEXT_SEGMENT \
     28        .SPACE  $TEXT$          !\
     29        .SUBSPA $CODE$
     30#define RO_SEGMENT \
     31        .SPACE  $TEXT$          !\
     32        .SUBSPA $lit$
     33#define DATA_SEGMENT \
     34        .SPACE  $PRIVATE$          !\
     35        .SUBSPA $data$
     36#define BSS_SEGMENT \
     37        .SPACE  $PRIVATE$          !\
     38        .SUBSPA $bss$
     39#else
     40#define TEXT_SEGMENT .text
     41#define RO_SEGMENT .rodata
     42#define DATA_SEGMENT .data
     43#define BSS_SEGMENT .bss
     44#endif
     45 
     46 
     47
     48#if 0
    2649        .SPACE $PRIVATE$
    2750        .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
     
    3255        .SPACE $TEXT$
    3356        .SUBSPA $CODE$
     57
     58#endif
     59        TEXT_SEGMENT
    3460
    3561/*
     
    312338        ldil      L%_ISR_Vector_table,%r8
    313339        ldo       R%_ISR_Vector_table(%r8),%r8
    314         ldw       (%r8),%r8
     340        ldw       0(%r8),%r8
    315341        ldwx,s    %r9(%r8),%r8
    316342
Note: See TracChangeset for help on using the changeset viewer.