From: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Date: Mon, 5 Sep 2011 13:26:32 +0000 (-0400)
Subject: ppc64_linux26: build binaries as 64-bit by default
X-Git-Tag: openafs-devel-1_7_1~55
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=39b788eeafe27d21ae6b4fd3cfeb59ce5dc70077

ppc64_linux26: build binaries as 64-bit by default

lwp doesnt work since ucontext/setjmp are incomplete when running 32-bit
binaries with the 64-bit kernel.

Change-Id: I9c52d9d934638075fc1693ed94f20665822e5e6e
Reviewed-on: http://gerrit.openafs.org/5365
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index eddb356..3bbeafe 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -237,7 +237,10 @@ case $AFS_SYSNAME in
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
 		SHLIB_CFLAGS="-fPIC"
-		SHLIB_LINKER="${MT_CC} -shared"
+		SHLIB_LINKER="${MT_CC} -shared -m64"
+		XCFLAGS="-m64"
+		XLDFLAGS="-m64"
+		ASFLAGS="-a64"
 		;;
 
 	i386_linux*)
@@ -756,6 +759,7 @@ AC_SUBST(AIX32)
 AC_SUBST(AIX64)
 AC_SUBST(AR)
 AC_SUBST(AS)
+AC_SUBST(ASFLAGS)
 AC_SUBST(CP)
 AC_SUBST(DBG)
 AC_SUBST(FSINCLUDES)
diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index bba79b0..23f2902 100644
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -32,6 +32,7 @@ viceetcdir=@viceetcdir@/
 #
 AR = @AR@
 AS = @AS@
+ASFLAGS = @ASFLAGS@
 AFSD_LIBS = @AFSD_LIBS@
 AFSD_LDFLAGS = @AFSD_LDFLAGS@
 CC = @CC@
diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 3b49d02..dab6a44 100644
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -294,7 +294,7 @@ syscall.o: ${SYS}/syscall.s
 	        ${CC} ${AFS_CFLAGS} -c syscall.c;; \
 	 *) \
 		$(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
-		as -o syscall.o syscall.ss;		\
+		as $(ASFLAGS) -o syscall.o syscall.ss;		\
 		$(RM) syscall.ss;;				\
 	esac
 
diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in
index eed1334..ca32e46 100644
--- a/src/libuafs/MakefileProto.LINUX.in
+++ b/src/libuafs/MakefileProto.LINUX.in
@@ -31,7 +31,7 @@ CFLAGS+= -I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) $
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
-TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_LINUX22_ENV
+TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_LINUX22_ENV $(XCFLAGS)
 TEST_LDFLAGS=
 TEST_LIBS=-lpthread @LIB_crypt@
 
diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 29b9226..f51ff66 100644
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -302,7 +302,7 @@ syscall.o: ${SYS}/syscall.s
 	        ${CC} ${AFS_CFLAGS} -c syscall.c;; \
 	 *) \
 		$(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
-		as -o syscall.o syscall.ss;		\
+		as $(ASFLAGS) -o syscall.o syscall.ss;		\
 		$(RM) syscall.ss;;				\
 	esac