diff options
Diffstat (limited to 'make')
35 files changed, 43 insertions, 260 deletions
diff --git a/make/Templates/Makefile.am b/make/Templates/Makefile.am index 947edad3a1..fe35e32c92 100644 --- a/make/Templates/Makefile.am +++ b/make/Templates/Makefile.am @@ -6,9 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 EXTRA_DIST = \ Makefile.dir \ -Makefile.inc.in \ Makefile.leaf \ Makefile.lib -# ------------------------------------------------------- include $(top_srcdir)/automake/local.am diff --git a/make/Templates/Makefile.in b/make/Templates/Makefile.in index 2bafd8f7f2..b179f335f8 100644 --- a/make/Templates/Makefile.in +++ b/make/Templates/Makefile.in @@ -87,7 +87,7 @@ target_subdirs = @target_subdirs@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = Makefile.dir Makefile.inc.in Makefile.leaf Makefile.lib +EXTRA_DIST = Makefile.dir Makefile.leaf Makefile.lib mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = @@ -208,8 +208,6 @@ depend-am: depend: depend-am .PHONY: depend depend-am -# ------------------------------------------------------- - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/make/Templates/Makefile.inc.in b/make/Templates/Makefile.inc.in deleted file mode 100644 index a763dae999..0000000000 --- a/make/Templates/Makefile.inc.in +++ /dev/null @@ -1,48 +0,0 @@ -# -# -# Target specific settings. To be included in application Makefiles. -# - -prefix = @prefix@ - -CC_FOR_TARGET = @program_prefix@gcc -AS_FOR_TARGET = @program_prefix@as -AR_FOR_TARGET = @program_prefix@ar -NM_FOR_TARGET = @program_prefix@nm -LD_FOR_TARGET = @program_prefix@ld -SIZE_FOR_TARGET = @program_prefix@size -OBJCOPY_FOR_TARGET = @program_prefix@objcopy - -CC= $(CC_FOR_TARGET) -AS= $(AS_FOR_TARGET) -LD= $(LD_FOR_TARGET) -NM= $(NM_FOR_TARGET) -AR= $(AR_FOR_TARGET) -SIZE= $(SIZE_FOR_TARGET) -OBJCOPY= $(OBJCOPY_FOR_TARGET) - -export CC -export AS -export LD -export NM -export AR -export SIZE -export OBJCOPY - -RTEMS_HOST = @RTEMS_HOST@ -RTEMS_CUSTOM = $(prefix)/make/custom/$(RTEMS_BSP).cfg -PROJECT_ROOT = $(prefix)/ -RTEMS_USE_OWN_PDIR = no -RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ -RTEMS_USE_MACROS = @RTEMS_USE_MACROS@ -RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ -RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@ -RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@ - -export RTEMS_BSP -export RTEMS_CUSTOM -export PROJECT_ROOT - -# FIXME: The following shouldn't be here -RTEMS_ROOT = $(PROJECT_ROOT) -export RTEMS_ROOT diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg index 49f1326f78..835b22c558 100644 --- a/make/compilers/gcc-target-default.cfg +++ b/make/compilers/gcc-target-default.cfg @@ -87,10 +87,7 @@ endif # 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) -else -HAS_CPLUSPLUS=no endif # debug flag; @@ -287,15 +284,13 @@ endif LINK_OBJS =\ $(CONSTRUCTOR) \ $(OBJS) \ - $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \ - $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA) + $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) LINK_FILES =\ $(START_FILE) \ $(CONSTRUCTOR) \ $(OBJS) \ $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \ - $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA) \ $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA) ifeq ($(RTEMS_USE_GCC272),yes) diff --git a/make/custom/FreeBSD-posix.cfg b/make/custom/FreeBSD-posix.cfg index bae94800df..c0f79df4f5 100644 --- a/make/custom/FreeBSD-posix.cfg +++ b/make/custom/FreeBSD-posix.cfg @@ -26,18 +26,10 @@ 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 ($(RTEMS_HAS_CPLUSPLUS),yes) -HAS_CPLUSPLUS=yes +ifeq ($(HAS_CPLUSPLUS),yes) CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) endif -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - -# This target does NOT support the POSIX API. -HAS_POSIX_API=no - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 diff --git a/make/custom/HPUX9-posix.cfg b/make/custom/HPUX9-posix.cfg index 16340c4b40..3af91c55d2 100644 --- a/make/custom/HPUX9-posix.cfg +++ b/make/custom/HPUX9-posix.cfg @@ -33,13 +33,6 @@ LIBC_DEFINES=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED -DRTEMS_DEBUG LIBC_DEFINES += -DWORKSPACE_MB=2 LIBC_DEFINES += -DHEAPSPACE_MB=1 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - -# This target does NOT support the POSIX API. -HAS_POSIX_API=no - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg index 6768b36590..ad78430c6e 100644 --- a/make/custom/Linux-posix.cfg +++ b/make/custom/Linux-posix.cfg @@ -27,18 +27,10 @@ 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 ($(RTEMS_HAS_CPLUSPLUS),yes) -HAS_CPLUSPLUS=yes +ifeq ($(HAS_CPLUSPLUS),yes) CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) endif -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - -# This target does NOT support the POSIX API. -HAS_POSIX_API=no - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg index 23043ebd1b..0547a9fd3f 100644 --- a/make/custom/Solaris-posix.cfg +++ b/make/custom/Solaris-posix.cfg @@ -25,18 +25,10 @@ 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 ($(RTEMS_HAS_CPLUSPLUS),yes) -HAS_CPLUSPLUS=yes +ifeq ($(HAS_CPLUSPLUS),yes) CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) endif -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - -# This target does NOT support the POSIX API. -HAS_POSIX_API=no - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 diff --git a/make/custom/cvme961.cfg b/make/custom/cvme961.cfg index 64615e70de..aee9b9ab36 100644 --- a/make/custom/cvme961.cfg +++ b/make/custom/cvme961.cfg @@ -25,10 +25,6 @@ CPU_CFLAGS=-mca # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/default.cfg b/make/custom/default.cfg index 918032b765..c6628f8068 100644 --- a/make/custom/default.cfg +++ b/make/custom/default.cfg @@ -40,34 +40,6 @@ CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg ## GCC specs extension file location RTEMS_BSP_SPECS = $(PROJECT_ROOT)/$(RTEMS_BSP)/lib/bsp_specs -## LIBC support -## Specify the one you want here and fill in the blanks. -## Currently CYGNUS newlib is supported. -## NOTE: RTEMS libcsupport.a includes RTEMS versions of stuff like -## malloc, gettimeofday, etc. - -# 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 -else -HAS_CPLUSPLUS=no -endif - -# Define this to yes if this target wants the TCP/IP stack -ifeq ($(RTEMS_HAS_NETWORKING),yes) -HAS_NETWORKING=yes -else -HAS_NETWORKING=no -endif - -# Define this to yes if this target wants the posix api -ifeq ($(RTEMS_HAS_POSIX_API),yes) -HAS_POSIX_API=yes -else -HAS_POSIX_API=no -endif - # Base name of start file START_BASE=start diff --git a/make/custom/dmv152.cfg b/make/custom/dmv152.cfg index d20884314f..84c63061ec 100644 --- a/make/custom/dmv152.cfg +++ b/make/custom/dmv152.cfg @@ -23,10 +23,6 @@ CPU_CFLAGS = # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) # if defined asserts do not generate code. This is commonly used diff --git a/make/custom/efi332.cfg b/make/custom/efi332.cfg index 67a7c0c602..289b9bdde3 100644 --- a/make/custom/efi332.cfg +++ b/make/custom/efi332.cfg @@ -19,10 +19,6 @@ CPU_CFLAGS = -mcpu32 # optimize flag: typically -0, could use -O4 or -fast, -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # Override default start file START_BASE=start332 diff --git a/make/custom/efi68k.cfg b/make/custom/efi68k.cfg index e2f3b6280f..c6ae12be30 100644 --- a/make/custom/efi68k.cfg +++ b/make/custom/efi68k.cfg @@ -21,10 +21,6 @@ CPU_CFLAGS = -m68000 -msoft-float # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # Override default start file START_BASE=start68k diff --git a/make/custom/force386.cfg b/make/custom/force386.cfg index fc5190c4c4..33d790a117 100644 --- a/make/custom/force386.cfg +++ b/make/custom/force386.cfg @@ -22,10 +22,6 @@ CPU_CFLAGS = # -fomit-frame-pointer breaks debugging and C++ exceptions CFLAGS_OPTIMIZE_V=-O4 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/gen68302.cfg b/make/custom/gen68302.cfg index 484eef596b..265c5b22a4 100644 --- a/make/custom/gen68302.cfg +++ b/make/custom/gen68302.cfg @@ -22,10 +22,6 @@ CPU_CFLAGS=-m68302 -msoft-float # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg index 792d7d1e26..9961f08c8e 100644 --- a/make/custom/gensh1.cfg +++ b/make/custom/gensh1.cfg @@ -24,10 +24,6 @@ RTEMS_BSP_FAMILY=gensh1 # CPU_CFLAGS=-m1 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # debug flags: typically none, but we use -O1 as it produces better code CFLAGS_DEBUG_V = -O1 diff --git a/make/custom/go32.cfg b/make/custom/go32.cfg index 30a5d6e4e3..16e1caa5ff 100644 --- a/make/custom/go32.cfg +++ b/make/custom/go32.cfg @@ -54,10 +54,6 @@ endif # i486dx # -fomit-frame-pointer breaks debugging and C++ exceptions CFLAGS_OPTIMIZE_V=-O4 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # Base name of start file # go32 does not use the rtems start file START_BASE= diff --git a/make/custom/helas403.cfg b/make/custom/helas403.cfg index f5a908b9d1..e78f93a954 100644 --- a/make/custom/helas403.cfg +++ b/make/custom/helas403.cfg @@ -22,10 +22,6 @@ RTEMS_BSP_FAMILY=helas403 #CPU_DEFINES=-DPPC_ABI=PPC_ABI_POWEROPEN \ # -DPPC_ASM=PPC_ASM_ELF -DPPC_VECTOR_FILE_BASE=0x0100 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/idp.cfg b/make/custom/idp.cfg index 1250d61aab..af34965f40 100644 --- a/make/custom/idp.cfg +++ b/make/custom/idp.cfg @@ -12,10 +12,6 @@ RTEMS_CPU_MODEL=m68ec040 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=idp -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/mvme136.cfg b/make/custom/mvme136.cfg index 3a5bd6f8e2..e41efc479e 100644 --- a/make/custom/mvme136.cfg +++ b/make/custom/mvme136.cfg @@ -22,10 +22,6 @@ CPU_CFLAGS = # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/mvme147.cfg b/make/custom/mvme147.cfg index e1d23df1a0..bb6b567e0d 100644 --- a/make/custom/mvme147.cfg +++ b/make/custom/mvme147.cfg @@ -19,10 +19,6 @@ CPU_CFLAGS= # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/mvme162.cfg b/make/custom/mvme162.cfg index e59dcef250..e770662b2e 100644 --- a/make/custom/mvme162.cfg +++ b/make/custom/mvme162.cfg @@ -42,10 +42,6 @@ endif # mc68lc040 # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/mvme167.cfg b/make/custom/mvme167.cfg index 45eef32a8a..bef2e23f34 100644 --- a/make/custom/mvme167.cfg +++ b/make/custom/mvme167.cfg @@ -23,10 +23,6 @@ CPU_CFLAGS = -m68040 # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer -# This target does NOT support the TCP/IP stack (yet) so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) # if defined asserts do not generate code. This is commonly used diff --git a/make/custom/no_bsp.cfg b/make/custom/no_bsp.cfg index fb89f3131d..3c196d8861 100644 --- a/make/custom/no_bsp.cfg +++ b/make/custom/no_bsp.cfg @@ -20,8 +20,4 @@ RTEMS_BSP_FAMILY=no_bsp # HAS_CPLUSPLUS=no -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # Miscellaneous additions go here diff --git a/make/custom/ods68302.cfg b/make/custom/ods68302.cfg index 7f7ae47230..325fc9170e 100644 --- a/make/custom/ods68302.cfg +++ b/make/custom/ods68302.cfg @@ -33,10 +33,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # debugging please CFLAGS_DEBUG_V+=-g -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # 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) diff --git a/make/custom/p4000.cfg b/make/custom/p4000.cfg index 8776cf0418..2869217207 100644 --- a/make/custom/p4000.cfg +++ b/make/custom/p4000.cfg @@ -14,10 +14,6 @@ CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=p4000 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/p4600.cfg b/make/custom/p4600.cfg index b7965a9297..52c2b11e90 100644 --- a/make/custom/p4600.cfg +++ b/make/custom/p4600.cfg @@ -21,10 +21,6 @@ START_BASE=idt_csu CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/p4650.cfg b/make/custom/p4650.cfg index 5b91995d4c..5c586a08ab 100644 --- a/make/custom/p4650.cfg +++ b/make/custom/p4650.cfg @@ -20,10 +20,6 @@ START_BASE=idt_csu CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This section makes the target dependent options file. # NDEBUG (C library) diff --git a/make/custom/papyrus.cfg b/make/custom/papyrus.cfg index a04f4f3d30..b65536675c 100644 --- a/make/custom/papyrus.cfg +++ b/make/custom/papyrus.cfg @@ -16,10 +16,6 @@ RTEMS_BSP_FAMILY=papyrus #CPU_DEFINES=-DPPC_ABI=PPC_ABI_POWEROPEN \ # -DPPC_ASM=PPC_ASM_ELF -DPPC_VECTOR_FILE_BASE=0x0100 -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=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 e65ead7118..8d499f56df 100644 --- a/make/custom/portsw.cfg +++ b/make/custom/portsw.cfg @@ -4,9 +4,9 @@ # $Id$ # -# Specify here the host and target "architectures" -HOST_ARCH=o-$(RTEMS_HOST) -TARGET_ARCH=o-$(RTEMS_BSP) +# Note: This file is broken for sure + +include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=a29k RTEMS_CPU_MODEL=a29205 @@ -14,42 +14,43 @@ RTEMS_CPU_MODEL=a29205 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=portsw -# use the inline functions instead of the macros -# ref: src/exec/generic/Makefile -# Need INLINE_UPCASE set to uppercase value of INLINE variable -# ref: make/compilers/gcc-force386.cfg -INLINE=macros -INLINE_UPCASE= - -# The makefiles all use PROJECT_xxx for variables. -# Ie: $(PROJECT_RELEASE) is the install point. -# Externally, we think of these as "RTEMS" variables. -# Here is where we convert from RTEMS forms to PROJECT forms -# See also make/main.cfg, which derives some more. -PROJECT_ROOT=$(RTEMS_ROOT)/c - -# HOST Compiler config file -# You may also want to specify where the compiler resides here. -CC_$(HOST_ARCH)_DIR=$(RTEMS_GNUTOOLS_HOST) -CONFIG.$(HOST_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc.cfg - -## Target compiler config file, if any -CC_$(TARGET_ARCH)_DIR=$(RTEMS_GNUTOOLS) -CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-$(RTEMS_BSP).cfg - -# 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. +# This section makes the target dependent options file. + +# NDEBUG (C library) +# if defined asserts do not generate code. This is commonly used +# as a command line option. # -# Need "main" in BSP so can't link C++ sample test or you will get -# duplicate symbol errors for main +# RTEMS_TEST_NO_PAUSE (RTEMS tests) +# do not pause between screens of output in the rtems tests +# +# RTEMS_DEBUG (RTEMS) +# If defined, debug checks in RTEMS and support library code are enabled. # -HAS_CPLUSPLUS=no - -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no -# Define this to yes if this target wants the posix api -HAS_POSIX_API=no +define make-target-options + @echo "/* #define NDEBUG 1 */ " >>$@ + @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ + @echo "/* #define RTEMS_DEBUG 1 */" >>$@ +endef + + +ifeq ($(RTEMS_USE_GCC272),yes) +define make-exe + $(LD) $(LDFLAGS) -N -e _start \ + -T$(PROJECT_RELEASE)/lib/linkcmds\ + -o $(basename $@).exe \ + $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group + $(NM) -n $(basename $@).exe > $(basename $@).num + $(SIZE) $(basename $@).exe +endef +else +define make-exe + $(CC) $(CPPFLAGS) -Wl,-Map,$(basename $@).map \ + $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).exe \ + $(LINK_OBJS) $(LINK_LIBS) + $(NM) -n $(basename $@).exe > $(basename $@).num + $(SIZE) $(basename $@).exe +endef +endif # Miscellaneous additions go here diff --git a/make/custom/psim.cfg b/make/custom/psim.cfg index 42b5a456ad..c53a227bc9 100644 --- a/make/custom/psim.cfg +++ b/make/custom/psim.cfg @@ -79,10 +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 -# This target does not support the TCP/IP stack so ignore requests -# to enable it. -# HAS_NETWORKING=no - # The following is a linkcmds file which will work without using the # -specs system in gcc 2.8. # $(LD) $(XLDFLAGS) -T $(LINKCMDS) \ diff --git a/make/custom/score603e.cfg b/make/custom/score603e.cfg index 24e94b5688..a069cf0220 100644 --- a/make/custom/score603e.cfg +++ b/make/custom/score603e.cfg @@ -120,10 +120,6 @@ CPU_CFLAGS = -mcpu=603 CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions # CFLAGS_OPTIMIZE_V=-O0 -# This target does not support the ka9q tcp/ip stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # The following is a linkcmds file which will work without using the # -specs system in gcc 2.8. # $(LD) $(XLDFLAGS) -T $(LINKCMDS) \ diff --git a/make/custom/simhppa.cfg b/make/custom/simhppa.cfg index 60a93d5954..93e25b0f9c 100644 --- a/make/custom/simhppa.cfg +++ b/make/custom/simhppa.cfg @@ -35,10 +35,6 @@ CFLAGS_DEFAULT = $(CPU_CFLAGS) -Wall -ansi -fasm -mgas # NOTE: some level of -O may be actually required by inline assembler CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions -# This target does NOT support the TCP/IP stack so ignore requests -# to enable it. -HAS_NETWORKING=no - # This makes the target dependent options file. # NDEBUG (C library) diff --git a/make/host.cfg.in b/make/host.cfg.in index 18ddc85d8b..c048042977 100644 --- a/make/host.cfg.in +++ b/make/host.cfg.in @@ -48,11 +48,6 @@ GCCSED = @GCCSED@ KSH=@KSH@ # -# RCS support -# -RCS_CLEAN=$(PROJECT_BIN)/rcs-clean - -# # Rule to install a shell script with the proper shell to run it. # diff --git a/make/leaf.cfg b/make/leaf.cfg index 0106dc19ce..b02af689fd 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -6,10 +6,6 @@ # Make(1) configuration file include'd by all leaf-node Makefiles # -# get most stuff done - -# include $(RTEMS_ROOT)/make/main.cfg - # # list of all known managers # This list is used, along with $(MANAGERS) (set by app makefile) @@ -112,7 +108,6 @@ LIBSUFFIX_VA = $(LIB_VARIANT).a clean-am: clean-generic -$(RM) -r $(CLEAN_OS) $(CLEAN_CC) $(CLEAN_DEPEND) -$(RM) -r $(VARIANTS) -# -$(RM) -r $(IMPORT_SOURCE) distclean-am: distclean-generic clean-am -$(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND) |