Changeset 14620166 in rtems
- Timestamp:
- 07/22/02 09:17:11 (22 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 35b2275
- Parents:
- be3e0f7
- Location:
- cpukit
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/ChangeLog
rbe3e0f7 r14620166 1 2002-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 1 12 2002-07-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 13 -
cpukit/aclocal/env-rtemsbsp.m4
rbe3e0f7 r14620166 22 22 AC_SUBST(RTEMS_BSP) 23 23 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 30 24 PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" 31 25 AC_SUBST(PROJECT_INCLUDE) 32 26 33 PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP"34 AC_SUBST( PROJECT_RELEASE)27 project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib" 28 AC_SUBST(project_libdir) 35 29 36 RTEMS_ROOT= $PROJECT_ROOT/c/$RTEMS_BSP30 RTEMS_ROOT="$PROJECT_ROOT/c/$RTEMS_BSP" 37 31 AC_SUBST(RTEMS_ROOT) 32 33 GCC_SPECS="-isystem \$(PROJECT_INCLUDE)" 34 AC_SUBST(GCC_SPECS) 38 35 39 36 RTEMS_ENABLE_BARE … … 45 42 46 43 includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" 44 libdir="\${exec_prefix}/${RTEMS_BSP}/lib" 47 45 ]) -
cpukit/aclocal/env-rtemscpu.m4
rbe3e0f7 r14620166 6 6 if test x"$multilib" = x"yes"; then 7 7 ## FIXME: There is no multilib BSP 8 RTEMS_BSP_SPECS=""9 AC_SUBST(RTEMS_BSP_SPECS)10 11 8 if test -n "$with_multisubdir"; then 12 9 MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'` … … 19 16 AC_SUBST(MULTISUBDIR) 20 17 21 PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)" 22 GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include" 18 GCC_SPECS="-isystem \$(PROJECT_INCLUDE)" 23 19 AC_SUBST(GCC_SPECS) 24 20 … … 26 22 AC_SUBST(PROJECT_INCLUDE) 27 23 28 PROJECT_RELEASE="\$(PROJECT_ROOT)"29 AC_SUBST( PROJECT_RELEASE)24 project_libdir="\$(PROJECT_ROOT)/lib" 25 AC_SUBST(project_libdir) 30 26 31 RTEMS_ROOT= ${PROJECT_ROOT}27 RTEMS_ROOT="${PROJECT_ROOT}" 32 28 AC_SUBST(RTEMS_ROOT) 33 29 -
cpukit/aclocal/rtems-top.m4
rbe3e0f7 r14620166 36 36 AC_SUBST(PROJECT_TOPdir) 37 37 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)"]) 38 PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)" 41 39 AC_SUBST(PROJECT_ROOT) 42 40 -
cpukit/automake/compile.am
rbe3e0f7 r14620166 46 46 CFLAGS_DEFAULT=-g -Wall 47 47 ## gcc >= 2.8.x 48 GCCSPECS = $(GCC_SPECS) $(RTEMS_BSP_SPECS)48 GCCSPECS = $(GCC_SPECS) 49 49 else 50 50 ## fall back to the old style compilers/*.cfg … … 64 64 # some compilers do allow optimization with their "-g" 65 65 CFLAGS_DEBUG_OPTIMIZE_V=-g 66 LDFLAGS_DEBUG_V =67 66 68 67 # profile flag; use gprof(1) 69 68 CFLAGS_PROFILE_V=-pg 70 LDFLAGS_PROFILE_V =71 72 # List of library paths without -L73 LD_PATHS= $(PROJECT_RELEASE)/lib74 75 # ld flag for incomplete link76 LDFLAGS_INCOMPLETE = -r77 78 # ld flags for profiling, debugging79 LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %)80 69 81 70 # … … 86 75 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 87 76 CCLD = $(CC) 88 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \89 $(AM_LDFLAGS) $(LDFLAGS) -o $@90 77 91 78 CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) … … 133 120 @ENDIF@ 134 121 135 if RTEMS_USE_GCC136 ## gcc >= 2.8137 define make-rel138 $(LINK) -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) $^139 endef140 else141 ## non-gcc142 define make-rel143 $(LINK) $(XLDFLAGS) $^144 endef145 endif146 147 122 ## ------------------------------------------------------------------------- 148 123 … … 187 162 ## gcc >= gcc-2.8 188 163 RTEMS_CFLAGS_OPTIMIZE_V = 189 RTEMS_CFLAGS_DEBUG_V = - qrtems_debug -Wno-unused164 RTEMS_CFLAGS_DEBUG_V = -Wno-unused 190 165 RTEMS_CFLAGS_PROFILE_V = 191 166
Note: See TracChangeset
for help on using the changeset viewer.