On Sun, Apr 08, 2012 at 04:32:41PM +0200, Bernhard Walle wrote:
> See description of the patch that is added in localedef-eglibc-* in
> patches.

Thanks, applied.

Michael

> Signed-off-by: Bernhard Walle <[email protected]>
> ---
>  ...eam.h-Force-inlining-of-extern-inline-fun.patch |   38 
> ++++++++++++++++++++
>  patches/localedef-eglibc-2.14.1-r17443-ptx1/series |    4 +++
>  2 files changed, 42 insertions(+)
>  create mode 100644 
> patches/localedef-eglibc-2.14.1-r17443-ptx1/0001-argp-fmtstream.h-Force-inlining-of-extern-inline-fun.patch
>  create mode 100644 patches/localedef-eglibc-2.14.1-r17443-ptx1/series
> 
> diff --git 
> a/patches/localedef-eglibc-2.14.1-r17443-ptx1/0001-argp-fmtstream.h-Force-inlining-of-extern-inline-fun.patch
>  
> b/patches/localedef-eglibc-2.14.1-r17443-ptx1/0001-argp-fmtstream.h-Force-inlining-of-extern-inline-fun.patch
> new file mode 100644
> index 0000000..11c9e2c
> --- /dev/null
> +++ 
> b/patches/localedef-eglibc-2.14.1-r17443-ptx1/0001-argp-fmtstream.h-Force-inlining-of-extern-inline-fun.patch
> @@ -0,0 +1,38 @@
> +From e363247cae85b8c43d5d4cc8b0e188ff090942b1 Mon Sep 17 00:00:00 2001
> +From: Bernhard Walle <[email protected]>
> +Date: Sun, 8 Apr 2012 16:25:09 +0200
> +Subject: [PATCH] argp-fmtstream.h: Force inlining of 'extern inline'
> + functions
> +
> +LLVM GCC (at least i686-apple-darwin11-llvm-gcc-4.2) doesn't generate a
> +non-inlined version of argp_fmtstream_putc (even if compiled with -O2),
> +so linking the final program fails:
> +
> +------------------------------------------------------
> +Undefined symbols for architecture x86_64:
> +  "_argp_fmtstream_putc", referenced from:
> +      _usage_argful_short_opt in argp-help.o
> +      _argp_args_usage in argp-help.o
> +ld: symbol(s) not found for architecture x86_64
> +------------------------------------------------------
> +
> +FSF GCC doesn't have the problem, BTW.
> +
> +Signed-off-by: Bernhard Walle <[email protected]>
> +---
> + eglibc/argp/argp-fmtstream.h |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/eglibc/argp/argp-fmtstream.h b/eglibc/argp/argp-fmtstream.h
> +index f94207a..67d1ea2 100644
> +--- a/eglibc/argp/argp-fmtstream.h
> ++++ b/eglibc/argp/argp-fmtstream.h
> +@@ -203,7 +203,7 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t 
> __fs, size_t __amount);
> + #endif
> + 
> + #ifndef ARGP_FS_EI
> +-#define ARGP_FS_EI extern inline
> ++#define ARGP_FS_EI extern inline __attribute__ ((always_inline))
> + #endif
> + 
> + ARGP_FS_EI size_t
> diff --git a/patches/localedef-eglibc-2.14.1-r17443-ptx1/series 
> b/patches/localedef-eglibc-2.14.1-r17443-ptx1/series
> new file mode 100644
> index 0000000..59bd8c4
> --- /dev/null
> +++ b/patches/localedef-eglibc-2.14.1-r17443-ptx1/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-argp-fmtstream.h-Force-inlining-of-extern-inline-fun.patch
> +# d34ba91ca41689721674ab991d6febfc  - git-ptx-patches magic
> -- 
> 1.7.9.5
> 
> 
> -- 
> ptxdist mailing list
> [email protected]
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
[email protected]

Reply via email to