From: Jim Meyering Date: Sat, 20 Mar 2010 12:05:58 +0000 (+0100) Subject: use assembly code matcher when possible X-Git-Tag: v1.5~93 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=61af16213a488af3a8e994399ebd0859d390edb6;p=debian%2Fgzip use assembly code matcher when possible * configure.ac (ASCPPPOST): Backslash-escape "#" in AC_SUBST'd variable, to keep make from seeing it as a comment-introducer. Based on a patch by Petr Pisar. * lib/Makefile.am (match.$(OBJEXT)): Use AM_V_GEN and AM_V_at. * lib/match.c: Don't include . It would impede configure-time assembler test. * .x-sc_require_config_h: Exempt lib/match.c from syntax-check. * .x-sc_require_config_h_first: Likewise. --- diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h new file mode 100644 index 0000000..a89d68c --- /dev/null +++ b/.x-sc_require_config_h @@ -0,0 +1 @@ +lib/match\.c diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first new file mode 100644 index 0000000..a89d68c --- /dev/null +++ b/.x-sc_require_config_h_first @@ -0,0 +1 @@ +lib/match\.c diff --git a/THANKS b/THANKS index a69f832..713558b 100644 --- a/THANKS +++ b/THANKS @@ -204,6 +204,7 @@ Pascal Petit petit@cadillac.ibp.fr Bruno Pillard bp@chorus.fr Franc,ois Pinard pinard@iro.umontreal.ca Jay Pinkos pinkos@butyng.bu.edu +Petr Písař petr.pisar@atlas.cz Thomas Plass thomas@cogsci.ed.ac.uk Mike Polo mikep@cfsmo.honeywell.com Francesco Potorti pot@fly.cnuce.cnr.it diff --git a/configure.ac b/configure.ac index e9246e3..39c6d52 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,7 @@ if test "$gl_gcc_warnings" = yes; then fi # cc -E produces incorrect asm files on SVR4, so postprocess it. -ASCPPPOST="sed '/^ *#/d; s,//.*,,; s/% /%/g; s/\\. /./g'" +ASCPPPOST="sed '/^ *\\#/d; s,//.*,,; s/% /%/g; s/\\. /./g'" AC_SUBST([ASCPPPOST]) AC_CACHE_CHECK([for underline in external names], [gzip_cv_underline], diff --git a/lib/Makefile.am b/lib/Makefile.am index 6f4f55e..b4c105c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -24,11 +24,11 @@ libgzip_a_DEPENDENCIES += $(LIBOBJS) AM_CFLAGS += $(WARN_CFLAGS) $(WERROR_CFLAGS) match.$(OBJEXT): match.c - cp $(srcdir)/match.c _match.S - $(CPP) $(CPPFLAGS) $(ASCPPFLAGS) _match.S > _match.i - $(ASCPPPOST) < _match.i > match_.s - $(CC) $(CPPFLAGS) $(CFLAGS) $(ASFLAGS_config) -c match_.s - mv match_.$(OBJEXT) $@ - rm -f _match.S _match.i match_.s + $(AM_V_GEN)cp $(srcdir)/match.c _match.S + $(AM_V_at)$(CPP) $(CPPFLAGS) $(ASCPPFLAGS) _match.S > _match.i + $(AM_V_at)$(ASCPPPOST) < _match.i > match_.s + $(AM_V_at)$(CC) $(CPPFLAGS) $(CFLAGS) $(ASFLAGS_config) -c match_.s + $(AM_V_at)mv match_.$(OBJEXT) $@ + $(AM_V_at)rm -f _match.S _match.i match_.s MOSTLYCLEANFILES += _match.S _match.i match_.s diff --git a/lib/match.c b/lib/match.c index 4ef6128..5dd8d64 100644 --- a/lib/match.c +++ b/lib/match.c @@ -28,8 +28,6 @@ * David Mosberger-Tang . */ -#include - /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix * external symbols with an underline character '_'. */