From 206a0b3850f1353d5d270c3651ac6cee3848587a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 19 Jun 2001 14:27:43 +0000 Subject: 2001-06-19 Ralf Corsepius custom/Cygwin-posix.cfg: Remove -U__STRICT_ANSI__, make-target-options. custom/FreeBSD-posix.cfg: Remove make-target-options. custom/HPUX9-posix.cfg: Dito. custom/Linux-posix.cfg: Dito. custom/Solaris-posix.cfg: Dito. custom/arm_bare_bsp.cfg: Dito. custom/armulator.cfg: Dito. custom/erc32.cfg: Remove CONSOLE_USE_POLLED, CONSOLE_USE_INTERRUPTS. custom/i386ex.cfg: Remove make-target-options. custom/i960sim.cfg: Remove make-target-options. custom/mvme2307.cfg: Remove CONSOLE_USE_POLLED, CONSOLE_USE_INTERRUPTS. custom/rxgen960.cfg: Remove make-target-options, cleanup comments. custom/score603e.cfg: Remove CONSOLE_USE_POLLED, CONSOLE_USE_INTERRUPTS. custom/vegaplus.cfg: Remove make-target-options. --- make/ChangeLog | 17 +++++++++++++++++ make/custom/Cygwin-posix.cfg | 7 +------ make/custom/FreeBSD-posix.cfg | 2 -- make/custom/HPUX9-posix.cfg | 5 ----- make/custom/Linux-posix.cfg | 5 ----- make/custom/Solaris-posix.cfg | 5 ----- make/custom/arm_bare_bsp.cfg | 4 ---- make/custom/armulator.cfg | 5 ----- make/custom/erc32.cfg | 3 --- make/custom/i386ex.cfg | 5 ----- make/custom/i960sim.cfg | 5 ----- make/custom/mvme2307.cfg | 6 ------ make/custom/rxgen960.cfg | 10 ---------- make/custom/score603e.cfg | 7 ------- make/custom/vegaplus.cfg | 4 ---- 15 files changed, 18 insertions(+), 72 deletions(-) (limited to 'make') diff --git a/make/ChangeLog b/make/ChangeLog index 307333f518..db465e7a99 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,4 +1,21 @@ +2001-06-19 Ralf Corsepius + custom/Cygwin-posix.cfg: Remove -U__STRICT_ANSI__, make-target-options. + custom/FreeBSD-posix.cfg: Remove make-target-options. + custom/HPUX9-posix.cfg: Dito. + custom/Linux-posix.cfg: Dito. + custom/Solaris-posix.cfg: Dito. + custom/arm_bare_bsp.cfg: Dito. + custom/armulator.cfg: Dito. + custom/erc32.cfg: Remove CONSOLE_USE_POLLED, CONSOLE_USE_INTERRUPTS. + custom/i386ex.cfg: Remove make-target-options. + custom/i960sim.cfg: Remove make-target-options. + custom/mvme2307.cfg: Remove CONSOLE_USE_POLLED, CONSOLE_USE_INTERRUPTS. + custom/rxgen960.cfg: Remove make-target-options, cleanup comments. + custom/score603e.cfg: Remove CONSOLE_USE_POLLED, CONSOLE_USE_INTERRUPTS. + custom/vegaplus.cfg: Remove make-target-options. + * custom/vegaplus.cfg: Remove make-target-options. + 2001-05-25 Joel Sherrill * custom/mrm332.cfg: Switched $(SED) to sed. diff --git a/make/custom/Cygwin-posix.cfg b/make/custom/Cygwin-posix.cfg index 23591f8769..c4d777bcb2 100644 --- a/make/custom/Cygwin-posix.cfg +++ b/make/custom/Cygwin-posix.cfg @@ -15,7 +15,7 @@ RTEMS_BSP_FAMILY=posix include $(RTEMS_ROOT)/make/custom/default.cfg # RTEMS_LIBC_DIR must already be set (by configuration) DOES NOT MATTER -LIBC_DEFINES =-D_POSIX_C_SOURCE -U__STRICT_ANSI__ +LIBC_DEFINES =-D_POSIX_C_SOURCE LIBC_DEFINES+=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED # The following define the memory reserved in the executable for the @@ -29,11 +29,6 @@ DEFINES += -D_BSD_SOURCE # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 -# This section makes the target dependent options file. - -define make-target-options -endef - define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS) $(NM) -ng $@ > $(basename $@).num diff --git a/make/custom/FreeBSD-posix.cfg b/make/custom/FreeBSD-posix.cfg index 016902e984..d6bae07fc8 100644 --- a/make/custom/FreeBSD-posix.cfg +++ b/make/custom/FreeBSD-posix.cfg @@ -24,8 +24,6 @@ LIBC_DEFINES += -DHEAPSPACE_MB=1 # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 -# This section makes the target dependent options file. - define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS) $(NM) -ng $@ > $(basename $@).num diff --git a/make/custom/HPUX9-posix.cfg b/make/custom/HPUX9-posix.cfg index c32232c01f..f2437ae095 100644 --- a/make/custom/HPUX9-posix.cfg +++ b/make/custom/HPUX9-posix.cfg @@ -33,11 +33,6 @@ LIBC_DEFINES += -DHEAPSPACE_MB=1 # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 -# This section makes the target dependent options file. - -define make-target-options -endef - define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS) $(NM) -ng $@ > $(basename $@).num diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg index c417ea0d7a..f91be177a4 100644 --- a/make/custom/Linux-posix.cfg +++ b/make/custom/Linux-posix.cfg @@ -29,11 +29,6 @@ DEFINES += -D_BSD_SOURCE # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 -# This section makes the target dependent options file. - -define make-target-options -endef - define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS) $(NM) -ng $@ > $(basename $@).num diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg index 836bf95fbd..82b1cff655 100644 --- a/make/custom/Solaris-posix.cfg +++ b/make/custom/Solaris-posix.cfg @@ -26,11 +26,6 @@ DEFINES += -D__EXTENSIONS__ -Dsolaris2 # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 -# This section makes the target dependent options file. - -define make-target-options -endef - define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS) $(NM) -ng $@ > $(basename $@).num diff --git a/make/custom/arm_bare_bsp.cfg b/make/custom/arm_bare_bsp.cfg index ba9073a1ef..e9c6bdb316 100644 --- a/make/custom/arm_bare_bsp.cfg +++ b/make/custom/arm_bare_bsp.cfg @@ -12,10 +12,6 @@ RTEMS_CPU_MODEL=arm7tdmi # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=arm_bare_bsp -# This section makes the target dependent options file. -define make-target-options -endef - # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. # diff --git a/make/custom/armulator.cfg b/make/custom/armulator.cfg index b4bdd067b7..e5b6210f62 100644 --- a/make/custom/armulator.cfg +++ b/make/custom/armulator.cfg @@ -14,11 +14,6 @@ RTEMS_BSP_FAMILY=armulator # This section makes the target dependent options file. -# if defined asserts do not generate code. This is commonly used - -define make-target-options -endef - # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. # diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg index 598b82fb2a..32d6d82dff 100644 --- a/make/custom/erc32.cfg +++ b/make/custom/erc32.cfg @@ -38,7 +38,6 @@ CFLAGS_OPTIMIZE_V=-O4 # NO_TABLE_MOVE (SPARC PORT) # do not have a second trap table -- use the BSP's # -# CONSOLE_USE_POLLED (erc32_bsp) # CONSOLE_USE_INTERRUPTS (erc32_bsp) # The erc32 console driver can operate in either polled or interrupt mode. # Under the simulator (especially when FAST_UART is defined), polled seems @@ -62,8 +61,6 @@ CFLAGS_OPTIMIZE_V=-O4 define make-target-options @echo "#define NO_TABLE_MOVE 1" >>$@ - @echo "#define CONSOLE_USE_INTERRUPTS 0" >>$@ - @echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@ @echo "/* #define SIMSPARC_FAST_IDLE 1 */" >>$@ @echo "/* #define FPU_REVB 1 */" >>$@ @echo "#define CPU_U32_FIX 1" >>$@ diff --git a/make/custom/i386ex.cfg b/make/custom/i386ex.cfg index 7e7d006a7e..385ce1498e 100644 --- a/make/custom/i386ex.cfg +++ b/make/custom/i386ex.cfg @@ -22,11 +22,6 @@ CPU_CFLAGS = -msoft-float # -fomit-frame-pointer breaks debugging and C++ exceptions CFLAGS_OPTIMIZE_V=-O4 -# This section makes the target dependent options file. - -define make-target-options -endef - # Something like this should produce a map file but this does not work. # -Xlinker "-Map $(basename $@).map" $(LINK_OBJS) diff --git a/make/custom/i960sim.cfg b/make/custom/i960sim.cfg index 25e67cda47..dc5baf107c 100644 --- a/make/custom/i960sim.cfg +++ b/make/custom/i960sim.cfg @@ -22,11 +22,6 @@ CPU_CFLAGS=-mka -g # CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures CFLAGS_OPTIMIZE_V=-O0 -g -# This section makes the target dependent options file. - -define make-target-options -endef - # The following are definitions of make-exe which will work using ld as # is currently required. It is expected that as of gcc 2.8, the end user # will be able to override parts of the compilers specs and link using gcc. diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg index 838731615a..62716fd521 100644 --- a/make/custom/mvme2307.cfg +++ b/make/custom/mvme2307.cfg @@ -15,12 +15,6 @@ RTEMS_BSP_FAMILY=motorola_powerpc # This section makes the target dependent options file. -# CONSOLE_USE_POLLED (mvme2307_bsp) -# CONSOLE_USE_INTERRUPTS (mvme2307_bsp) -# The mvme2307 console driver has the structure to operate in either -# polled or interrupt mode. However both modes only trap to the -# monitor currently. -# # PPC_VECTOR_FILE_BASE (PowerPC) # This defines the base address of the exception table. # NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100 diff --git a/make/custom/rxgen960.cfg b/make/custom/rxgen960.cfg index 55284396dc..d7d16f1a71 100644 --- a/make/custom/rxgen960.cfg +++ b/make/custom/rxgen960.cfg @@ -26,20 +26,10 @@ CPU_CFLAGS = -mrp # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures -# This section makes the target dependent options file. - -define make-target-options -endef - # The following are definitions of make-exe which will work using ld as # is currently required. It is expected that as of gcc 2.8, the end user # will be able to override parts of the compilers specs and link using gcc. -# ifeq ($(RTEMS_USE_GCC272),yes) -# ar x $(PROJECT_ROOT)/$(RTEMS_BSP_FAMILY)/lib/libbsp.a - -# LD_LIBS += $(PROJECT_RELEASE)/lib/libbsp.a - ifeq ($(RTEMS_USE_GCC272),yes) define make-exe @echo "rxgen960 does not support this gcc 2.7.2" diff --git a/make/custom/score603e.cfg b/make/custom/score603e.cfg index a7db5b1c8d..6f201ea304 100644 --- a/make/custom/score603e.cfg +++ b/make/custom/score603e.cfg @@ -33,12 +33,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg # This section makes the target dependent options file. -# CONSOLE_USE_POLLED (score603e_bsp) -# CONSOLE_USE_INTERRUPTS (score603e_bsp) -# The score603e console driver has the structure to operate in either -# polled or interrupt mode. However both modes only trap to the -# monitor currently. -# # SCORE603E_USE_SDS (score603e_bsp) # SCORE603E_USE_OPEN_FIRMWARE (score603e_bsp) # SCORE603E_USE_NONE (score603e_bsp) @@ -63,7 +57,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg # define make-target-options - @echo "#define CONSOLE_USE_INTERRUPTS 0" >>$@ @echo "#define INITIALIZE_COM_PORTS 1" >>$@ @echo "#define SCORE603E_GENERATION $(SCORE603E_GENERATION)" >>$@ @echo "#define SCORE603E_USE_SDS 0" >>$@ diff --git a/make/custom/vegaplus.cfg b/make/custom/vegaplus.cfg index e90fdd3b2b..bb505a859c 100644 --- a/make/custom/vegaplus.cfg +++ b/make/custom/vegaplus.cfg @@ -12,10 +12,6 @@ RTEMS_CPU_MODEL=arm7tdmi # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=vegaplus -# This section makes the target dependent options file. -define make-target-options -endef - # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. # -- cgit v1.2.3