diff options
| author | Nick Clifton <nickc@redhat.com> | 2003-06-05 09:12:02 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@gcc.gnu.org> | 2003-06-05 09:12:02 +0000 |
| commit | 3a30516dd0a950adc398ef870b975d0d0d7529ac (patch) | |
| tree | c8cee653dcd44f0f18dfe4e720e30b87ada3458d /gcc | |
| parent | 53e5f173239cede18bf6c52642d97c38b941467a (diff) | |
| download | gcc-3a30516dd0a950adc398ef870b975d0d0d7529ac.zip gcc-3a30516dd0a950adc398ef870b975d0d0d7529ac.tar.gz gcc-3a30516dd0a950adc398ef870b975d0d0d7529ac.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config.gcc | 2 | ||||
| -rw-r--r-- | gcc/config/m32r/t-m32r | 37 |
3 files changed, 24 insertions, 23 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b639d17..30e69fb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/config.gcc b/gcc/config.gcc index 98a44cd..c681f11 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -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-*-*) diff --git a/gcc/config/m32r/t-m32r b/gcc/config/m32r/t-m32r index e7d56af..f8cff4a 100644 --- a/gcc/config/m32r/t-m32r +++ b/gcc/config/m32r/t-m32r @@ -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 |