From 1896a650fc382d343844b56f4b79efe31562755e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 30 Jul 1999 17:52:50 +0000 Subject: Patch from Ralf Corsepius : The main topic is replacing the hard-coded values for HAS_MP and HAS_RDBG in custom/*.cfg with per-bsp configuration-time autoconf checks (This is the patch I had mentioned before earlier this week). CHANGES * HAS_MP removed from custom/*.cfg, replaced with configuration time autoconf check * HAS_RDBG removed from custom/*.cfg, replaced with configuration-time autoconf check * NEW: c/src/make/bsp.cfg.in, takes configuration-time checked per-bsp values (i.e. HAS_MP, HAS_RDBG), gets installed as $(prefix)//make/bsp.cfg * NEW: default.cfg includes bsp.cfg - this change is backward compatible. * IMPORT_SRC: apply VPATH instead for ts_386ex/i386ex subdirectory Makefile.ins * HACK: a bug in acpolish mis-handles addtions to makefile variables which are enclosed in gmake conditionals: c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in * Apply inline_dir, HAS_MP and HAS_RDBG for avoiding configuration of unneeded subdirectories in various configure.in files. * Several minor changes in Makefile.ins and configure.ins, wrt. to the order of including *.cfg and defining Makefile variables APPLYING THE PATCH: patch -p1 < rtems-rc-19990709-4.diff ./autogen --- make/custom/default.cfg | 15 +-------------- make/custom/force386.cfg | 3 --- make/custom/i386ex.cfg | 3 --- make/custom/pc386.cfg | 3 --- make/custom/portsw.cfg | 3 --- make/custom/ppcn_60x.cfg | 3 --- make/custom/psim.cfg | 3 --- make/custom/ts_386ex.cfg | 3 --- 8 files changed, 1 insertion(+), 35 deletions(-) (limited to 'make/custom') diff --git a/make/custom/default.cfg b/make/custom/default.cfg index 7aa56c646f..918032b765 100644 --- a/make/custom/default.cfg +++ b/make/custom/default.cfg @@ -18,6 +18,7 @@ TARGET_ARCH=o-$(RTEMS_BSP) endif include $(RTEMS_ROOT)/make/main.cfg +include $(RTEMS_ROOT)/$(RTEMS_BSP)/make/bsp.cfg # use the inline functions instead of the macros # ref: src/exec/generic/Makefile @@ -53,13 +54,6 @@ else HAS_CPLUSPLUS=no endif -# Define this to yes if this target supports multiprocessor environments. -ifeq ($(RTEMS_HAS_MULTIPROCESSING),yes) -HAS_MP=yes -else -HAS_MP=no -endif - # Define this to yes if this target wants the TCP/IP stack ifeq ($(RTEMS_HAS_NETWORKING),yes) HAS_NETWORKING=yes @@ -67,13 +61,6 @@ else HAS_NETWORKING=no endif -# Define this to yes if this target wants the remote debugger -ifeq ($(RTEMS_HAS_RDBG),yes) -HAS_RDBG=yes -else -HAS_RDBG=no -endif - # Define this to yes if this target wants the posix api ifeq ($(RTEMS_HAS_POSIX_API),yes) HAS_POSIX_API=yes diff --git a/make/custom/force386.cfg b/make/custom/force386.cfg index cf01c4cf78..fc5190c4c4 100644 --- a/make/custom/force386.cfg +++ b/make/custom/force386.cfg @@ -26,9 +26,6 @@ CFLAGS_OPTIMIZE_V=-O4 # to enable it. HAS_NETWORKING=no -# This BSP does not support librdbg -HAS_RDBG=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/i386ex.cfg b/make/custom/i386ex.cfg index 0e9499ad9a..282c70912b 100644 --- a/make/custom/i386ex.cfg +++ b/make/custom/i386ex.cfg @@ -22,9 +22,6 @@ CPU_CFLAGS = # -fomit-frame-pointer breaks debugging and C++ exceptions CFLAGS_OPTIMIZE_V=-O4 -# This BSP does not support librdbg -HAS_RDBG=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg index 6fb2dcc338..503143c63d 100644 --- a/make/custom/pc386.cfg +++ b/make/custom/pc386.cfg @@ -22,9 +22,6 @@ CPU_CFLAGS = # -fomit-frame-pointer breaks debugging and C++ exceptions CFLAGS_OPTIMIZE_V=-O4 -# Define this to yes if this target supports multiprocessor environments. -HAS_MP=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/portsw.cfg b/make/custom/portsw.cfg index 1531eff65f..e65ead7118 100644 --- a/make/custom/portsw.cfg +++ b/make/custom/portsw.cfg @@ -45,9 +45,6 @@ CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-$(RTEMS_BSP).cfg # HAS_CPLUSPLUS=no -# Define this to yes if this target supports multiprocessor environments. -HAS_MP=no - # This target does NOT support the TCP/IP stack so ignore requests # to enable it. HAS_NETWORKING=no diff --git a/make/custom/ppcn_60x.cfg b/make/custom/ppcn_60x.cfg index e6613e5337..822da5f1be 100644 --- a/make/custom/ppcn_60x.cfg +++ b/make/custom/ppcn_60x.cfg @@ -74,9 +74,6 @@ endef # CPU_CFLAGS = -mcpu=603 -# Define this to yes if this target supports multiprocessor environments. -HAS_MP=no - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS # NOTE: some level of -O may be actually required by inline assembler diff --git a/make/custom/psim.cfg b/make/custom/psim.cfg index b7b6331bb1..42b5a456ad 100644 --- a/make/custom/psim.cfg +++ b/make/custom/psim.cfg @@ -79,9 +79,6 @@ CPU_CFLAGS = -mcpu=603 # NOTE: some level of -O may be actually required by inline assembler CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions -# Define this to yes if this target supports multiprocessor environments. -HAS_MP=no - # This target does not support the TCP/IP stack so ignore requests # to enable it. # HAS_NETWORKING=no diff --git a/make/custom/ts_386ex.cfg b/make/custom/ts_386ex.cfg index 3502933fca..e655b2c874 100644 --- a/make/custom/ts_386ex.cfg +++ b/make/custom/ts_386ex.cfg @@ -23,9 +23,6 @@ CPU_CFLAGS =-msoft-float -mno-fp-ret-in-387 # -fomit-frame-pointer breaks debugging and C++ exceptions CFLAGS_OPTIMIZE_V=-O4 -# This BSP does not support librdbg -HAS_RDBG=no - # This section makes the target dependent options file. # NDEBUG (C library) -- cgit v1.2.3