Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-20 18:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Patch rtems-rc-20000711-1-cvs.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
that decouples exec/ for the sh, m68k and i960 from targopts.h.

NOTE: The change to system.h is a hack to enable cpuopts.h
for some targets, but keep using targopts.h for others - I know it
does *not* work for sparc, mips, i386 and ppc.  This will have
to be addressed as work continues on multilibing.
This commit is contained in:
Joel Sherrill
2000-07-11 14:56:04 +00:00
parent ebb0bb9242
commit 270e3cce96
17 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
c/src/exec/score/cpu/i960/asm.h
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/i960.h>
/*
c/src/exec/score/cpu/m68k/asm.h
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/cpu.h>
/*
c/src/exec/score/cpu/no_cpu/asm.h
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/no_cpu.h>
/*
c/src/exec/score/cpu/sh/asm.h
+1 -1
View File
@@ -49,7 +49,7 @@
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/sh.h>
/*
c/src/exec/score/include/rtems/system.h
+9 -2
View File
@@ -28,10 +28,17 @@ extern "C" {
*/
/*
* FIXME: Instead of targopts.h, cpuopts.h should be included here.
* #include <rtems/score/cpuopts.h>
* FIXME: cpuopts.h should be included here.
*/
#if defined(__sh__) \
|| defined(__mc68000__) \
|| defined(__i960__)
/* these cpus are ready to apply cpuopts.h */
#include <rtems/score/cpuopts.h>
#else
/* fallback to targopts.h */
#include <rtems/score/targopts.h>
#endif
/*
* The following insures that all data is declared in the space
c/src/lib/libbsp/m68k/dmv152/console/Makefile.am
+2
View File
@@ -14,6 +14,8 @@ OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../automake/lib.am
AM_CPPFLAGS += $(BSP_CPPFLAGS)
#
# (OPTIONAL) Add local stuff here using +=
#
c/src/lib/libbsp/m68k/mvme167/console/Makefile.am
+1
View File
@@ -14,6 +14,7 @@ OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../automake/lib.am
AM_CPPFLAGS += $(BSP_CPPFLAGS)
#
# (OPTIONAL) Add local stuff here using +=
#
cpukit/score/cpu/i960/asm.h
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/i960.h>
/*
cpukit/score/cpu/m68k/asm.h
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/cpu.h>
/*
cpukit/score/cpu/m68k/rtems/asm.h
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/cpu.h>
/*
cpukit/score/cpu/no_cpu/asm.h
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/no_cpu.h>
/*
cpukit/score/cpu/no_cpu/rtems/asm.h
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/no_cpu.h>
/*
cpukit/score/cpu/sh/asm.h
+1 -1
View File
@@ -49,7 +49,7 @@
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/sh.h>
/*
cpukit/score/cpu/sh/rtems/asm.h
+1 -1
View File
@@ -49,7 +49,7 @@
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/sh.h>
/*
cpukit/score/include/rtems/system.h
+9 -2
View File
@@ -28,10 +28,17 @@ extern "C" {
*/
/*
* FIXME: Instead of targopts.h, cpuopts.h should be included here.
* #include <rtems/score/cpuopts.h>
* FIXME: cpuopts.h should be included here.
*/
#if defined(__sh__) \
|| defined(__mc68000__) \
|| defined(__i960__)
/* these cpus are ready to apply cpuopts.h */
#include <rtems/score/cpuopts.h>
#else
/* fallback to targopts.h */
#include <rtems/score/targopts.h>
#endif
/*
* The following insures that all data is declared in the space
make/custom/dmv152.cfg
+6 -2
View File
@@ -19,6 +19,10 @@ RTEMS_BSP_FAMILY=dmv152
CPU_CFLAGS =
# BSP specific preprocessor flags.
# These should only be used in BSP dependent directories.
BSP_CPPFLAGS = -DUSE_CHANNEL_A
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
@@ -43,8 +47,8 @@ define make-target-options
@echo "/* #define NDEBUG 1 */ " >>$@
@echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@
@echo "/* #define RTEMS_DEBUG 1 */" >>$@
@echo "#define USE_CHANNEL_A 1" >>$@
@echo "#define USE_CHANNEL_B 0" >>$@
# @echo "#define USE_CHANNEL_A 1" >>$@
# @echo "#define USE_CHANNEL_B 0" >>$@
endef
# Here is the rule to actually build a $(ARCH)/foo.exe
make/custom/mvme167.cfg
+7 -2
View File
@@ -22,6 +22,11 @@ RTEMS_BSP_FAMILY=mvme167
#
CPU_CFLAGS = -m68040 -DRTEMS_BSP=$(RTEMS_BSP)
# BSP specific preprocessor flags.
# These should only be used in BSP dependent directories.
BSP_CPPFLAGS += -DCD2401_INT_LEVEL=1 -DCD2401_POLLED_IO=1
CFLAGS_DEBUG_V += -ggdb
# optimize flag: typically -O, could use -O4 or -fast
@@ -49,8 +54,8 @@ define make-target-options
@echo "/* #define NDEBUG 1 */ " >>$@
@echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@
@echo "/* #define RTEMS_DEBUG 1 */" >>$@
@echo "#define CD2401_INT_LEVEL 1" >>$@
@echo "#define CD2401_POLLED_IO 1" >>$@
# @echo "#define CD2401_INT_LEVEL 1" >>$@
# @echo "#define CD2401_POLLED_IO 1" >>$@
endef