Ticket #1369: rtems-mvme167-fpsp.diff

File rtems-mvme167-fpsp.diff, 3.1 KB (added by strauman, on Feb 4, 2009 at 9:07:01 PM)

Fix for the aforementioned problem

Line 
1Index: c/src/lib/libcpu/m68k/Makefile.am
2===================================================================
3RCS file: /usr1/CVS/rtems/c/src/lib/libcpu/m68k/Makefile.am,v
4retrieving revision 1.29
5diff -c -r1.29 Makefile.am
6*** c/src/lib/libcpu/m68k/Makefile.am   11 Jul 2008 09:59:48 -0000      1.29
7--- c/src/lib/libcpu/m68k/Makefile.am   4 Feb 2009 21:57:44 -0000
8***************
9*** 40,46 ****
10  if m68040
11  ## m68040/fpsp
12  noinst_PROGRAMS += m68040/fpsp.rel
13! m68040_fpsp_rel_SOURCES = m68040/fpsp/rtems_fpsp.c m68040/fpsp/bindec.S \
14      m68040/fpsp/binstr.S m68040/fpsp/bugfix.S m68040/fpsp/decbin.S \
15      m68040/fpsp/do_func.S m68040/fpsp/gen_except.S m68040/fpsp/get_op.S \
16      m68040/fpsp/kernel_ex.S m68040/fpsp/res_func.S m68040/fpsp/round.S \
17--- 40,47 ----
18  if m68040
19  ## m68040/fpsp
20  noinst_PROGRAMS += m68040/fpsp.rel
21! noinst_PROGRAMS += m68040/fpsp_tmp.rel
22! m68040_fpsp_tmp_rel_SOURCES = m68040/fpsp/rtems_fpsp.c m68040/fpsp/bindec.S \
23      m68040/fpsp/binstr.S m68040/fpsp/bugfix.S m68040/fpsp/decbin.S \
24      m68040/fpsp/do_func.S m68040/fpsp/gen_except.S m68040/fpsp/get_op.S \
25      m68040/fpsp/kernel_ex.S m68040/fpsp/res_func.S m68040/fpsp/round.S \
26***************
27*** 55,62 ****
28      m68040/fpsp/x_operr.S m68040/fpsp/x_ovfl.S m68040/fpsp/x_snan.S \
29      m68040/fpsp/x_store.S m68040/fpsp/x_unfl.S m68040/fpsp/x_unimp.S \
30      m68040/fpsp/x_unsupp.S
31! m68040_fpsp_rel_CPPFLAGS = $(AM_CPPFLAGS)
32! m68040_fpsp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
33 
34  noinst_HEADERS = m68040/fpsp/fpsp.defs
35  endif
36--- 56,73 ----
37      m68040/fpsp/x_operr.S m68040/fpsp/x_ovfl.S m68040/fpsp/x_snan.S \
38      m68040/fpsp/x_store.S m68040/fpsp/x_unfl.S m68040/fpsp/x_unimp.S \
39      m68040/fpsp/x_unsupp.S
40! m68040_fpsp_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS)
41! m68040_fpsp_tmp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
42!
43! # avoid name clashes and modifying the source by
44! # prefixing all (global) symbols in the binary
45! m68040/fpsp_tmp1.rel: m68040/fpsp_tmp.rel
46!       $(OBJCOPY) --prefix-symbols __fpsp_ $^ $@
47!
48! # Then remove the prefix again on all global
49! # symbols we really need:
50! m68040/fpsp.rel: m68040/fpsp_tmp1.rel
51!           $(OBJCOPY) --redefine-sym __fpsp_M68KFPSPInstallExceptionHandlers=M68KFPSPInstallExceptionHandlers --redefine-sym __fpsp_M68040FPSPUserExceptionHandlers=M68040FPSPUserExceptionHandlers --redefine-sym __fpsp__CPU_ISR_install_raw_handler=_CPU_ISR_install_raw_handler --redefine-sym __fpsp__FPSP_install_raw_handler=_FPSP_install_raw_handler $^ $@
52 
53  noinst_HEADERS = m68040/fpsp/fpsp.defs
54  endif
55Index: c/src/lib/libcpu/m68k/configure.ac
56===================================================================
57RCS file: /usr1/CVS/rtems/c/src/lib/libcpu/m68k/configure.ac,v
58retrieving revision 1.36
59diff -c -r1.36 configure.ac
60*** c/src/lib/libcpu/m68k/configure.ac  11 Jul 2008 09:59:48 -0000      1.36
61--- c/src/lib/libcpu/m68k/configure.ac  4 Feb 2009 21:57:44 -0000
62***************
63*** 21,26 ****
64--- 21,28 ----
65  RTEMS_CANONICALIZE_TOOLS
66  RTEMS_PROG_CCAS
67 
68+ RTEMS_CHECK_TOOL([OBJCOPY],[objcopy])
69+
70  # At this time all models should use the shared directory so do this
71  AM_CONDITIONAL(shared, true)
72