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.

Reviewed-on: http://gerrit.openafs.org/5365
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 39b788eeafe27d21ae6b4fd3cfeb59ce5dc70077)

Change-Id: Ic4fd5c1a861db8e96dd58a79d7fb2ea73ab4f0d6
Reviewed-on: http://gerrit.openafs.org/9605
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 0c2faff3382e3c7229ffb66ab6708fbdb0fcf273..4eff08ec64f86691fc73bfc5862c3a15c0cc80c2 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -258,8 +258,11 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_CFLAGS="-fPIC"
-               XCFLAGS="-D_LARGEFILE64_SOURCE -fPIC"
+               XCFLAGS="-D_LARGEFILE64_SOURCE -fPIC -m64"
                SHLIB_LINKER="${MT_CC} -shared"
+               SHLIB_LINKER="${MT_CC} -shared -m64"
+               XLDFLAGS="-m64"
+               ASFLAGS="-a64"
                ;;
 
        i386_linux*)
@@ -831,6 +834,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 5a6ea7c6e7d9c993ad0b09439f121f0eea3e4419..22077a4c2be4d58b487a6518d84c405f14bfc4f6 100644 (file)
--- 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 7db4ab88287ed8c156c6eabe6f9aa83a540f706e..54707caedd97cfb8eea0dd22e056677274d7984c 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -389,7 +389,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 fe14f9ae1a31bfb03cd424393bc9db0e58ed1963..944511925015bde81a5bbf7e1db06e1850d912fc 100644 (file)
--- 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
 

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 3f7223c84aac8d9cc7985199af8f909a965539fa..eb6832ef4d278a57a54d921c059fbd2a34ffe2bd 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -404,7 +404,7 @@ syscall.o: ${SYS}/syscall.s
                 ${CC} ${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