Changeset 14620166 in rtems


Ignore:
Timestamp:
Jul 22, 2002, 9:17:11 AM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
35b2275
Parents:
be3e0f7
Message:

2002-07-22 Ralf Corsepius <corsepiu@…>

  • aclocal/env-rtemsbsp.m4: Remove RTEMS_BSP_SPECS, PROJECT_RELEASE. Add project_libdir, libdir. New GCC_SPECS. Various cleanups.
  • aclocal/env-rtemscpu.m4: Remove RTEMS_BSP_SPECS, PROJECT_RELEASE. Add project_libdir, libdir. New GCC_SPECS. Various cleanups.
  • aclocal/rtems-top.m4: New PROJECT_ROOT handling.
  • automake/compile.am: Remove RTEMS_BSP_SPECS, LD* flags, LINK, references to bsp_specs. Use project_libdir instead of $(PROJECT_RELEASE)/lib.
Location:
cpukit
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rbe3e0f7 r14620166  
     12002-07-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal/env-rtemsbsp.m4: Remove RTEMS_BSP_SPECS, PROJECT_RELEASE.
     4        Add project_libdir, libdir. New GCC_SPECS. Various cleanups.
     5        * aclocal/env-rtemscpu.m4: Remove RTEMS_BSP_SPECS, PROJECT_RELEASE.
     6        Add project_libdir, libdir. New GCC_SPECS. Various cleanups.
     7        * aclocal/rtems-top.m4: New PROJECT_ROOT handling.
     8        * automake/compile.am: Remove RTEMS_BSP_SPECS, LD* flags, LINK,
     9        references to bsp_specs. Use project_libdir instead of
     10        $(PROJECT_RELEASE)/lib.
     11
    1122002-07-17      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    213
  • cpukit/aclocal/env-rtemsbsp.m4

    rbe3e0f7 r14620166  
    2222AC_SUBST(RTEMS_BSP)
    2323
    24 RTEMS_BSP_SPECS="-specs bsp_specs -qrtems"
    25 AC_SUBST(RTEMS_BSP_SPECS)
    26 
    27 GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
    28 AC_SUBST(GCC_SPECS)
    29 
    3024PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
    3125AC_SUBST(PROJECT_INCLUDE)
    3226
    33 PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP"   
    34 AC_SUBST(PROJECT_RELEASE)
     27project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"   
     28AC_SUBST(project_libdir)
    3529
    36 RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP
     30RTEMS_ROOT="$PROJECT_ROOT/c/$RTEMS_BSP"
    3731AC_SUBST(RTEMS_ROOT)
     32
     33GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
     34AC_SUBST(GCC_SPECS)
    3835
    3936RTEMS_ENABLE_BARE
     
    4542
    4643includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
     44libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
    4745])
  • cpukit/aclocal/env-rtemscpu.m4

    rbe3e0f7 r14620166  
    66if test x"$multilib" = x"yes"; then
    77## FIXME: There is no multilib BSP
    8   RTEMS_BSP_SPECS=""
    9   AC_SUBST(RTEMS_BSP_SPECS)
    10 
    118  if test -n "$with_multisubdir"; then
    129    MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`
     
    1916  AC_SUBST(MULTISUBDIR)
    2017
    21   PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
    22   GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include"
     18  GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
    2319  AC_SUBST(GCC_SPECS)
    2420
     
    2622  AC_SUBST(PROJECT_INCLUDE)
    2723
    28   PROJECT_RELEASE="\$(PROJECT_ROOT)"
    29   AC_SUBST(PROJECT_RELEASE)
     24  project_libdir="\$(PROJECT_ROOT)/lib"
     25  AC_SUBST(project_libdir)
    3026
    31   RTEMS_ROOT=${PROJECT_ROOT}
     27  RTEMS_ROOT="${PROJECT_ROOT}"
    3228  AC_SUBST(RTEMS_ROOT)
    3329
  • cpukit/aclocal/rtems-top.m4

    rbe3e0f7 r14620166  
    3636AC_SUBST(PROJECT_TOPdir)
    3737
    38 AS_IF([test "${with_project_root+set}" = set],
    39   [PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"],
    40   [PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"])
     38PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
    4139AC_SUBST(PROJECT_ROOT)
    4240
  • cpukit/automake/compile.am

    rbe3e0f7 r14620166  
    4646CFLAGS_DEFAULT=-g -Wall
    4747## gcc >= 2.8.x
    48 GCCSPECS = $(GCC_SPECS) $(RTEMS_BSP_SPECS)
     48GCCSPECS = $(GCC_SPECS)
    4949else
    5050## fall back to the old style compilers/*.cfg
     
    6464# some compilers do allow optimization with their "-g"
    6565CFLAGS_DEBUG_OPTIMIZE_V=-g
    66 LDFLAGS_DEBUG_V =
    6766
    6867# profile flag; use gprof(1)
    6968CFLAGS_PROFILE_V=-pg
    70 LDFLAGS_PROFILE_V =
    71 
    72 # List of library paths without -L
    73 LD_PATHS= $(PROJECT_RELEASE)/lib
    74 
    75 # ld flag for incomplete link
    76 LDFLAGS_INCOMPLETE = -r
    77 
    78 # ld flags for profiling, debugging
    79 LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %)
    8069
    8170#
     
    8675        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    8776CCLD = $(CC)
    88 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    89         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    9077
    9178CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
     
    133120@ENDIF@
    134121
    135 if RTEMS_USE_GCC
    136 ## gcc >= 2.8
    137 define make-rel
    138         $(LINK) -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) $^
    139 endef
    140 else
    141 ## non-gcc
    142 define make-rel
    143         $(LINK) $(XLDFLAGS) $^
    144 endef
    145 endif
    146 
    147122## -------------------------------------------------------------------------
    148123
     
    187162## gcc >= gcc-2.8
    188163RTEMS_CFLAGS_OPTIMIZE_V =
    189 RTEMS_CFLAGS_DEBUG_V = -qrtems_debug -Wno-unused
     164RTEMS_CFLAGS_DEBUG_V = -Wno-unused
    190165RTEMS_CFLAGS_PROFILE_V =
    191166
Note: See TracChangeset for help on using the changeset viewer.