summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4>2003-03-27 21:51:23 +0000
committerhainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4>2003-03-27 21:51:23 +0000
commit00b5f06cb607dae90a1d4bdba75f5588245fd630 (patch)
tree1a88ed450a5d4fcbae47f54909b7bf71338dca86
parente980cf7017293db404140ebee08adb17c2e64794 (diff)
downloadppe42-gcc-00b5f06cb607dae90a1d4bdba75f5588245fd630.tar.gz
ppe42-gcc-00b5f06cb607dae90a1d4bdba75f5588245fd630.zip
PR ada/9953
* ada/Makefile.in (gnatlib configuration for HPUX): Split the general section for HPUX into specific sections for HPUX 10 and HPUX 11. Fix the setting of TGT_LIB in the HPUX 11 case. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64932 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/ada/Makefile.in23
2 files changed, 29 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03113df8678..b76daafe4aa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-27 Olivier Hainque <hainque@act-europe.fr>
+
+ PR ada/9953
+ * ada/Makefile.in (gnatlib configuration for HPUX): Split
+ the general section for HPUX into specific sections for
+ HPUX 10 and HPUX 11. Fix the setting of TGT_LIB in the HPUX
+ 11 case.
+
2003-03-27 Glen Nakamura <glen@imodulo.com>
PR opt/10087
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index 16841c26e29..87cac08b1cc 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -750,7 +750,25 @@ ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
endif
-ifeq ($(strip $(filter-out hppa% hp hpux%,$(targ))),)
+ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-excpol.adb<4wexcpol.adb \
+ a-intnam.ads<4hintnam.ads \
+ s-inmaop.adb<7sinmaop.adb \
+ s-interr.adb<5ginterr.adb \
+ s-intman.adb<7sintman.adb \
+ s-osinte.adb<5hosinte.adb \
+ s-osinte.ads<5hosinte.ads \
+ s-parame.ads<5hparame.ads \
+ s-osprim.adb<7sosprim.adb \
+ s-taprop.adb<5htaprop.adb \
+ s-taspri.ads<5htaspri.ads \
+ s-tpopsp.adb<7stpopsp.adb \
+ g-soccon.ads<3hsoccon.ads \
+ system.ads<5hsystem.ads
+endif
+
+ifeq ($(strip $(filter-out hppa% hp hpux11%,$(targ))),)
LIBGNAT_TARGET_PAIRS = \
a-intnam.ads<4hintnam.ads \
s-inmaop.adb<7sinmaop.adb \
@@ -766,7 +784,7 @@ ifeq ($(strip $(filter-out hppa% hp hpux%,$(targ))),)
g-soccon.ads<3hsoccon.ads \
system.ads<5hsystem.ads
- TGT_LIB = /usr/lib/libcl.a -lpthread
+ TGT_LIB = /usr/lib/libcl.a
THREADSLIB = -lpthread -lc_r
SYMLIB = -laddr2line -lbfd $(INTLLIBS)
soext = .sl
@@ -789,6 +807,7 @@ ifeq ($(strip $(filter-out hppa% hp hpux%,$(targ))),)
g-soccon.ads<3hsoccon.ads \
system.ads<5hsystem.ads
+ TGT_LIB =
THREADSLIB = -lcma
endif
endif
OpenPOWER on IntegriCloud