mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-29 07:50:18 +00:00
Patch rtems-rc-19991105-1.diff.gz from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> which does the following: This is the configuration cleanup patch: Main changes: * TARGET_ARCH removed * target.cfg.in moved to c/make/target.cfg.in (Only configured once for all BSPs of a target) * BARE_XXX variables appended to bsp.cfg.in * autogen renamed to bootstrap * removed stray variables from make/custom/*.cfg To apply: cd <source-tree> rm c/src/make/target.cfg.in cp autogen bootstrap mkdir c/make cp make/target.cfg.in c/make/target.cfg.in rm make/target.cfg.in rm autogen patch -p1 < rtems-rc-19991105-1.diff
This commit is contained in:
@@ -10,7 +10,6 @@ RTEMS_UNIX_FLAVOR=freebsd
|
||||
|
||||
# This is the actual bsp directory used during the build process.
|
||||
RTEMS_BSP_FAMILY=posix
|
||||
TARGET_ARCH=o-freebsd2
|
||||
|
||||
include $(RTEMS_ROOT)/make/custom/default.cfg
|
||||
|
||||
@@ -24,12 +23,6 @@ LIBC_DEFINES += -DWORKSPACE_MB=2
|
||||
LIBC_DEFINES += -DHEAPSPACE_MB=1
|
||||
|
||||
|
||||
# Define this to yes if C++ is included in the development environment
|
||||
# This requires that at least the GNU C++ compiler and libg++ be installed.
|
||||
ifeq ($(HAS_CPLUSPLUS),yes)
|
||||
CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
|
||||
endif
|
||||
|
||||
# optimize flag: typically -0, could use -O4 or -fast
|
||||
# -O4 is ok for RTEMS
|
||||
CFLAGS_OPTIMIZE_V = -O2
|
||||
|
||||
@@ -12,7 +12,6 @@ RTEMS_UNIX_FLAVOR=hpux
|
||||
|
||||
# This is the actual bsp directory used during the build process.
|
||||
RTEMS_BSP_FAMILY=posix
|
||||
TARGET_ARCH=o-hpux9
|
||||
|
||||
include $(RTEMS_ROOT)/make/custom/default.cfg
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ RTEMS_UNIX_FLAVOR=linux
|
||||
|
||||
# This is the actual bsp directory used during the build process.
|
||||
RTEMS_BSP_FAMILY=posix
|
||||
TARGET_ARCH=o-linux1
|
||||
|
||||
include $(RTEMS_ROOT)/make/custom/default.cfg
|
||||
|
||||
@@ -26,12 +25,6 @@ LIBC_DEFINES += -DHEAPSPACE_MB=1
|
||||
|
||||
DEFINES += -D_BSD_SOURCE
|
||||
|
||||
# Define this to yes if C++ is included in the development environment
|
||||
# This requires that at least the GNU C++ compiler and libg++ be installed.
|
||||
ifeq ($(HAS_CPLUSPLUS),yes)
|
||||
CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
|
||||
endif
|
||||
|
||||
# optimize flag: typically -0, could use -O4 or -fast
|
||||
# -O4 is ok for RTEMS
|
||||
CFLAGS_OPTIMIZE_V = -O2
|
||||
|
||||
@@ -11,7 +11,6 @@ RTEMS_UNIX_FLAVOR=solaris
|
||||
|
||||
# This is the actual bsp directory used during the build process.
|
||||
RTEMS_BSP_FAMILY=posix
|
||||
TARGET_ARCH=o-solaris2
|
||||
|
||||
include $(RTEMS_ROOT)/make/custom/default.cfg
|
||||
|
||||
@@ -23,12 +22,6 @@ LIBC_DEFINES +=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED -DRTEMS_DEBUG
|
||||
|
||||
DEFINES += -D__EXTENSIONS__ -Dsolaris2
|
||||
|
||||
# Define this to yes if C++ is included in the development environment
|
||||
# This requires that at least the GNU C++ compiler and libg++ be installed.
|
||||
ifeq ($(HAS_CPLUSPLUS),yes)
|
||||
CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
|
||||
endif
|
||||
|
||||
# optimize flag: typically -0, could use -O4 or -fast
|
||||
# -O4 is ok for RTEMS
|
||||
CFLAGS_OPTIMIZE_V = -O2
|
||||
|
||||
@@ -11,8 +11,6 @@ RTEMS_BSP=bare
|
||||
|
||||
RTEMS_CPU_MODEL=$(BARE_CPU_MODEL)
|
||||
|
||||
TARGET_ARCH=o-$(RTEMS_BSP_FAMILY)-$(BARE_CPU_MODEL)
|
||||
|
||||
CPU_CFLAGS=$(BARE_CPU_CFLAGS)
|
||||
|
||||
include $(RTEMS_ROOT)/make/custom/default.cfg
|
||||
|
||||
@@ -11,11 +11,6 @@
|
||||
include $(RTEMS_ROOT)/make/target.cfg
|
||||
include $(RTEMS_ROOT)/make/host.cfg
|
||||
|
||||
# Specify here the host and target "architectures"
|
||||
ifndef TARGET_ARCH
|
||||
TARGET_ARCH=o-$(RTEMS_BSP)
|
||||
endif
|
||||
|
||||
include $(RTEMS_ROOT)/make/main.cfg
|
||||
include $(RTEMS_ROOT)/$(RTEMS_BSP)/make/bsp.cfg
|
||||
|
||||
@@ -30,7 +25,7 @@ INLINE_UPCASE=INLINE
|
||||
endif
|
||||
|
||||
## Target compiler config file, if any
|
||||
CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
|
||||
CONFIG.CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
|
||||
|
||||
## GCC specs extension file location
|
||||
RTEMS_BSP_SPECS = $(PROJECT_ROOT)/$(RTEMS_BSP)/lib/bsp_specs
|
||||
|
||||
@@ -7,10 +7,8 @@
|
||||
RTEMS_CPU=m68k
|
||||
|
||||
ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes)
|
||||
TARGET_ARCH=o-gen68360_040
|
||||
RTEMS_CPU_MODEL=m68040
|
||||
else
|
||||
TARGET_ARCH=o-gen68360
|
||||
RTEMS_CPU_MODEL=mcpu32
|
||||
endif
|
||||
|
||||
|
||||
@@ -10,14 +10,12 @@ RTEMS_CPU=m68k
|
||||
|
||||
ifeq ($(RTEMS_MVME162_MODEL),mvme162lx)
|
||||
|
||||
TARGET_ARCH=o-mvme162lx
|
||||
RTEMS_CPU_MODEL=m68lc040
|
||||
|
||||
else
|
||||
ifeq ($(RTEMS_MVME162_MODEL),)
|
||||
|
||||
RTEMS_MVME162_MODEL=mvme162
|
||||
TARGET_ARCH=o-mvme162
|
||||
RTEMS_CPU_MODEL=m68040
|
||||
|
||||
endif # mvme162 - mc68040
|
||||
|
||||
@@ -31,14 +31,7 @@ CPU_DEFINES = \
|
||||
CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
|
||||
|
||||
# debugging please
|
||||
CFLAGS_DEBUG_V+=-g
|
||||
|
||||
# Define this to yes if C++ is included in the development environment.
|
||||
# This requires that at least the GNU C++ compiler and libg++ be installed.
|
||||
ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
|
||||
HAS_CPLUSPLUS=yes
|
||||
CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
|
||||
endif
|
||||
CFLAGS_DEBUG_V =
|
||||
|
||||
START_BASE=start302
|
||||
|
||||
|
||||
Reference in New Issue
Block a user