Ticket #424: gcd2.patch

File gcd2.patch, 6.0 KB (added by dmharvey, 13 years ago)

fixed up various configuration/build files to work properly

  • configure 

    diff -u -r gmp-4.2.1-gcd1/configure gmp-4.2.1-gcd2/configure
    old new  
    2844328443  mul mul_fft mul_n mul_basecase sqr_basecase random random2 pow_1         \
    2844428444  rootrem sqrtrem get_str set_str scan0 scan1 popcount hamdist cmp perfsqr \
    2844528445  bdivmod gcd_1 gcd gcdext tdiv_qr dc_divrem_n sb_divrem_mn jacbase get_d  \
    28446   mullow_n mullow_basecase                                 \
     28446  mullow_n mullow_basecase hgcd hgcd2 qstack                               \
    2844728447  $gmp_mpn_functions_optional"
    2844828448
    2844928449

  • configure.in 

    diff -u -r gmp-4.2.1-gcd1/configure.in gmp-4.2.1-gcd2/configure.in
    old new  
    23822382  mul mul_fft mul_n mul_basecase sqr_basecase random random2 pow_1         \
    23832383  rootrem sqrtrem get_str set_str scan0 scan1 popcount hamdist cmp perfsqr \
    23842384  bdivmod gcd_1 gcd gcdext tdiv_qr dc_divrem_n sb_divrem_mn jacbase get_d  \
    2385   mullow_n mullow_basecase                                 \
     2385  mullow_n mullow_basecase hgcd hgcd2 qstack                               \
    23862386  $gmp_mpn_functions_optional"
    23872387
    23882388define(GMP_MULFUNC_CHOICES,

  • mpn/Makefile.am 

    diff -u -r gmp-4.2.1-gcd1/mpn/Makefile.am gmp-4.2.1-gcd2/mpn/Makefile.am
    old new  
    4141  dc_divrem_n.c dive_1.c diveby3.c divis.c divrem.c divrem_1.c divrem_2.c   \
    4242  dump.c fib2_ui.c gcd.c                                                    \
    4343  gcd_finda.c gcd_1.c gcdext.c get_d.c get_str.c                            \
    44   hamdist.c invert_limb.c                                   \
     44  hamdist.c hgcd.c hgcd2.c invert_limb.c                                    \
    4545  ior_n.c iorn_n.c jacbase.c lshift.c mod_1.c mod_34lsub1.c mode1o.c        \
    4646  mul.c mul_1.c mul_2.c mul_fft.c mul_n.c mul_basecase.c                    \
    4747  mullow_n.c mullow_basecase.c nand_n.c nior_n.c perfsqr.c popcount.c       \
    48   pre_divrem_1.c pre_mod_1.c pow_1.c random.c random2.c rshift.c   \
     48  pre_divrem_1.c pre_mod_1.c pow_1.c qstack.c random.c random2.c rshift.c   \
    4949  rootrem.c sb_divrem_mn.c scan0.c scan1.c set_str.c                        \
    5050  sqr_basecase.c sqr_diagonal.c                                             \
    5151  sqrtrem.c sub.c sub_1.c sub_n.c submul_1.c                                \

  • mpn/Makefile.in 

    diff -u -r gmp-4.2.1-gcd1/mpn/Makefile.in gmp-4.2.1-gcd2/mpn/Makefile.in
    old new  
    267267  dc_divrem_n.c dive_1.c diveby3.c divis.c divrem.c divrem_1.c divrem_2.c   \
    268268  dump.c fib2_ui.c gcd.c                                                    \
    269269  gcd_finda.c gcd_1.c gcdext.c get_d.c get_str.c                            \
    270   hamdist.c invert_limb.c                                   \
     270  hamdist.c hgcd.c hgcd2.c invert_limb.c                                    \
    271271  ior_n.c iorn_n.c jacbase.c lshift.c mod_1.c mod_34lsub1.c mode1o.c        \
    272272  mul.c mul_1.c mul_2.c mul_fft.c mul_n.c mul_basecase.c                    \
    273273  mullow_n.c mullow_basecase.c nand_n.c nior_n.c perfsqr.c popcount.c       \
    274   pre_divrem_1.c pre_mod_1.c pow_1.c random.c random2.c rshift.c   \
     274  pre_divrem_1.c pre_mod_1.c pow_1.c qstack.c random.c random2.c rshift.c   \
    275275  rootrem.c sb_divrem_mn.c scan0.c scan1.c set_str.c                        \
    276276  sqr_basecase.c sqr_diagonal.c                                             \
    277277  sqrtrem.c sub.c sub_1.c sub_n.c submul_1.c                                \
    … …  
    449449        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/get_str.c; then echo $(srcdir)/get_str.c; else echo get_str.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
    450450hamdist_.c: hamdist.c $(ANSI2KNR)
    451451        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hamdist.c; then echo $(srcdir)/hamdist.c; else echo hamdist.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
     452hgcd_.c: hgcd.c $(ANSI2KNR)
     453        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hgcd.c; then echo $(srcdir)/hgcd.c; else echo hgcd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
     454hgcd2_.c: hgcd2.c $(ANSI2KNR)
     455        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hgcd2.c; then echo $(srcdir)/hgcd2.c; else echo hgcd2.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
    452456invert_limb_.c: invert_limb.c $(ANSI2KNR)
    453457        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/invert_limb.c; then echo $(srcdir)/invert_limb.c; else echo invert_limb.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
    454458ior_n_.c: ior_n.c $(ANSI2KNR)
    … …  
    497501        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/pre_divrem_1.c; then echo $(srcdir)/pre_divrem_1.c; else echo pre_divrem_1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
    498502pre_mod_1_.c: pre_mod_1.c $(ANSI2KNR)
    499503        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/pre_mod_1.c; then echo $(srcdir)/pre_mod_1.c; else echo pre_mod_1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
     504qstack_.c: qstack.c $(ANSI2KNR)
     505        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/qstack.c; then echo $(srcdir)/qstack.c; else echo qstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
    500506random_.c: random.c $(ANSI2KNR)
    501507        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/random.c; then echo $(srcdir)/random.c; else echo random.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
    502508random2_.c: random2.c $(ANSI2KNR)
    … …  
    553559gcd_.$(OBJEXT) gcd_.lo gcd_1_.$(OBJEXT) gcd_1_.lo gcd_finda_.$(OBJEXT) \
    554560gcd_finda_.lo gcdext_.$(OBJEXT) gcdext_.lo get_d_.$(OBJEXT) get_d_.lo \
    555561get_str_.$(OBJEXT) get_str_.lo hamdist_.$(OBJEXT) hamdist_.lo \
     562hgcd_.$(OBJEXT) hgcd_.lo \
     563hgcd2_.$(OBJEXT) hgcd2_.lo \
     564qstack_.$(OBJEXT) qstack_.lo \
    556565invert_limb_.$(OBJEXT) invert_limb_.lo ior_n_.$(OBJEXT) ior_n_.lo \
    557566iorn_n_.$(OBJEXT) iorn_n_.lo jacbase_.$(OBJEXT) jacbase_.lo \
    558567lshift_.$(OBJEXT) lshift_.lo mod_1_.$(OBJEXT) mod_1_.lo \