diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2012-05-01 09:49:55 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2012-05-01 09:49:55 +0000 |
| commit | f4d5b10d37412b8a359a6f8a2a8541afdcf69583 (patch) | |
| tree | 60964775e8dc12460a7002d882d1beb461bde237 | |
| parent | e5251c580902ba12c65fd9db2b4509b700e8c722 (diff) | |
| download | gcc-47-f4d5b10d37412b8a359a6f8a2a8541afdcf69583.tar.gz | |
- more arm-multilib fixes
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6011 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/patches/arm-multilib-soft.diff | 4 | ||||
| -rw-r--r-- | debian/patches/arm-multilib-softfp.diff | 4 | ||||
| -rw-r--r-- | debian/rules.patch | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/debian/patches/arm-multilib-soft.diff b/debian/patches/arm-multilib-soft.diff index c7b473b..f89124b 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 = ../libsf:arm-linux-gnueabi ../lib:arm-linux-gnueabihf ++MULTILIB_OSDIRNAMES = arm-linux-gnueabi: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 ../libhf:arm-linux-gnueabihf ++MULTILIB_OSDIRNAMES = ../lib:arm-linux-gnueabi arm-linux-gnueabihf: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 89ed142..f4268da 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 = ../libsf:arm-linux-gnueabi ../lib:arm-linux-gnueabihf ++MULTILIB_OSDIRNAMES = arm-linux-gnueabi: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 ../libhf:arm-linux-gnueabihf ++MULTILIB_OSDIRNAMES = ../lib:arm-linux-gnueabi arm-linux-gnueabihf:arm-linux-gnueabihf +endif + #MULTILIB_OPTIONS += mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te diff --git a/debian/rules.patch b/debian/rules.patch index a0db928..5cd984c 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -215,6 +215,7 @@ else ifeq ($(multilib),yes) debian_patches += arm-multilib-soft endif endif +debian_patches += arm-multilib-defaults ifeq ($(DEB_CROSS),yes) debian_patches += cross-include cross-fixes |