From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14169 invoked by alias); 18 Nov 2014 10:17:53 -0000 Mailing-List: contact libffi-discuss-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libffi-discuss-owner@sourceware.org Received: (qmail 14154 invoked by uid 89); 18 Nov 2014 10:17:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp14.uk.ibm.com Received: from e06smtp14.uk.ibm.com (HELO e06smtp14.uk.ibm.com) (195.75.94.110) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 18 Nov 2014 10:17:50 +0000 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Nov 2014 10:17:47 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 18 Nov 2014 10:17:45 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 388F6219004D for ; Tue, 18 Nov 2014 10:17:18 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sAIAHi049175496 for ; Tue, 18 Nov 2014 10:17:44 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sAIAHigJ020957 for ; Tue, 18 Nov 2014 03:17:44 -0700 Received: from bl3ahm9f.de.ibm.com (dyn-9-152-212-122.boeblingen.de.ibm.com [9.152.212.122]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id sAIAHiQT020949 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO) for ; Tue, 18 Nov 2014 03:17:44 -0700 Received: from dvogt by bl3ahm9f.de.ibm.com with local (Exim 4.76) (envelope-from ) id 1Xqfqx-0007Da-M4; Tue, 18 Nov 2014 11:17:43 +0100 Date: Tue, 18 Nov 2014 10:17:00 -0000 From: Dominik Vogt To: libffi-discuss@sourceware.org Subject: [PATCH 0/7] Merge of gcc patches Message-ID: <20141118101743.GA26714@linux.vnet.ibm.com> Reply-To: libffi-discuss@sourceware.org Mail-Followup-To: libffi-discuss@sourceware.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="EVF5PPMfhYS0aIcm" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14111810-0017-0000-0000-000001E071E4 X-IsSubscribed: yes X-SW-Source: 2014/txt/msg00224.txt.bz2 --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 812 The following series of patches merges the changes in gcc's copy of libffi since this gcc-commit: 2012-12-26 16:28 green * libffi merge While I've tried to resolve conflicts in a sensible way, I've not made any effort to check what the patches do or whether they are (still) useful, so please double check before checking in. libffi still compiles after applying the patches 1 to 7 (without path "0", see below), but I've not run any tests. The "zeroth" patch is attached right to this message. To me it looks like a patch that is applied to gcc every time libffi is merged, but there may be unrelated bits; I cannot judge that. (The patch conflicts with a later patch in the series, but the conflict is easy to resolve.) Ciao Dominik ^_^ ^_^ -- Dominik Vogt IBM Germany --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=0000-ChangeLog Content-length: 600 ChangeLog 2012-12-29 Andreas Schwab * Makefile.am (ACLOCAL_AMFLAGS, TEXINFO_TEX, MAKEINFOFLAGS) (STAMP_GENINSRC, STAMP_BUILD_INFO, CLEANFILES) (MAINTAINERCLEANFILES): Define. (all-local, stamp-geninsrc, stamp-build-info): New targets. (doc/libffi.info): Depend on $(STAMP_BUILD_INFO) * configure.ac: Check for modern makeinfo. Add support for --enable-generated-files-in-srcdir. * mdate-sh: New file. * testsuite/lib/libffi.exp (load_gcc_lib): Load from gcc testsuite lib dir. (libffi-init): Properly set library paths for multilibs and add path to libstdc++. --EVF5PPMfhYS0aIcm Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0000-Makefile.am-ACLOCAL_AMFLAGS-TEXINFO_TEX-MAKEINFOFLAG.patch" Content-length: 5945 >From 84a69f2b23cf7d2ec83d02bb1ea65a9b2a3b7de8 Mon Sep 17 00:00:00 2001 From: schwab Date: Sat, 29 Dec 2012 16:25:27 +0000 Subject: [PATCH "0"/7] * Makefile.am (ACLOCAL_AMFLAGS, TEXINFO_TEX, MAKEINFOFLAGS) (STAMP_GENINSRC, STAMP_BUILD_INFO, CLEANFILES) (MAINTAINERCLEANFILES): Define. (all-local, stamp-geninsrc, stamp-build-info): New targets. (doc/libffi.info): Depend on $(STAMP_BUILD_INFO) * configure.ac: Check for modern makeinfo. Add support for --enable-generated-files-in-srcdir. * mdate-sh: New file. * testsuite/lib/libffi.exp (load_gcc_lib): Load from gcc testsuite lib dir. (libffi-init): Properly set library paths for multilibs and add path to libstdc++. --- Makefile.am | 41 ++++++++++++++++++++++++++++++++++++++++- configure.ac | 25 +++++++++++++++++++++++++ testsuite/lib/libffi.exp | 10 ++++++++-- 3 files changed, 73 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0e40451..c200efa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 -I .. -I ../config SUBDIRS = include testsuite man @@ -53,8 +53,47 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj \ libffi.xcodeproj/project.pbxproj src/arm/trampoline.S \ libtool-ldflags ChangeLog.libffi-3.1 +# Automake Documentation: +# If your package has Texinfo files in many directories, you can use the +# variable TEXINFO_TEX to tell Automake where to find the canonical +# `texinfo.tex' for your package. The value of this variable should be +# the relative path from the current `Makefile.am' to `texinfo.tex'. +TEXINFO_TEX = ../gcc/doc/include/texinfo.tex + +# Defines info, dvi, pdf and html targets +MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include info_TEXINFOS = doc/libffi.texi +# AM_CONDITIONAL on configure option --generated-files-in-srcdir +if GENINSRC +STAMP_GENINSRC = stamp-geninsrc +else +STAMP_GENINSRC = +endif + +# AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) +if BUILD_INFO +STAMP_BUILD_INFO = stamp-build-info +else +STAMP_BUILD_INFO = +endif + +all-local: $(STAMP_GENINSRC) + +stamp-geninsrc: doc/libffi.info + cp -p $(top_builddir)/doc/libffi.info $(srcdir)/doc/libffi.info + @touch $@ + +doc/libffi.info: $(STAMP_BUILD_INFO) + +stamp-build-info: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)/doc -o doc/libffi.info $(srcdir)/doc/libffi.texi + @touch $@ + + +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) doc/libffi.info +MAINTAINERCLEANFILES = $(srcdir)/doc/libffi.info + ## ################################################################ ## diff --git a/configure.ac b/configure.ac index 4a44bff..6889311 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,31 @@ AX_ENABLE_BUILDDIR AM_INIT_AUTOMAKE +# See if makeinfo has been installed and is modern enough +# that we can use it. +ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version], + [GNU texinfo.* \([0-9][0-9.]*\)], + [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) +AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes") + +# We would like our source tree to be readonly. However when releases or +# pre-releases are generated, the flex/bison generated files as well as the +# various formats of manuals need to be included along with the rest of the +# sources. Therefore we have --enable-generated-files-in-srcdir to do +# just that. +AC_MSG_CHECKING(generated-files-in-srcdir) +AC_ARG_ENABLE(generated-files-in-srcdir, +AS_HELP_STRING([--enable-generated-files-in-srcdir], + [put copies of generated files in source dir intended for creating source tarballs for users without texinfo bison or flex]), +[case "$enableval" in + yes) enable_generated_files_in_srcdir=yes ;; + no) enable_generated_files_in_srcdir=no ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);; + esac], +[enable_generated_files_in_srcdir=no]) +AC_MSG_RESULT($enable_generated_files_in_srcdir) +AM_CONDITIONAL(GENINSRC, test "$enable_generated_files_in_srcdir" = yes) + # The same as in boehm-gc and libstdc++. Have to borrow it from there. # We must force CC to /not/ be precious variables; otherwise # the wrong, non-multilib-adjusted value will be used in multilibs. diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp index 5051d31..b981473 100644 --- a/testsuite/lib/libffi.exp +++ b/testsuite/lib/libffi.exp @@ -16,7 +16,7 @@ proc load_gcc_lib { filename } { global srcdir - load_file $srcdir/lib/$filename + load_file $srcdir/../../gcc/testsuite/lib/$filename } load_lib dg.exp @@ -94,6 +94,7 @@ proc libffi-init { args } { global srcdir global blddirffi global objdir + global blddircxx global TOOL_OPTIONS global tool global libffi_include @@ -103,8 +104,10 @@ proc libffi-init { args } { global using_gcc - set blddirffi [pwd]/.. + set blddirffi [lookfor_file [get_multilibs] libffi] verbose "libffi $blddirffi" + set blddircxx [lookfor_file [get_multilibs] libstdc++-v3] + verbose "libstdc++ $blddircxx" # Are we building with GCC? set tmp [grep ../config.status "GCC='yes'"] @@ -144,6 +147,8 @@ proc libffi-init { args } { # add the library path for libffi. append ld_library_path ":${blddirffi}/.libs" + # add the library path for libstdc++ as well. + append ld_library_path ":${blddircxx}/src/.libs" verbose "ld_library_path: $ld_library_path" @@ -156,6 +161,7 @@ proc libffi-init { args } { if { $libffi_dir != "" } { set libffi_dir [file dirname ${libffi_dir}] set libffi_link_flags "-L${libffi_dir}/.libs" + lappend libffi_link_flags "-L${blddircxx}/src/.libs" } set_ld_library_path_env_vars -- 1.8.4.2 --EVF5PPMfhYS0aIcm--