Changeset c9b07e92 in rtems


Ignore:
Timestamp:
03/24/99 22:49:17 (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
a432c4b7
Parents:
367cc5e
Message:

Automake II patch from Ralf Corsepius <corsepiu@…>:

With my most recent automake patch (automake II) we could even simplify more
files below make/, because the host-compiler related parts of those files
aren't used anymore :-.

Whatsoever, the patch below should fix this problem.

Note: This is a mere bug fix, it doesn't move any of the variables involved
to target.cfg nor does it try to eliminate any variable.

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • aclocal.m4

    r367cc5e rc9b07e92  
    1 dnl aclocal.m4 generated automatically by aclocal 1.4
    2 
    3 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
    4 dnl This file is free software; the Free Software Foundation
    5 dnl gives unlimited permission to copy and/or distribute it,
    6 dnl with or without modifications, as long as this notice is preserved.
    7 
    8 dnl This program is distributed in the hope that it will be useful,
    9 dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
    10 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
    11 dnl PARTICULAR PURPOSE.
     1dnl aclocal.m4 generated automatically by aclocal 1.2
    122
    133dnl $Id$

  • c/src/exec/Makefile.in

    r367cc5e rc9b07e92  
    2020
    2121POSIX_DIRS_yes_V=posix
    22 POSIX_DIRS = $(POSIX_DIRS_$(RTEMS_HAS_POSIX_API)_V)
     22POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V)
    2323
    2424SUB_DIRS=score rtems $(POSIX_DIRS) sapi wrapup

  • c/src/exec/score/include/rtems/score/Makefile.in

    r367cc5e rc9b07e92  
    8686        @echo "#define USE_INLINES 1"                          >>$@
    8787endif
    88 ifeq ($(RTEMS_HAS_MULTIPROCESSING),yes)
     88ifeq ($(HAS_MULTIPROCESSING),yes)
    8989        @echo "#define RTEMS_MULTIPROCESSING 1"                >>$@
    9090endif
    91 ifeq ($(RTEMS_HAS_POSIX_API),yes)
     91ifeq ($(HAS_POSIX_API),yes)
    9292        @echo "#define RTEMS_POSIX_API 1"                      >>$@
    9393endif

  • c/src/exec/wrapup/Makefile.in

    r367cc5e rc9b07e92  
    2020
    2121POSIX_DIRS_yes_V=posix
    22 POSIX_DIRS = $(POSIX_DIRS_$(RTEMS_HAS_POSIX_API)_V)
     22POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V)
    2323
    2424SUB_DIRS=rtems $(POSIX_DIRS)

  • c/src/lib/libbsp/unix/posix/startup/Makefile.in

    r367cc5e rc9b07e92  
    3939include $(RTEMS_ROOT)/make/leaf.cfg
    4040
    41 ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
     41ifeq ($(HAS_CPLUSPLUS),yes)
    4242NO_CTOR_LIB=${ARCH}/libno-ctor.a
    4343INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o

  • c/src/lib/libchip/network/sonic.h

    r367cc5e rc9b07e92  
    2828#ifndef _SONIC_DP83932_
    2929#define _SONIC_DP83932_
     30
     31
     32 /*
     33  * Debug levels
     34  *
     35  */
     36
     37#define SONIC_DEBUG_NONE                0x0000
     38#define SONIC_DEBUG_ALL                 0xFFFF
     39#define SONIC_DEBUG_PRINT_REGISTERS     0x0001
     40#define SONIC_DEBUG_MEMORY              0x0002
     41#define SONIC_DEBUG_MEMORY_ALLOCATE     0x0004
     42#define SONIC_DEBUG_MEMORY_DESCRIPTORS  0x0008
     43#define SONIC_DEBUG_FRAGMENTS           0x0008
     44#define SONIC_DEBUG_CAM                 0x0010
     45#define SONIC_DEBUG_DESCRIPTORS         0x0020
     46#define SONIC_DEBUG_ERRORS              0x0040
     47#define SONIC_DEBUG_DUMP_TX_MBUFS       0x0080
     48#define SONIC_DEBUG_DUMP_RX_MBUFS       0x0100
     49
     50#define SONIC_DEBUG_DUMP_MBUFS \
     51      (SONIC_DEBUG_DUMP_TX_MBUFS|SONIC_DEBUG_DUMP_RX_MBUFS)
     52
     53#define SONIC_DEBUG  (SONIC_DEBUG_NONE)
     54/*
     55#define SONIC_DEBUG  (SONIC_DEBUG_ERRORS | SONIC_DEBUG_PRINT_REGISTERS |\
     56      SONIC_DEBUG_DESCRIPTORS)
     57*/
     58
     59/*
     60  ((SONIC_DEBUG_ALL) & ~(SONIC_DEBUG_PRINT_REGISTERS|SONIC_DEBUG_DUMP_MBUFS))
     61  ((SONIC_DEBUG_ALL) & ~(SONIC_DEBUG_DUMP_MBUFS))
     62*/
     63
     64#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
     65extern char SONIC_Reg_name[64][6];
     66#endif
     67
    3068
    3169/*
    … …  
    235273#define DCR2_EXPO1      0x2000
    236274#define DCR2_EXPO0      0x1000
     275#define DCR2_HBDIS      0x0800
    237276#define DCR2_PH         0x0010
    238277#define DCR2_PCM        0x0004
    … …  
    241280
    242281/*
    243  *  Known values for the Silicon Revision Register
     282 *  Known values for the Silicon Revision Register.
     283 *  Note that DP83934 has revision 5 and seems to work.
    244284 */
    245285
    246286#define SONIC_REVISION_B   4
     287#define SONIC_REVISION_DP83934   5
    247288#define SONIC_REVISION_C   6
    248289
    … …  
    414455);
    415456
     457#ifdef CPU_U32_FIX
     458void ipalign(struct mbuf *m);
     459#endif
     460
    416461#endif /* _SONIC_DP83932_ */

  • c/src/libchip/network/sonic.h

    r367cc5e rc9b07e92  
    2828#ifndef _SONIC_DP83932_
    2929#define _SONIC_DP83932_
     30
     31
     32 /*
     33  * Debug levels
     34  *
     35  */
     36
     37#define SONIC_DEBUG_NONE                0x0000
     38#define SONIC_DEBUG_ALL                 0xFFFF
     39#define SONIC_DEBUG_PRINT_REGISTERS     0x0001
     40#define SONIC_DEBUG_MEMORY              0x0002
     41#define SONIC_DEBUG_MEMORY_ALLOCATE     0x0004
     42#define SONIC_DEBUG_MEMORY_DESCRIPTORS  0x0008
     43#define SONIC_DEBUG_FRAGMENTS           0x0008
     44#define SONIC_DEBUG_CAM                 0x0010
     45#define SONIC_DEBUG_DESCRIPTORS         0x0020
     46#define SONIC_DEBUG_ERRORS              0x0040
     47#define SONIC_DEBUG_DUMP_TX_MBUFS       0x0080
     48#define SONIC_DEBUG_DUMP_RX_MBUFS       0x0100
     49
     50#define SONIC_DEBUG_DUMP_MBUFS \
     51      (SONIC_DEBUG_DUMP_TX_MBUFS|SONIC_DEBUG_DUMP_RX_MBUFS)
     52
     53#define SONIC_DEBUG  (SONIC_DEBUG_NONE)
     54/*
     55#define SONIC_DEBUG  (SONIC_DEBUG_ERRORS | SONIC_DEBUG_PRINT_REGISTERS |\
     56      SONIC_DEBUG_DESCRIPTORS)
     57*/
     58
     59/*
     60  ((SONIC_DEBUG_ALL) & ~(SONIC_DEBUG_PRINT_REGISTERS|SONIC_DEBUG_DUMP_MBUFS))
     61  ((SONIC_DEBUG_ALL) & ~(SONIC_DEBUG_DUMP_MBUFS))
     62*/
     63
     64#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
     65extern char SONIC_Reg_name[64][6];
     66#endif
     67
    3068
    3169/*
    … …  
    235273#define DCR2_EXPO1      0x2000
    236274#define DCR2_EXPO0      0x1000
     275#define DCR2_HBDIS      0x0800
    237276#define DCR2_PH         0x0010
    238277#define DCR2_PCM        0x0004
    … …  
    241280
    242281/*
    243  *  Known values for the Silicon Revision Register
     282 *  Known values for the Silicon Revision Register.
     283 *  Note that DP83934 has revision 5 and seems to work.
    244284 */
    245285
    246286#define SONIC_REVISION_B   4
     287#define SONIC_REVISION_DP83934   5
    247288#define SONIC_REVISION_C   6
    248289
    … …  
    414455);
    415456
     457#ifdef CPU_U32_FIX
     458void ipalign(struct mbuf *m);
     459#endif
     460
    416461#endif /* _SONIC_DP83932_ */

  • configure.in

    r367cc5e rc9b07e92  
    363363AC_SUBST(RTEMS_USE_OWN_PDIR)
    364364AC_SUBST(RTEMS_HAS_POSIX_API)
     365AC_SUBST(RTEMS_HAS_MULTIPROCESSING)
    365366AC_SUBST(RTEMS_HAS_NETWORKING)
    366367AC_SUBST(RTEMS_HAS_RDBG)

  • make/custom/gensh1.cfg

    r367cc5e rc9b07e92  
    8181# Miscellaneous additions go here
    8282
    83 SHGEN=$(PROJECT_ROOT)/c/src/exec/score/tools/sh/$(ARCH)/shgen
     83SHGEN=$(PROJECT_ROOT)/c/src/exec/score/tools/sh/shgen

  • make/target.cfg.in

    r367cc5e rc9b07e92  
    4242RTEMS_HAS_MULTIPROCESSING = @RTEMS_HAS_MULTIPROCESSING@
    4343RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
    44 RTEMS_HAS_POSIX_1H_API = @RTEMS_HAS_POSIX_1H_API@
    4544RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@
    4645RTEMS_HAS_RDBG = @RTEMS_HAS_RDBG@
    … …  
    5554BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
    5655 
    57 INSTALL_CHANGE=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
     56# INSTALL_CHANGE=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
    5857XCFLAGS=$(CFLAGS_FOR_TARGET)
    5958 
Note: See TracChangeset for help on using the changeset viewer.