| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | From df2cd898e48208f26320d40c3ed6b19c75c27142 Mon Sep 17 00:00:00 2001 |
| 2 | From: Marek Vasut <marex@denx.de> |
| 3 | Date: Thu, 17 Sep 2015 00:43:15 +0200 |
| 4 | Subject: [PATCH] libtool: Fix support for NIOS2 processor |
| 5 | |
| 6 | The name of the system contains the string "nios2". This string |
| 7 | is caught by the some of the greedy checks for OS/2 in libtool, |
| 8 | in particular the *os2* branches of switch statements match for |
| 9 | the nios2 string, which results in incorrect behavior of libtool. |
| 10 | |
| 11 | This patch adds an explicit check for *nios2* before the *os2* |
| 12 | checks to prevent the OS/2 check incorrectly trapping the nios2 |
| 13 | as well. |
| 14 | |
| 15 | Signed-off-by: Marek Vasut <marex@denx.de> |
| 16 | Upstream-Status: Submitted |
| 17 | --- |
| 18 | build-aux/ltmain.in | 20 ++++++++++++++++++++ |
| 19 | 1 file changed, 20 insertions(+) |
| 20 | |
| 21 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
| 22 | index d5cf07a..4164284 100644 |
| 23 | --- a/build-aux/ltmain.in |
| 24 | +++ b/build-aux/ltmain.in |
| 25 | @@ -504,6 +504,12 @@ libtool_validate_options () |
| 26 | test : = "$debug_cmd" || func_append preserve_args " --debug" |
| 27 | |
| 28 | case $host in |
| 29 | + # For NIOS2, we want to make sure that it's not caught by the |
| 30 | + # more general OS/2 check below. Otherwise, NIOS2 is the same |
| 31 | + # as the default option. |
| 32 | + *nios2*) |
| 33 | + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps |
| 34 | + ;; |
| 35 | # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 |
| 36 | # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 |
| 37 | *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) |
| 38 | @@ -6220,6 +6226,15 @@ func_mode_link () |
| 39 | if test -n "$library_names" && |
| 40 | { test no = "$use_static_libs" || test -z "$old_library"; }; then |
| 41 | case $host in |
| 42 | + *nios2*) |
| 43 | + # For NIOS2, we want to make sure that it's not caught by the |
| 44 | + # more general OS/2 check below. Otherwise, NIOS2 is the same |
| 45 | + # as the default option. |
| 46 | + if test no = "$installed"; then |
| 47 | + func_append notinst_deplibs " $lib" |
| 48 | + need_relink=yes |
| 49 | + fi |
| 50 | + ;; |
| 51 | *cygwin* | *mingw* | *cegcc* | *os2*) |
| 52 | # No point in relinking DLLs because paths are not encoded |
| 53 | func_append notinst_deplibs " $lib" |
| 54 | @@ -6290,6 +6305,11 @@ func_mode_link () |
| 55 | elif test -n "$soname_spec"; then |
| 56 | # bleh windows |
| 57 | case $host in |
| 58 | + *nios2*) |
| 59 | + # For NIOS2, we want to make sure that it's not caught by the |
| 60 | + # more general OS/2 check below. Otherwise, NIOS2 is the same |
| 61 | + # as the default option. |
| 62 | + ;; |
| 63 | *cygwin* | mingw* | *cegcc* | *os2*) |
| 64 | func_arith $current - $age |
| 65 | major=$func_arith_result |
| 66 | -- |
| 67 | 2.5.1 |
| 68 | |