diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2012-04-08 16:32:41 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-04-17 10:38:11 +0200 |
| commit | 7fed33e327b64c2f11bafb9dd70894b295586851 (patch) | |
| tree | 9836159bf57eca6e659450a19999cb5d043ca409 /patches/localedef-eglibc-2.14.1-r17443-ptx1 | |
| parent | 145928050e3222d577f1e130317b540f5db05e14 (diff) | |
| download | ptxdist-7fed33e327b64c2f11bafb9dd70894b295586851.tar.gz ptxdist-7fed33e327b64c2f11bafb9dd70894b295586851.tar.xz | |
host-localedef: Fix build with LLVM GCC
See description of the patch that is added in localedef-eglibc-* in
patches.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/localedef-eglibc-2.14.1-r17443-ptx1')
| -rw-r--r-- | patches/localedef-eglibc-2.14.1-r17443-ptx1/0001-argp-fmtstream.h-Force-inlining-of-extern-inline-fun.patch | 38 | ||||
| -rw-r--r-- | patches/localedef-eglibc-2.14.1-r17443-ptx1/series | 4 |
2 files changed, 42 insertions, 0 deletions
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 000000000..11c9e2caf --- /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 <bernhard@bwalle.de> +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 <bernhard@bwalle.de> +--- + 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 000000000..59bd8c47e --- /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 |