Advertisement
jdobry

Untitled

Dec 3rd, 2019
160
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.68 KB | None | 0 0
  1. --- src/gcc/gcc/config/arm/t-multilib.orig  2019-10-25 11:24:00.000000000 +0200
  2. +++ src/gcc/gcc/config/arm/t-multilib   2019-11-28 16:18:29.938000000 +0100
  3. @@ -96,13 +96,19 @@
  4.  MULTILIB_OPTIONS   += mfloat-abi=soft/mfloat-abi=softfp/mfloat-abi=hard
  5.  MULTILIB_DIRNAMES  += nofp softfp hard
  6.  
  7. +MULTILIB_OPTIONS   += mlittle-endian/mbig-endian
  8. +MULTILIB_DIRNAMES  += le be
  9. +
  10.  MULTILIB_REQUIRED  += mthumb/mfloat-abi=soft
  11.  MULTILIB_REQUIRED  += marm/march=armv5te+fp/mfloat-abi=softfp
  12.  MULTILIB_REQUIRED  += marm/march=armv5te+fp/mfloat-abi=hard
  13.  
  14. -MULTILIB_REQUIRED  += mthumb/march=armv7/mfloat-abi=soft
  15. -MULTILIB_REQUIRED  += mthumb/march=armv7+fp/mfloat-abi=softfp
  16. -MULTILIB_REQUIRED  += mthumb/march=armv7+fp/mfloat-abi=hard
  17. +MULTILIB_REQUIRED  += mthumb/march=armv7/mfloat-abi=soft/mlittle-endian
  18. +MULTILIB_REQUIRED  += mthumb/march=armv7+fp/mfloat-abi=softfp/mlittle-endian
  19. +MULTILIB_REQUIRED  += mthumb/march=armv7+fp/mfloat-abi=hard/mlittle-endian
  20. +MULTILIB_REQUIRED  += mthumb/march=armv7/mfloat-abi=soft/mbig-endian
  21. +MULTILIB_REQUIRED  += mthumb/march=armv7+fp/mfloat-abi=softfp/mbig-endian
  22. +MULTILIB_REQUIRED  += mthumb/march=armv7+fp/mfloat-abi=hard/mbig-endian
  23.  
  24.  MULTILIB_REQUIRED  += mthumb/march=armv7-r+fp.sp/mfloat-abi=softfp
  25.  MULTILIB_REQUIRED  += mthumb/march=armv7-r+fp.sp/mfloat-abi=hard
  26. @@ -118,6 +124,8 @@
  27.                  $(filter-out +fp.sp, $(v7_r_sp_variants)), \
  28.                  march?armv7-r+fp.sp=march?armv7-r$(ARCH))
  29.  
  30. +MULTILIB_MATCHES   += mbig-endian=mbe
  31. +
  32.  MULTILIB_MATCHES   += $(foreach ARCH, $(all_early_arch), \
  33.                  march?armv5te+fp=march?$(ARCH)+fp)
  34.  # Map v8-r down onto common v7 code or v7-r sp.
  35. @@ -187,15 +195,18 @@
  36.  
  37.  # Use Thumb libraries for everything.
  38.  
  39. -MULTILIB_REUSE     += mthumb/march.armv7/mfloat-abi.soft=marm/march.armv7/mfloat-abi.soft
  40. +MULTILIB_REUSE     += $(foreach ENDIAN, little big, \
  41. +                              mthumb/march.armv7/mfloat-abi.soft/m$(ENDIAN)-endian=marm/march.armv7/mfloat-abi.soft/m$(ENDIAN)-endian)
  42.  
  43.  MULTILIB_REUSE     += $(foreach ABI, hard softfp, \
  44.                  $(foreach ARCH, armv7+fp armv7-r+fp\.sp, \
  45. -                  mthumb/march.$(ARCH)/mfloat-abi.$(ABI)=marm/march.$(ARCH)/mfloat-abi.$(ABI)))
  46. +               $(foreach ENDIAN, little big, \
  47. +                   mthumb/march.$(ARCH)/mfloat-abi.$(ABI)=marm/march.$(ARCH)/mfloat-abi.$(ABI)/m$(ENDIAN)-endian)))
  48.  
  49.  # Softfp but no FP, use the soft-float libraries.
  50.  MULTILIB_REUSE     += $(foreach MODE, arm thumb, \
  51.                  $(foreach ARCH, armv7, \
  52. -                  mthumb/march.$(ARCH)/mfloat-abi.soft=m$(MODE)/march.$(ARCH)/mfloat-abi.softfp))
  53. +               $(foreach ENDIAN, little big, \
  54. +                   mthumb/march.$(ARCH)/mfloat-abi.soft/m$(ENDIAN)-endian=m$(MODE)/march.$(ARCH)/mfloat-abi.softfp/m$(ENDIAN)-endian)))
  55.  
  56.  endif      # Not APROFILE.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement