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 eddb3566ff5ec295f6f75457cba12f3afd3a6bcb..3bbeafe1d74a61d7a2574e89977fea9e522f6517 100644 (file)
--- 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 bba79b0be1af65422cf3d90926375f87c666a15f..23f29021ab29db168ecc13ee0fcdeb97f269ae03 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 3b49d0229e5f5fb7a1f4e745b9e34e7b2e1dae95..dab6a444833b9b1a43e8690e9a7c4cf80218b980 100644 (file)
--- 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 eed13348c4a47eb406f6ed11babb6c7977b66ed4..ca32e4666047ac35f7fac10eacbe231b29e01ce2 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 @LIB_crypt@
 

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 29b9226cfb599e93e988f396fb66b3bb47bdd2f0..f51ff6616505e0b0df384d38dc162315628d4976 100644 (file)
--- 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