diff options
| author | John David Anglin <dave.anglin@nrc-cnrc.gc.ca> | 2011-11-13 20:17:01 +0000 |
|---|---|---|
| committer | John David Anglin <danglin@gcc.gnu.org> | 2011-11-13 20:17:01 +0000 |
| commit | 9dfd583288b4d88cfb342132a87756de0379f200 (patch) | |
| tree | bd0680462f0cd2d147c55aea49e0fcd7b96f29fd | |
| parent | d559a95c8f664985238f79551f936a9c10f0e0a6 (diff) | |
| download | gcc-9dfd583288b4d88cfb342132a87756de0379f200.zip gcc-9dfd583288b4d88cfb342132a87756de0379f200.tar.gz gcc-9dfd583288b4d88cfb342132a87756de0379f200.tar.bz2 | |
config.host (hppa*64*-*-hpux11*): Remove pa/t-stublib64 from tmake_file list.
* config.host (hppa*64*-*-hpux11*): Remove pa/t-stublib64 from
tmake_file list.
* config/pa/t-stublib: Merge rules from config/pa/t-stublib64.
* config/pa/t-stublib64: Delete.
From-SVN: r181339
| -rw-r--r-- | libgcc/ChangeLog | 7 | ||||
| -rw-r--r-- | libgcc/config.host | 2 | ||||
| -rw-r--r-- | libgcc/config/pa/t-stublib | 17 | ||||
| -rw-r--r-- | libgcc/config/pa/t-stublib64 | 13 |
4 files changed, 23 insertions, 16 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 6e6f79a..c10667b 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2011-11-13 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * config.host (hppa*64*-*-hpux11*): Remove pa/t-stublib64 from + tmake_file list. + * config/pa/t-stublib: Merge rules from config/pa/t-stublib64. + * config/pa/t-stublib64: Delete. + 2011-11-12 Richard Henderson <rth@redhat.com> * config/rs6000/linux-unwind.h (frob_update_context): Properly diff --git a/libgcc/config.host b/libgcc/config.host index 03f94d9..342d60c 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -486,7 +486,7 @@ hppa[12]*-*-hpux10*) md_unwind_header=pa/hpux-unwind.h ;; hppa*64*-*-hpux11*) - tmake_file="$tmake_file pa/t-hpux pa/t-pa64 pa/t-stublib pa/t-stublib64 t-libgcc-pic t-slibgcc" + tmake_file="$tmake_file pa/t-hpux pa/t-pa64 pa/t-stublib t-libgcc-pic t-slibgcc" # Set the libgcc version number if test x$enable_sjlj_exceptions = xyes; then tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver" diff --git a/libgcc/config/pa/t-stublib b/libgcc/config/pa/t-stublib index 017998f..9438092 100644 --- a/libgcc/config/pa/t-stublib +++ b/libgcc/config/pa/t-stublib @@ -1,8 +1,21 @@ -LIBGCCSTUB_OBJS = pthread_default_stacksize_np-stub.o \ +LIBGCCSTUB_OBJS = rfi-stub.o dfi-stub.o jvrc-stub.o cxaf-stub.o \ + pthread_default_stacksize_np-stub.o \ pthread_mutex_lock-stub.o \ pthread_mutex_unlock-stub.o \ pthread_once-stub.o +rfi-stub.o: $(srcdir)/config/pa/stublib.c + $(gcc_compile) -c -O2 -DL_register_frame_info $< + +dfi-stub.o: $(srcdir)/config/pa/stublib.c + $(gcc_compile) -c -O2 -DL_deregister_frame_info $< + +cxaf-stub.o: $(srcdir)/config/pa/stublib.c + $(gcc_compile) -c -O2 -DL_cxa_finalize $< + +jvrc-stub.o: $(srcdir)/config/pa/stublib.c + $(gcc_compile) -c -O2 -DL_Jv_RegisterClasses $< + pthread_default_stacksize_np-stub.o: $(srcdir)/config/pa/stublib.c $(gcc_compile) -c -O2 -DL_pthread_default_stacksize_np $< @@ -17,5 +30,5 @@ pthread_once-stub.o: $(srcdir)/config/pa/stublib.c libgcc_stub.a: $(LIBGCCSTUB_OBJS) -rm -rf $@ - $(AR) rc $@ $< + $(AR) rc $@ $(LIBGCCSTUB_OBJS) $(RANLIB) $@ diff --git a/libgcc/config/pa/t-stublib64 b/libgcc/config/pa/t-stublib64 deleted file mode 100644 index 5d0d968..0000000 --- a/libgcc/config/pa/t-stublib64 +++ /dev/null @@ -1,13 +0,0 @@ -LIBGCCSTUB_OBJS += rfi-stub.o dfi-stub.o jvrc-stub.o cxaf-stub.o - -rfi-stub.o: $(srcdir)/config/pa/stublib.c - $(gcc_compile) -c -O2 -DL_register_frame_info $< - -dfi-stub.o: $(srcdir)/config/pa/stublib.c - $(gcc_compile) -c -O2 -DL_deregister_frame_info $< - -cxaf-stub.o: $(srcdir)/config/pa/stublib.c - $(gcc_compile) -c -O2 -DL_cxa_finalize $< - -jvrc-stub.o: $(srcdir)/config/pa/stublib.c - $(gcc_compile) -c -O2 -DL_Jv_RegisterClasses $< |