From bd8c8b2a855f3219e3c4c73c9e67eb4bd6d473d7 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 5 Aug 1998 16:51:39 +0000
Subject: Patch from Eric Valette <valette@crf.canon.fr> which brings the
 i386ex BSP inline with the new IRQ structure.

---
 c/src/lib/libcpu/i386/Makefile.in        | 11 ++++++-----
 c/src/lib/libcpu/i386/cpuModel.h         |  2 +-
 c/src/lib/libcpu/i386/displayCpu.c       |  2 +-
 c/src/lib/libcpu/i386/wrapup/Makefile.in | 19 +++++++++++++++++--
 4 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'c/src/lib/libcpu')

diff --git a/c/src/lib/libcpu/i386/Makefile.in b/c/src/lib/libcpu/i386/Makefile.in
index b1282e2b55..3d339e036b 100644
--- a/c/src/lib/libcpu/i386/Makefile.in
+++ b/c/src/lib/libcpu/i386/Makefile.in
@@ -8,7 +8,6 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-PGM=${ARCH}/libcpu.rel
 
 # C source names, if any, go here -- minus the .c
 C_PIECES=cpu displayCpu
@@ -26,7 +25,9 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+LIB=${ARCH}/libcpuspec.a
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -50,14 +51,14 @@ LDFLAGS   +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
+${LIB}: ${SRCS} ${OBJS}
+	$(make-library)
 
 preinstall :
 	$(MKDIR) $(PROJECT_INCLUDE)/libcpu
 	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/libcpu
 
-all:	${ARCH} $(SRCS) preinstall $(OBJ) $(PGM)
+all:	${ARCH} $(SRCS) preinstall $(OBJ) $(LIB)
 	cd wrapup; $(MAKE)
 
 # the .rel file built here will be put into libcpu.a by ../wrapup/Makefile
diff --git a/c/src/lib/libcpu/i386/cpuModel.h b/c/src/lib/libcpu/i386/cpuModel.h
index 5d7301aab4..a3e3bd201e 100644
--- a/c/src/lib/libcpu/i386/cpuModel.h
+++ b/c/src/lib/libcpu/i386/cpuModel.h
@@ -29,4 +29,4 @@ extern char x86_vendor_id[13];
 extern int have_cpuid;  
 extern unsigned char Cx86_step; /* cyrix processor identification */
 
-extern voidget_cpuinfo(); /* Display this information in ascii form */
+extern void printCpuInfo(); /* Display this information on console in ascii form */
diff --git a/c/src/lib/libcpu/i386/displayCpu.c b/c/src/lib/libcpu/i386/displayCpu.c
index 3220b1151f..ff748b7b43 100644
--- a/c/src/lib/libcpu/i386/displayCpu.c
+++ b/c/src/lib/libcpu/i386/displayCpu.c
@@ -173,7 +173,7 @@ static const char * getmodel(int x86, int model)
 
 void printCpuInfo()
 {
-  int i, len = 0;
+  int i;
   static const char *x86_cap_flags[] = {
     "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
     "cx8", "apic", "10", "11", "mtrr", "pge", "mca", "cmov",
diff --git a/c/src/lib/libcpu/i386/wrapup/Makefile.in b/c/src/lib/libcpu/i386/wrapup/Makefile.in
index aa05a7fae7..c7406ebe0d 100644
--- a/c/src/lib/libcpu/i386/wrapup/Makefile.in
+++ b/c/src/lib/libcpu/i386/wrapup/Makefile.in
@@ -12,7 +12,7 @@ BSP_PIECES=startup clock console timer
 GENERIC_PIECES=
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS=../$(ARCH)/libcpu.rel
+OBJS=../$(ARCH)/libcpuspec.a
 LIB=$(ARCH)/libcpu.a
 
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
@@ -41,7 +41,22 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 $(LIB): ${OBJS}
-	$(make-library)
+	@ list_of_o_files=""; \
+	for i in ${OBJS}; \
+	do \
+		DIRNAME=`dirname ${OBJS}` ; \
+		temp=`$(AR) t $$i`; \
+		echo $$temp ;\
+		echo $$DIRNAME ;\
+		for j in $$temp; \
+		do \
+			list_of_o_files="$$list_of_o_files $$DIRNAME/$$j"; \
+		done ;\
+		echo $$list_of_o_files ;\
+	done ;\
+	$(RM) $@ ;\
+	$(AR) $(ARFLAGS) $@ $$list_of_o_files ;\
+	$(MKLIB) $@
 
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib
-- 
cgit v1.2.3