Changeset 54f440d in rtems

Timestamp:

07/26/99 22:11:02 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

c32555c

Parents:

220ad7d

Message:

Patch from Charles-Antoine Gauthier <charles.gauthier@…>.
to address m68k-rtemself for the MVME167.

Here is the rtems patch I promissed you a long time ago to enable ELF
with m68k. The target name I selected is m68k-rtemself. It preserves the
m68k-rtems COFF target, and is parterned after the other ELF/COFF dual
targets.

The mvme167.cfg file causes the -qelf flag to be used during compilation
if the name of the compiler contains rtemself. This flag is used in the
bsp_specs file to select the elflinkcmds file rather than the linkcmds
file. The former is for ELF, the latter for COFF.

Some patches are required to the mc68040 FPSP code. Some of the
assembler files contain instructions that were rejected by the
m68k-rtemself-as assembler. This is a minor bug in the m68k ELF
assembler, I think.

Location:

c/src/lib

Files:

• libbsp/m68k/mvme167/bsp_specs (modified) (1 diff)
• libbsp/m68k/mvme167/startup/Makefile.in (modified) (3 diffs)
• libbsp/shared/bootcard.c (modified) (1 diff)
• libcpu/m68k/m68040/fpsp/bindec.S (modified) (1 diff)
• libcpu/m68k/m68040/fpsp/decbin.S (modified) (3 diffs)
• libcpu/m68k/m68040/fpsp/do_func.S (modified) (1 diff)
• libcpu/m68k/m68040/fpsp/get_op.S (modified) (1 diff)
• libcpu/m68k/m68040/fpsp/util.S (modified) (2 diffs)
• libcpu/m68k/m68040/fpsp/x_store.S (modified) (1 diff)

c/src/lib/libbsp/m68k/mvme167/bsp_specs

@@ -8 +8 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
+*endfile:
+crtend.o%s crtn.o%s
+
 *lib:
 %{!qrtems: %(old_lib)} %{qrtems: --start-group \
 %{!qrtems_debug: -lrtemsall} %{qrtems_debug: -lrtemsall_g} \
 -lc -lgcc --end-group \
-%{!qnolinkcmds: -T linkcmds%s}}
+%{!qelf: %{!qnolinkcmds: -T linkcmds%s}} %{qelf: %{!qnolinkcmd: -T
+elflinkcmds%s}}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: \
 %{!qrtems_debug: start.o%s} \
-%{qrtems_debug: start_g.o%s}}
+%{qrtems_debug: start_g.o%s} crti.o%s crtbegin.o%s}
 
 *link:

c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in

@@ -24 +24 @@
 H_FILES =
 
-SRCS = $(srcdir)/linkcmds $(C_FILES) $(H_FILES)
+SRCS = $(srcdir)/linkcmds $(srcdir)/elflinkcmds $(C_FILES) $(H_FILES)
 OBJS = $(C_O_FILES)
 
@@ -42 +42 @@
 #
 
-DEFINES +=
+# USE_INIT_FINI tells main.c what C++ help we need.
+
+DEFINES += -DUSE_INIT_FINI
 CPPFLAGS +=
 CFLAGS +=
@@ -65 +67 @@
 all: ${ARCH} $(SRCS) $(PGM)
         $(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
+        $(INSTALL_CHANGE) $(srcdir)/elflinkcmds $(PROJECT_RELEASE)/lib
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

c/src/lib/libbsp/shared/bootcard.c

@@ -28 +28 @@
 
 /* Initialize C++ global Ctor/Dtor and initializes exception handling. */
-#ifdef USE_INIT_FINI 
+#if defined(USE_INIT_FINI)
 extern void _fini( void );
 extern void _init( void );

c/src/lib/libcpu/m68k/m68040/fpsp/bindec.S

@@ -487 +487 @@
         fabsx   %fp0            //use abs(X)
         tstw    %d5             //LAMBDA is in lower word of d5
-        bnes    sc_mul          //if neg (LAMBDA = 1), scale by mul
+        bne     sc_mul          //if neg (LAMBDA = 1), scale by mul
         fdivx   %fp1,%fp0               //calculate X / SCALE -> Y to fp0
         bras    A10_st          //branch to A10

c/src/lib/libcpu/m68k/m68040/fpsp/decbin.S

@@ -233 +233 @@
 m_sign:
         btst    #31,(%a0)       //test sign of the mantissa
-        beqs    ap_st_z         //if clear, go to append/strip zeros
+        beq     ap_st_z         //if clear, go to append/strip zeros
         fnegx   %fp0            //if set, negate fp0
         
@@ -291 +291 @@
         ble     pwrten          //if abs(expA) <28, skip ap/st zeros
         btst    #30,(%a0)       //check sign of exp
-        bnes    ap_st_n         //if neg, go to neg side
+        bne     ap_st_n         //if neg, go to neg side
         clrl    %d1             //zero count reg
         movel   (%a0),%d4               //load lword 1 to d4
@@ -339 +339 @@
         bnes    ap_p_el         //if not, get next bit
         fmulx   %fp1,%fp0               //mul mantissa by 10**(no_bits_shifted)
-        bras    pwrten          //go calc pwrten
+        bra     pwrten          //go calc pwrten
 //
 // This section handles a negative adjusted exponent.

c/src/lib/libcpu/m68k/m68040/fpsp/do_func.S

@@ -80 +80 @@
         andl    #0x7F,%d0
         cmpil   #0x38,%d0               //if the extension is >= $38, 
-        bges    serror          //it is illegal
+        bge     serror          //it is illegal
         bfextu  STAG(%a6){#0:#3},%d1
         lsll    #3,%d0          //make room for STAG

c/src/lib/libcpu/m68k/m68040/fpsp/get_op.S

@@ -174 +174 @@
         clrb    DY_MO_FLG(%a6)
         tstb    UFLG_TMP(%a6)   //test flag for unsupp/unimp state
-        beqs    uni_getop
+        beq     uni_getop
 
 uns_getop:

c/src/lib/libcpu/m68k/m68040/fpsp/util.S

@@ -141 +141 @@
 ovf_fsgl:
         clrl    %d0
-        bras    ovf_res
+        bra     ovf_res
 
 ovff_sgl:
         movel   #0x00000001,%d0         //set single
-        bras    ovf_res
+        bra     ovf_res
 ovff_dbl:
         movel   #0x00000002,%d0         //set double
-        bras    ovf_res
+        bra     ovf_res
 //
 // The precision is in the fpcr.
@@ -154 +154 @@
 ovf_fpcr:
         bfextu  FPCR_MODE(%a6){#0:#2},%d0 //set round precision
-        bras    ovf_res
+        bra     ovf_res
         
 //

c/src/lib/libcpu/m68k/m68040/fpsp/x_store.S

@@ -95 +95 @@
         beq     dest_ext        //then branch
         cmpil   #1,%d0          //if dest format is single
-        beqs    dest_sgl        //then branch
+        beq     dest_sgl        //then branch
 //
 //      fall through to dest_dbl