From 14466b156ca5b46b2b43ef483aa14018cc4542a2 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Thu, 19 Dec 2013 21:14:57 +0100 Subject: added crosscompiling support to apbuild and pluginfo --- tools/apbuild/apinit | 10 +++++++--- tools/apbuild/apsymbols.h.i686 | 1 + tools/pluginfo/Makefile | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/apbuild/apinit b/tools/apbuild/apinit index 37892303..fd0642fe 100755 --- a/tools/apbuild/apinit +++ b/tools/apbuild/apinit @@ -2,8 +2,12 @@ use warnings; use strict; -my $arch=`uname -m`; -chomp $arch; -`cp apsymbols.h.$arch apsymbols.h`; +my $ARCH = $ENV{ARCH}; +if (!defined $ARCH) { + print "apinit: ARCH is not set\n"; + exit -1; +} + +`cp apsymbols.h.$ARCH apsymbols.h`; diff --git a/tools/apbuild/apsymbols.h.i686 b/tools/apbuild/apsymbols.h.i686 index 4a4727b2..67021823 100644 --- a/tools/apbuild/apsymbols.h.i686 +++ b/tools/apbuild/apsymbols.h.i686 @@ -6,6 +6,7 @@ APBUILD_NOTE_METADATA("apbuild.version=" APBUILD_VERSION); #endif /* apbuild generated symbol exclusion list */ +__asm__(".symver __ctype_toupper,__ctype_toupper@GLIBC2.0"); __asm__(".symver memcpy,memcpy@GLIBC_2.0"); __asm__(".symver _sys_errlist,_sys_errlist@GLIBC_2.0"); __asm__(".symver _sys_nerr,_sys_nerr@GLIBC_2.0"); diff --git a/tools/pluginfo/Makefile b/tools/pluginfo/Makefile index 2cf009eb..e8ec4e29 100644 --- a/tools/pluginfo/Makefile +++ b/tools/pluginfo/Makefile @@ -3,7 +3,10 @@ CFLAGS=-Wall LDFLAGS=-lpthread -ldl -lm all: - $(CC) $(CFLAGS) pluginfo.c $(LDFLAGS) -o pluginfo + mkdir x86_64 + mkdir i686 + $(CC) -m32 $(CFLAGS) pluginfo.c $(LDFLAGS) -o i686/pluginfo + $(CC) -m64 $(CFLAGS) pluginfo.c $(LDFLAGS) -o x86_64/pluginfo clean: rm *.o pluginfo -- cgit v1.2.3