From 1462016612c05a752f9e261d64d0c04db1d9ceca Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Jul 2002 09:17:11 +0000 Subject: 2002-07-22 Ralf Corsepius * 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. --- cpukit/ChangeLog | 11 +++++++++++ cpukit/aclocal/env-rtemsbsp.m4 | 16 +++++++--------- cpukit/aclocal/env-rtemscpu.m4 | 12 ++++-------- cpukit/aclocal/rtems-top.m4 | 4 +--- cpukit/automake/compile.am | 29 ++--------------------------- 5 files changed, 25 insertions(+), 47 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 3f52491449..0248e2fa00 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,14 @@ +2002-07-22 Ralf Corsepius + + * 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. + 2002-07-17 Ralf Corsepius * aclocal/rtems-top.m4: Reflect relocation of c/src/exec to cpukit. diff --git a/cpukit/aclocal/env-rtemsbsp.m4 b/cpukit/aclocal/env-rtemsbsp.m4 index 6caec5a3d4..830e3c8d51 100644 --- a/cpukit/aclocal/env-rtemsbsp.m4 +++ b/cpukit/aclocal/env-rtemsbsp.m4 @@ -21,21 +21,18 @@ RTEMS_BSP="$rtems_cv_RTEMS_BSP" AC_MSG_RESULT(${RTEMS_BSP}) AC_SUBST(RTEMS_BSP) -RTEMS_BSP_SPECS="-specs bsp_specs -qrtems" -AC_SUBST(RTEMS_BSP_SPECS) - -GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/" -AC_SUBST(GCC_SPECS) - PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" AC_SUBST(PROJECT_INCLUDE) -PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP" -AC_SUBST(PROJECT_RELEASE) +project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib" +AC_SUBST(project_libdir) -RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP +RTEMS_ROOT="$PROJECT_ROOT/c/$RTEMS_BSP" AC_SUBST(RTEMS_ROOT) +GCC_SPECS="-isystem \$(PROJECT_INCLUDE)" +AC_SUBST(GCC_SPECS) + RTEMS_ENABLE_BARE AC_SUBST(BARE_CPU_MODEL) AC_SUBST(BARE_CPU_CFLAGS) @@ -44,4 +41,5 @@ AM_CONDITIONAL([RTEMS_CONFIG_PER_BSP],[true]) AM_CONDITIONAL([MULTILIB],[false]) includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" +libdir="\${exec_prefix}/${RTEMS_BSP}/lib" ]) diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index 42fd06b23f..7cb53a1307 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -5,9 +5,6 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, if test x"$multilib" = x"yes"; then ## FIXME: There is no multilib BSP - RTEMS_BSP_SPECS="" - AC_SUBST(RTEMS_BSP_SPECS) - if test -n "$with_multisubdir"; then MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'` fi @@ -18,17 +15,16 @@ if test x"$multilib" = x"yes"; then fi AC_SUBST(MULTISUBDIR) - PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)" - GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include" + GCC_SPECS="-isystem \$(PROJECT_INCLUDE)" AC_SUBST(GCC_SPECS) PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" AC_SUBST(PROJECT_INCLUDE) - PROJECT_RELEASE="\$(PROJECT_ROOT)" - AC_SUBST(PROJECT_RELEASE) + project_libdir="\$(PROJECT_ROOT)/lib" + AC_SUBST(project_libdir) - RTEMS_ROOT=${PROJECT_ROOT} + RTEMS_ROOT="${PROJECT_ROOT}" AC_SUBST(RTEMS_ROOT) includedir="\${exec_prefix}/lib/include" diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4 index c174c36467..ba055115ef 100644 --- a/cpukit/aclocal/rtems-top.m4 +++ b/cpukit/aclocal/rtems-top.m4 @@ -35,9 +35,7 @@ PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)' fi AC_SUBST(PROJECT_TOPdir) -AS_IF([test "${with_project_root+set}" = set], - [PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"], - [PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"]) +PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)" AC_SUBST(PROJECT_ROOT) AC_MSG_CHECKING([for RTEMS Version]) diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am index 7eb3cdd1b7..c132e49d55 100644 --- a/cpukit/automake/compile.am +++ b/cpukit/automake/compile.am @@ -45,7 +45,7 @@ if RTEMS_USE_GCC CFLAGS_DEFAULT=-g -Wall ## gcc >= 2.8.x -GCCSPECS = $(GCC_SPECS) $(RTEMS_BSP_SPECS) +GCCSPECS = $(GCC_SPECS) else ## fall back to the old style compilers/*.cfg ## CONFIG.CC is supposed to be provided by .cfg @@ -63,20 +63,9 @@ ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS) # when debugging, optimize flag: typically empty # some compilers do allow optimization with their "-g" CFLAGS_DEBUG_OPTIMIZE_V=-g -LDFLAGS_DEBUG_V = # profile flag; use gprof(1) CFLAGS_PROFILE_V=-pg -LDFLAGS_PROFILE_V = - -# List of library paths without -L -LD_PATHS= $(PROJECT_RELEASE)/lib - -# ld flag for incomplete link -LDFLAGS_INCOMPLETE = -r - -# ld flags for profiling, debugging -LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %) # # How to compile stuff into ${ARCH} subdirectory @@ -85,8 +74,6 @@ LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %) COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) @@ -132,18 +119,6 @@ ifeq (${DEPEND},$(wildcard ${DEPEND})) include ${DEPEND} @ENDIF@ -if RTEMS_USE_GCC -## gcc >= 2.8 -define make-rel - $(LINK) -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) $^ -endef -else -## non-gcc -define make-rel - $(LINK) $(XLDFLAGS) $^ -endef -endif - ## ------------------------------------------------------------------------- ## translate VARIANT into VARIANT_V @@ -186,7 +161,7 @@ CFLAGS__V = $(CFLAGS_OPTIMIZE_V) if RTEMS_USE_GCC ## gcc >= gcc-2.8 RTEMS_CFLAGS_OPTIMIZE_V = -RTEMS_CFLAGS_DEBUG_V = -qrtems_debug -Wno-unused +RTEMS_CFLAGS_DEBUG_V = -Wno-unused RTEMS_CFLAGS_PROFILE_V = ## non-gcc -- cgit v1.2.3