diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/arm-multilib-soft.diff | 4 | ||||
| -rw-r--r-- | debian/patches/arm-multilib-softfp.diff | 4 | ||||
| -rw-r--r-- | debian/rules2 | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index a8932b3..2b674dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ gcc-4.7 (4.7.3-6) UNRELEASED; urgency=low * Fall back to the binutils version of the binutils build dependency if the binutils version used for the build cannot be determined. + * For ARM multilib builds, use libsf/libhf system directories to lookup + files for the non-default multilib (needed for the cross compilers). -- Matthias Klose <doko@debian.org> Mon, 17 Jun 2013 18:23:31 +0200 diff --git a/debian/patches/arm-multilib-soft.diff b/debian/patches/arm-multilib-soft.diff index 0db6001..bad15d0 100644 --- a/debian/patches/arm-multilib-soft.diff +++ b/debian/patches/arm-multilib-soft.diff @@ -13,13 +13,13 @@ Index: b/src/gcc/config/arm/t-linux-eabi +MULTILIB_DIRNAMES = sf hf +MULTILIB_EXCEPTIONS = +MULTILIB_MATCHES = mfloat-abi?hard=mhard-float mfloat-abi?soft=msoft-float mfloat-abi?soft=mfloat-abi?softfp -+MULTILIB_OSDIRNAMES = arm-linux-gnueabi:arm-linux-gnueabi ../lib:arm-linux-gnueabihf ++MULTILIB_OSDIRNAMES = ../libsf:arm-linux-gnueabi ../lib:arm-linux-gnueabihf +else +MULTILIB_OPTIONS = mfloat-abi=soft/mfloat-abi=hard +MULTILIB_DIRNAMES = sf hf +MULTILIB_EXCEPTIONS = +MULTILIB_MATCHES = mfloat-abi?hard=mhard-float mfloat-abi?soft=msoft-float mfloat-abi?soft=mfloat-abi?softfp -+MULTILIB_OSDIRNAMES = ../lib:arm-linux-gnueabi arm-linux-gnueabihf:arm-linux-gnueabihf ++MULTILIB_OSDIRNAMES = ../lib:arm-linux-gnueabi ../libhf:arm-linux-gnueabihf +endif + #MULTILIB_OPTIONS += mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te diff --git a/debian/patches/arm-multilib-softfp.diff b/debian/patches/arm-multilib-softfp.diff index f4268da..89ed142 100644 --- a/debian/patches/arm-multilib-softfp.diff +++ b/debian/patches/arm-multilib-softfp.diff @@ -13,13 +13,13 @@ Index: b/src/gcc/config/arm/t-linux-eabi +MULTILIB_DIRNAMES = sf hf +MULTILIB_EXCEPTIONS = +MULTILIB_MATCHES = mfloat-abi?hard=mhard-float mfloat-abi?softfp=msoft-float mfloat-abi?softfp=mfloat-abi?soft -+MULTILIB_OSDIRNAMES = arm-linux-gnueabi:arm-linux-gnueabi ../lib:arm-linux-gnueabihf ++MULTILIB_OSDIRNAMES = ../libsf:arm-linux-gnueabi ../lib:arm-linux-gnueabihf +else +MULTILIB_OPTIONS = mfloat-abi=softfp/mfloat-abi=hard +MULTILIB_DIRNAMES = sf hf +MULTILIB_EXCEPTIONS = +MULTILIB_MATCHES = mfloat-abi?hard=mhard-float mfloat-abi?softfp=msoft-float mfloat-abi?softfp=mfloat-abi?soft -+MULTILIB_OSDIRNAMES = ../lib:arm-linux-gnueabi arm-linux-gnueabihf:arm-linux-gnueabihf ++MULTILIB_OSDIRNAMES = ../lib:arm-linux-gnueabi ../libhf:arm-linux-gnueabihf +endif + #MULTILIB_OPTIONS += mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te diff --git a/debian/rules2 b/debian/rules2 index 206e460..730e771 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -769,15 +769,13 @@ usr_lib32 = $(PFL)/lib32 usr_libn32 = $(PFL)/lib32 usr_libx32 = $(PFL)/libx32 usr_lib64 = $(PFL)/lib64 -# FIXME: Don't hard code -usr_libhf = $(PFL)/lib/arm-linux-gnueabihf -usr_libsf = $(PFL)/lib/arm-linux-gnueabi +usr_libhf = $(PFL)/libhf +usr_libsf = $(PFL)/libsf gcc_lib_dir32 = $(gcc_lib_dir)/$(biarch32subdir) gcc_lib_dirn32 = $(gcc_lib_dir)/$(biarchn32subdir) gcc_lib_dirx32 = $(gcc_lib_dir)/$(biarchx32subdir) gcc_lib_dir64 = $(gcc_lib_dir)/$(biarch64subdir) -# FIXME: Don't hard code gcc_lib_dirhf = $(gcc_lib_dir)/$(biarchhfsubdir) gcc_lib_dirsf = $(gcc_lib_dir)/$(biarchsfsubdir) |