summaryrefslogtreecommitdiff
path: root/lang/gcc3/patches/patch-aj
diff options
context:
space:
mode:
Diffstat (limited to 'lang/gcc3/patches/patch-aj')
-rw-r--r--lang/gcc3/patches/patch-aj45
1 files changed, 41 insertions, 4 deletions
diff --git a/lang/gcc3/patches/patch-aj b/lang/gcc3/patches/patch-aj
index a186a5488e9..4a8393bc431 100644
--- a/lang/gcc3/patches/patch-aj
+++ b/lang/gcc3/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2004/04/10 15:47:08 seb Exp $
+$NetBSD: patch-aj,v 1.2 2004/05/28 22:28:09 shannonjr Exp $
---- gcc/ada/Make-lang.in.orig 2003-07-06 11:48:22.000000000 +0200
-+++ gcc/ada/Make-lang.in 2003-07-06 11:48:44.000000000 +0200
-@@ -210,7 +210,7 @@
+--- gcc/ada/Make-lang.in.orig 2003-07-04 13:53:53.000000000 -0600
++++ gcc/ada/Make-lang.in
+@@ -210,7 +210,7 @@ gnatbind$(exeext): ada/b_gnatb.o $(CONFI
$(LIBIBERTY) $(LIBS) $(SYSLIBS)
# use target-gcc target-gnatmake target-gnatbind target-gnatlink
@@ -11,3 +11,40 @@ $NetBSD: patch-aj,v 1.1 2004/04/10 15:47:08 seb Exp $
$(MAKE) -C ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \
ADA_INCLUDES="-I- -I../rts"\
CC="../../xgcc -B../../" STAGE_PREFIX=../../ gnattools1
+@@ -904,26 +904,28 @@ ada/sdefault.adb: ada/stamp-sdefault ; @
+ ada/stamp-sdefault : $(srcdir)/version.c $(srcdir)/move-if-change \
+ Makefile
+ $(ECHO) "pragma Style_Checks (Off);" >tmp-sdefault.adb
++ $(ECHO) "with Osint; use Osint;" >>tmp-sdefault.adb
+ $(ECHO) "package body Sdefault is" >>tmp-sdefault.adb
+- $(ECHO) " S1 : aliased constant String := \"$(ADA_INCLUDE_DIR)/\";" >>tmp-sdefault.adb
+- $(ECHO) " S2 : aliased constant String := \"$(ADA_RTL_OBJ_DIR)/\";" >>tmp-sdefault.adb
+- $(ECHO) " S3 : aliased constant String := \"$(target)/\";" >>tmp-sdefault.adb
+- $(ECHO) " S4 : aliased constant String := \"$(libsubdir)/\";" >>tmp-sdefault.adb
++ $(ECHO) " S0 : constant String := \"$(prefix)/\";" >>tmp-sdefault.adb
++ $(ECHO) " S1 : constant String := \"$(ADA_INCLUDE_DIR)/\";" >>tmp-sdefault.adb
++ $(ECHO) " S2 : constant String := \"$(ADA_RTL_OBJ_DIR)/\";" >>tmp-sdefault.adb
++ $(ECHO) " S3 : constant String := \"$(target)/\";" >>tmp-sdefault.adb
++ $(ECHO) " S4 : constant String := \"$(libsubdir)/\";" >>tmp-sdefault.adb
+ $(ECHO) " function Include_Dir_Default_Name return String_Ptr is" >>tmp-sdefault.adb
+ $(ECHO) " begin" >>tmp-sdefault.adb
+- $(ECHO) " return new String'(S1);" >>tmp-sdefault.adb
++ $(ECHO) " return Relocate_Path (S0, S1);" >>tmp-sdefault.adb
+ $(ECHO) " end Include_Dir_Default_Name;" >>tmp-sdefault.adb
+ $(ECHO) " function Object_Dir_Default_Name return String_Ptr is" >>tmp-sdefault.adb
+ $(ECHO) " begin" >>tmp-sdefault.adb
+- $(ECHO) " return new String'(S2);" >>tmp-sdefault.adb
++ $(ECHO) " return Relocate_Path (S0, S2);" >>tmp-sdefault.adb
+ $(ECHO) " end Object_Dir_Default_Name;" >>tmp-sdefault.adb
+ $(ECHO) " function Target_Name return String_Ptr is" >>tmp-sdefault.adb
+ $(ECHO) " begin" >>tmp-sdefault.adb
+- $(ECHO) " return new String'(S3);" >>tmp-sdefault.adb
++ $(ECHO) " return Relocate_Path (S0, S3);" >>tmp-sdefault.adb
+ $(ECHO) " end Target_Name;" >>tmp-sdefault.adb
+ $(ECHO) " function Search_Dir_Prefix return String_Ptr is" >>tmp-sdefault.adb
+ $(ECHO) " begin" >>tmp-sdefault.adb
+- $(ECHO) " return new String'(S4);" >>tmp-sdefault.adb
++ $(ECHO) " return Relocate_Path (S0, S4);" >>tmp-sdefault.adb
+ $(ECHO) " end Search_Dir_Prefix;" >>tmp-sdefault.adb
+ $(ECHO) "end Sdefault;" >> tmp-sdefault.adb
+ $(srcdir)/move-if-change tmp-sdefault.adb ada/sdefault.adb