diff options
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 7 | ||||
| -rw-r--r-- | libgcc/Makefile.in | 10 | ||||
| -rw-r--r-- | libgcc/config/arm/t-bpabi | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index e3f991d..3ec62d6 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2012-08-17 Julian Brown <julian@codesourcery.com> + + * Makefile.in (LIB2_DIVMOD_EXCEPTION_FLAGS): Default to + -fexceptions -fnon-call-exceptions if not defined. + ($(lib2-divmod-o), $(lib2-divmod-s-o)): Use above. + * config/arm/t-bpabi (LIB2_DIVMOD_EXCEPTION_FLAGS): Define. + 2012-08-17 Andreas Schwab <schwab@linux-m68k.org> * config/m68k/linux-atomic.c (__sync_lock_test_and_set_1): Fix diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index 4904a37..73f57d6 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -497,18 +497,24 @@ libgcc-s-objects += $(patsubst %,%_s$(objext),$(sifuncs) $(difuncs) $(tifuncs)) endif endif +ifeq ($(LIB2_DIVMOD_EXCEPTION_FLAGS),) +# Provide default flags for compiling divmod functions, if they haven't been +# set already by a target-specific Makefile fragment. +LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions -fnon-call-exceptions +endif + # Build LIB2_DIVMOD_FUNCS. lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS)) $(lib2-divmod-o): %$(objext): $(srcdir)/libgcc2.c $(gcc_compile) -DL$* -c $< \ - -fexceptions -fnon-call-exceptions $(vis_hide) + $(LIB2_DIVMOD_EXCEPTION_FLAGS) $(vis_hide) libgcc-objects += $(lib2-divmod-o) ifeq ($(enable_shared),yes) lib2-divmod-s-o = $(patsubst %,%_s$(objext),$(LIB2_DIVMOD_FUNCS)) $(lib2-divmod-s-o): %_s$(objext): $(srcdir)/libgcc2.c $(gcc_s_compile) -DL$* -c $< \ - -fexceptions -fnon-call-exceptions + $(LIB2_DIVMOD_EXCEPTION_FLAGS) libgcc-s-objects += $(lib2-divmod-s-o) endif diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi index e79cbd7..dddddc7 100644 --- a/libgcc/config/arm/t-bpabi +++ b/libgcc/config/arm/t-bpabi @@ -13,3 +13,8 @@ LIB2ADDEH = $(srcdir)/config/arm/unwind-arm.c \ # Add the BPABI names. SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver + +# On ARM, specifying -fnon-call-exceptions will needlessly pull in +# the unwinder in simple programs which use 64-bit division. Omitting +# the option is safe. +LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions |