This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Ada S/390: Add multilib handling


Hello,

the attached patch completes ada multilib handling in the ada frontend
makefile.  Tested by bootstrapping ada on s390 and s390x.

Ok for mainline?

Bye,

-Andreas-

2008-11-02  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	PR target/37977
	* gcc-interface/Makefile.in: Add multilib handling for
	s390-linux and s390x-linux.


Index: gcc/ada/gcc-interface/Makefile.in
===================================================================
*** gcc/ada/gcc-interface/Makefile.in.orig	2008-11-02 16:18:25.000000000 +0100
--- gcc/ada/gcc-interface/Makefile.in	2008-11-02 17:43:34.000000000 +0100
*************** ifeq ($(strip $(filter-out %86 freebsd%,
*** 962,997 ****
  endif
  
  ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
    ifeq ($(strip $(filter-out s390x,$(arch))),)
!     LIBGNAT_TARGET_PAIRS = \
!     a-intnam.ads<a-intnam-linux.ads \
!     s-inmaop.adb<s-inmaop-posix.adb \
!     s-intman.adb<s-intman-posix.adb \
!     s-linux.ads<s-linux.ads \
!     s-osinte.adb<s-osinte-posix.adb \
!     s-osinte.ads<s-osinte-linux.ads \
!     s-osprim.adb<s-osprim-posix.adb \
!     s-taprop.adb<s-taprop-linux.adb \
!     s-tasinf.ads<s-tasinf-linux.ads \
!     s-tasinf.adb<s-tasinf-linux.adb \
!     s-taspri.ads<s-taspri-posix-noaltstack.ads \
!     s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
!     system.ads<system-linux-s390x.ads
    else
      LIBGNAT_TARGET_PAIRS = \
!     a-intnam.ads<a-intnam-linux.ads \
!     s-inmaop.adb<s-inmaop-posix.adb \
!     s-intman.adb<s-intman-posix.adb \
!     s-linux.ads<s-linux.ads \
!     s-osinte.adb<s-osinte-posix.adb \
!     s-osinte.ads<s-osinte-linux.ads \
!     s-osprim.adb<s-osprim-posix.adb \
!     s-taprop.adb<s-taprop-linux.adb \
!     s-tasinf.ads<s-tasinf-linux.ads \
!     s-tasinf.adb<s-tasinf-linux.adb \
!     s-taspri.ads<s-taspri-posix-noaltstack.ads \
!     s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
!     system.ads<system-linux-s390.ads
    endif
  
    TOOLS_TARGET_PAIRS =  \
--- 962,998 ----
  endif
  
  ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
+   LIBGNAT_TARGET_PAIRS_COMMON = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+   s-intman.adb<s-intman-posix.adb \
+   s-linux.ads<s-linux.ads \
+   s-osinte.adb<s-osinte-posix.adb \
+   s-osinte.ads<s-osinte-linux.ads \
+   s-osprim.adb<s-osprim-posix.adb \
+   s-taprop.adb<s-taprop-linux.adb \
+   s-tasinf.ads<s-tasinf-linux.ads \
+   s-tasinf.adb<s-tasinf-linux.adb \
+   s-taspri.ads<s-taspri-posix-noaltstack.ads \
+   s-tpopsp.adb<s-tpopsp-posix-foreign.adb
+ 
+   LIBGNAT_TARGET_PAIRS_32 = \
+   system.ads<system-linux-s390.ads
+ 
+   LIBGNAT_TARGET_PAIRS_64 = \
+   system.ads<system-linux-s390x.ads
+ 
    ifeq ($(strip $(filter-out s390x,$(arch))),)
!     ifeq ($(strip $(MULTISUBDIR)),/32)
!       LIBGNAT_TARGET_PAIRS = \
!       $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32)
!     else
!       LIBGNAT_TARGET_PAIRS = \
!       $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64)
!     endif
    else
      LIBGNAT_TARGET_PAIRS = \
!     $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32)
    endif
  
    TOOLS_TARGET_PAIRS =  \


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]