From owner-svn-src-user@FreeBSD.ORG Wed Jun 29 16:58:27 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8C62106566C; Wed, 29 Jun 2011 16:58:27 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AE2D48FC0C; Wed, 29 Jun 2011 16:58:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5TGwRfH006218; Wed, 29 Jun 2011 16:58:27 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5TGwRnF006211; Wed, 29 Jun 2011 16:58:27 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201106291658.p5TGwRnF006211@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 29 Jun 2011 16:58:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223680 - in user/gabor/tre-integration: contrib/tre/lib lib/libc/regex lib/libregex X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2011 16:58:27 -0000 Author: gabor Date: Wed Jun 29 16:58:27 2011 New Revision: 223680 URL: http://svn.freebsd.org/changeset/base/223680 Log: - Add new files to the build - Let the build system control whether symbols are exported as weak references and build libc with weak references and libregex with normal symbols Modified: user/gabor/tre-integration/contrib/tre/lib/regcomp.c user/gabor/tre-integration/contrib/tre/lib/regerror.c user/gabor/tre-integration/contrib/tre/lib/regexec.c user/gabor/tre-integration/contrib/tre/lib/tre.h user/gabor/tre-integration/lib/libc/regex/Makefile.inc user/gabor/tre-integration/lib/libregex/Makefile Modified: user/gabor/tre-integration/contrib/tre/lib/regcomp.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/regcomp.c Wed Jun 29 16:46:12 2011 (r223679) +++ user/gabor/tre-integration/contrib/tre/lib/regcomp.c Wed Jun 29 16:58:27 2011 (r223680) @@ -18,11 +18,13 @@ #include "tre.h" #include "xmalloc.h" +#ifdef TRE_WEAK_REF __weak_reference(tre_regcomp, regcomp); __weak_reference(tre_regncomp, regncomp); __weak_reference(tre_regwcomp, regwcomp); __weak_reference(tre_regwncomp, regwncomp); __weak_reference(tre_regfree, regfree); +#endif int tre_regncomp(regex_t *preg, const char *regex, size_t n, int cflags) Modified: user/gabor/tre-integration/contrib/tre/lib/regerror.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/regerror.c Wed Jun 29 16:46:12 2011 (r223679) +++ user/gabor/tre-integration/contrib/tre/lib/regerror.c Wed Jun 29 16:58:27 2011 (r223680) @@ -28,7 +28,9 @@ #define gettext(s) s #endif +#ifdef TRE_WEAK_REF __weak_reference(tre_regerror, regerror); +#endif #define _(String) dgettext(PACKAGE, String) #define gettext_noop(String) String Modified: user/gabor/tre-integration/contrib/tre/lib/regexec.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/regexec.c Wed Jun 29 16:46:12 2011 (r223679) +++ user/gabor/tre-integration/contrib/tre/lib/regexec.c Wed Jun 29 16:58:27 2011 (r223680) @@ -48,6 +48,7 @@ char *alloca (); #include "tre.h" #include "xmalloc.h" +#ifdef TRE_WEAK_REF __weak_reference(tre_regexec, regexec); __weak_reference(tre_regnexec, regnexec); __weak_reference(tre_regwexec, regwexec); @@ -57,6 +58,7 @@ __weak_reference(tre_regaexec, regaexec) __weak_reference(tre_reganexec, reganexec); __weak_reference(tre_regawexec, regawexec); __weak_reference(tre_regawnexec, regawnexec); +#endif /* Fills the POSIX.2 regmatch_t array according to the TNFA tag and match endpoint values. */ Modified: user/gabor/tre-integration/contrib/tre/lib/tre.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre.h Wed Jun 29 16:46:12 2011 (r223679) +++ user/gabor/tre-integration/contrib/tre/lib/tre.h Wed Jun 29 16:58:27 2011 (r223680) @@ -23,6 +23,24 @@ extern "C" { #endif +#ifndef TRE_WEAK_REF +#define tre_regcomp regcomp +#define tre_regerror regerror +#define tre_regexec regexec +#define tre_regfree regfree +#define tre_regaexec regaexec +#define tre_reganexec reganexec +#define tre_regawexec regawexec +#define tre_regawnexec regawnexec +#define tre_regncomp regncomp +#define tre_regnexec regnexec +#define tre_regwcomp regwcomp +#define tre_regwexec regwexec +#define tre_regwncomp regwncomp +#define tre_regwnexec regwnexec +#define tre_reguexec reguexec +#endif + /* If the we're not using system regex.h, we need to define the structs and enums ourselves. */ Modified: user/gabor/tre-integration/lib/libc/regex/Makefile.inc ============================================================================== --- user/gabor/tre-integration/lib/libc/regex/Makefile.inc Wed Jun 29 16:46:12 2011 (r223679) +++ user/gabor/tre-integration/lib/libc/regex/Makefile.inc Wed Jun 29 16:58:27 2011 (r223680) @@ -3,9 +3,10 @@ .PATH: ${.CURDIR}/../../contrib/tre/lib ${.CURDIR}/regex -CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../contrib/tre +CFLAGS+=-DHAVE_CONFIG_H -DTRE_WEAK_REF -I${.CURDIR}/../../contrib/tre -SRCS+= regcomp.c regerror.c regexec.c tre-ast.c tre-compile.c \ +SRCS+= fastmatch.c hashtable.c \ + regcomp.c regerror.c regexec.c tre-ast.c tre-compile.c \ tre-match-approx.c tre-match-backtrack.c tre-match-parallel.c \ tre-mem.c tre-parse.c tre-stack.c xmalloc.c Modified: user/gabor/tre-integration/lib/libregex/Makefile ============================================================================== --- user/gabor/tre-integration/lib/libregex/Makefile Wed Jun 29 16:46:12 2011 (r223679) +++ user/gabor/tre-integration/lib/libregex/Makefile Wed Jun 29 16:58:27 2011 (r223680) @@ -11,7 +11,8 @@ WARNS?= 6 CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../contrib/tre/lib \ -I${.CURDIR}/../../include -SRCS= regcomp.c regerror.c regexec.c tre-ast.c tre-compile.c \ +SRCS= fastmatch.c hashtable.c \ + regcomp.c regerror.c regexec.c tre-ast.c tre-compile.c \ tre-match-approx.c tre-match-backtrack.c tre-match-parallel.c \ tre-mem.c tre-parse.c tre-stack.c xmalloc.c