Merge pull request #252 from andreas-schwab/master

Add support for building baselibs for aarch64_ilp32

baselibs_global.conf

@@ -9,6 +9,8 @@ arch sparcv9	targets sparc64:32bit
 arch sparcv9v	targets sparc64v:32bit
 arch sparc64	targets sparcv9:64bit
 arch sparc64v	targets sparcv9v:64bit
+arch aarch64	targets aarch64_ilp32:64bit
+arch aarch64_ilp32	targets aarch64:32bit
 
 configdir /usr/lib/baselibs-<targettype>/bin
 
@@ -20,9 +22,9 @@ targettype 64bit extension 64
 
 targetname <name>-<targettype>
 
-+.*/lib(64)?/.*\.(so\..*|so|o|a|la)$
++.*/lib(64|ilp32)?/.*\.(so\..*|so|o|a|la)$
 
-targettype 64bit -^(/usr)?/lib/lib
+targettype 64bit -^(/usr)?/lib(ilp32)?/lib
 targettype 32bit -/lib64/
 targettype x86   -/lib64/
 
@@ -39,5 +41,5 @@ package /.(?<!-devel)$/
 post "/sbin/ldconfig"
 
 package /(.*)-debuginfo$/
-+/usr/lib(64)?/debug/.*/lib(64)?/.*\.(so\..*|so|o|a|la)\.debug$
-+/usr/lib(64)?/debug/.build-id/.*
++/usr/lib(64|ilp32)?/debug/.*/lib(64|ilp32)?/.*\.(so\..*|so|o|a|la)\.debug$
++/usr/lib(64|ilp32)?/debug/.build-id/.*

common_functions

@@ -29,7 +29,7 @@ build_host_arch() {
 
 extend_build_arch() {
     case $BUILD_ARCH in
-      aarch64) BUILD_ARCH="aarch64:armv8l" ;;
+      aarch64|aarch64_ilp32) BUILD_ARCH="aarch64:aarch64_ilp32:armv8l" ;;
       armv8l) BUILD_ARCH="armv8l" ;; # armv8l is aarch64 in 32bit mode. not a superset of armv7
       armv7hl) BUILD_ARCH="armv7hl:armv7l:armv6hl:armv6l:armv5tel" ;;
       armv7l) BUILD_ARCH="armv7l:armv6l:armv5tel" ;;