Patch rtems-rc-4.5.0-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

which contains a couple of minor bug fixes:

  Fixes:
    * Typos: Use LIB_VARIANT instead of LIBVARIANT
    * Fix pc386.cfg
This commit is contained in:
Joel Sherrill
2000-02-16 17:47:48 +00:00
parent 319d298851
commit 56616af310
3 changed files with 23 additions and 10 deletions

View File

@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES += $(H_FILES) $(GEN_C_FILES)
FRONTEND = \"$(RTEMS_CPU)/any/remdeb_f.x\"
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
$(LIB): ${OBJS}
@@ -84,7 +84,7 @@ $(PROJECT_INCLUDE)/rdbg \
$(PROJECT_INCLUDE)/rdbg/remdeb.h
TMPINSTALL_FILES += \
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)

View File

@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES += $(H_FILES) $(GEN_C_FILES)
FRONTEND = \"$(RTEMS_CPU)/mcp750/remdeb_f.x\"
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
$(LIB): ${OBJS}
@@ -84,7 +84,7 @@ $(PROJECT_INCLUDE)/rdbg \
$(PROJECT_INCLUDE)/rdbg/remdeb.h
TMPINSTALL_FILES += \
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)

View File

@@ -81,8 +81,12 @@ define make-exe
$(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
$(NM) -g -n $(basename $@).obj > $(basename $@).num
$(SIZE) $(basename $@).obj
$(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \
test -d ${PROJECT_RELEASE}/BootImgs \
|| mkdir ${PROJECT_RELEASE}/BootImgs
cp $(basename $@).bt \
${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
chmod 755 \
${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
endef
else
define make-exe
@@ -100,9 +104,13 @@ define make-exe
$(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
$(NM) -g -n $(basename $@).obj > $(basename $@).num
$(SIZE) $(basename $@).obj
@$(mkinstalldirs) ${PROJECT_RELEASE}/BootImgs
$(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \
${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
test -d ${PROJECT_RELEASE}/BootImgs \
|| mkdir ${PROJECT_RELEASE}/BootImgs
f=`basename $@ .exe`; \
cp $(basename $@).bt \
${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \
&& chmod 755 \
${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \
-o $@ $(LINK_OBJS) $(LINK_LIBS)
endef
@@ -121,8 +129,13 @@ define make-cxx-exe
$(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
$(NM) -g -n $(basename $@).obj > $(basename $@).num
$(SIZE) $(basename $@).obj
$(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \
${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
test -d ${PROJECT_RELEASE}/BootImgs \
|| mkdir ${PROJECT_RELEASE}/BootImgs
f=`basename $@ .exe`; \
cp $(basename $@).bt \
${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \
&& chmod 755 \
${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt
$(CXX) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \
-o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS)
endef