1Fix build failure on x86_64
2
3When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
4only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
5opposite logic before.
6
7Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
8
9Upstream-Status: Pending
10---
11 configure.in |   12 ++++++------
12 1 files changed, 6 insertions(+), 6 deletions(-)
13
14Index: nspr/configure.in
15===================================================================
16--- nspr.orig/configure.in
17+++ nspr/configure.in
18@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve
19         PR_MD_ASFILES=os_Linux_ia64.s
20         ;;
21     x86_64)
22-        if test -n "$USE_64"; then
23-            PR_MD_ASFILES=os_Linux_x86_64.s
24-        elif test -n "$USE_X32"; then
25+        if test -n "$USE_X32"; then
26+            AC_DEFINE(i386)
27             PR_MD_ASFILES=os_Linux_x86_64.s
28             CC="$CC -mx32"
29             CXX="$CXX -mx32"
30         else
31-            AC_DEFINE(i386)
32-            PR_MD_ASFILES=os_Linux_x86.s
33-            CC="$CC -m32"
34-            CXX="$CXX -m32"
35+            PR_MD_ASFILES=os_Linux_x86_64.s
36         fi
37         ;;
38     ppc|powerpc)
39         PR_MD_ASFILES=os_Linux_ppc.s
40         ;;
41     powerpc64)
42-        if test -n "$USE_64"; then
43+        if test -n "$USE_N32"; then
44+            PR_MD_ASFILES=os_Linux_ppc.s
45+        else
46             CC="$CC -m64"
47             CXX="$CXX -m64"
48-        else
49-            PR_MD_ASFILES=os_Linux_ppc.s
50         fi
51         ;;
52     esac
53