config.gcc (m32r-elf): Revert previous delta.

* config.gcc (m32r-elf): Revert previous delta.
* config/m32r/t-m32r (crtinit.o): Fix rule to work with multilibs.
  Remove m32rx specific version.
  (crtfini.o): Likewise.
  (EXTRA_MULTILIB_PARTS): Define.

From-SVN: r67483
This commit is contained in:
Nick Clifton 2003-06-05 09:12:02 +00:00 committed by Nick Clifton
parent 53e5f17323
commit 3a30516dd0
3 changed files with 23 additions and 22 deletions

View File

@ -1,3 +1,11 @@
2003-06-05 Nick Clifton <nickc@redhat.com>
* config.gcc (m32r-elf): Revert previous delta.
* config/m32r/t-m32r (crtinit.o): Fix rule to work with
multilibs. Remove m32rx specific version.
(crtfini.o): Likewise.
(EXTRA_MULTILIB_PARTS): Define.
2003-06-05 Eric Botcazou <ebotcazou@libertysurf.fr>
* doc/md.texi (Machine Constraints): Correct the meaning of

View File

@ -1273,7 +1273,7 @@ ip2k-*-elf)
;;
m32r-*-elf*)
tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
extra_parts="crtinit.o crtfini.o"
;;
# m68hc11 and m68hc12 share the same machine description.
m68hc11-*-*|m6811-*-*)

View File

@ -26,31 +26,22 @@ CRTSTUFF_T_CFLAGS =
# .init/.fini section routines
crtinit.o: $(srcdir)/config/m32r/initfini.c $(GCC_PASSES) $(CONFIG_H)
$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(CRTSTUFF_T_CFLAGS) \
-DCRT_INIT -finhibit-size-directive -fno-inline-functions \
-g0 -mmodel=medium -c $(srcdir)/config/m32r/initfini.c -o crtinit.o
crtfini.o: $(srcdir)/config/m32r/initfini.c $(GCC_PASSES) $(CONFIG_H)
$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(CRTSTUFF_T_CFLAGS) \
-DCRT_FINI -finhibit-size-directive -fno-inline-functions \
-g0 -mmodel=medium -c $(srcdir)/config/m32r/initfini.c -o crtfini.o
$(T)crtinit.o: $(srcdir)/config/m32r/initfini.c $(GCC_PASSES) $(CONFIG_H)
$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) \
$(CRTSTUFF_T_CFLAGS) $(INCLUDES) -DCRT_INIT \
-finhibit-size-directive -fno-inline-functions -g0 \
-mmodel=medium -c $(srcdir)/config/m32r/initfini.c \
-o $(T)crtinit.o
$(T)crtfini.o: $(srcdir)/config/m32r/initfini.c $(GCC_PASSES) $(CONFIG_H)
$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) \
$(CRTSTUFF_T_CFLAGS) $(INCLUDES) -DCRT_FINI \
-finhibit-size-directive -fno-inline-functions -g0 \
-mmodel=medium -c $(srcdir)/config/m32r/initfini.c \
-o $(T)crtfini.o
m32rx:
mkdir $@
m32rx/crtinit.o: m32rx $(srcdir)/config/m32r/initfini.c $(GCC_PASSES) $(CONFIG_H)
$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(CRTSTUFF_T_CFLAGS) \
-DCRT_INIT -finhibit-size-directive -fno-inline-functions \
-g0 -mmodel=medium -c $(srcdir)/config/m32r/initfini.c -m32rx \
-o m32rx/crtinit.o
m32rx/crtfini.o: m32rx $(srcdir)/config/m32r/initfini.c $(GCC_PASSES) $(CONFIG_H)
$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(CRTSTUFF_T_CFLAGS) \
-DCRT_FINI -finhibit-size-directive -fno-inline-functions \
-g0 -mmodel=medium -c $(srcdir)/config/m32r/initfini.c -m32rx \
-o m32rx/crtfini.o
# -mmodel={small,medium} requires separate libraries.
# We don't build libraries for the large model, instead we use the medium
# libraries. The only difference is that the large model can handle jumps
@ -65,5 +56,7 @@ MULTILIB_MATCHES = mmodel?medium=mmodel?large
# This is important for objects referenced in system header files.
MULTILIB_EXTRA_OPTS = msdata=sdata
EXTRA_MULTILIB_PARTS = crtinit.o crtfini.o
LIBGCC = stmp-multilib
INSTALL_LIBGCC = install-multilib