summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Kay2017-06-16 17:02:21 +1000
committerRod Kay2017-06-16 17:02:21 +1000
commit36f78495f68c65298c27b6904c931e81005129eb (patch)
tree9d72effcd652c933e2e0742aa87f6fb621b15d40
parent7e8259c6fa7404580d250eaa08014c108053ba79 (diff)
downloadaur-36f78495f68c65298c27b6904c931e81005129eb.tar.gz
Update to gpl2017 version
-rw-r--r--.SRCINFO70
-rw-r--r--Makefile-patch23
-rw-r--r--Makefile.stub-patch (renamed from patch-Makefile.stub)9
-rw-r--r--PKGBUILD105
-rw-r--r--a4g-a_elists.ads-patch34
-rw-r--r--a4g-asis_tables.ads-patch36
-rw-r--r--a4g-contt-ut.adb-patch14
-rw-r--r--a4g-contt.adb-patch54
-rw-r--r--a4g-contt.ads-patch70
-rw-r--r--a4g-defaults.ads-patch36
-rw-r--r--asis-data_decomposition-set_get.ads-patch14
-rw-r--r--asis-extensions-strings.adb-patch14
-rw-r--r--asis.gpr12
-rw-r--r--asis.gpr-patch11
-rw-r--r--asis_ui-compiler_options.adb-patch24
-rw-r--r--asis_ui-global_state.adb-patch14
-rw-r--r--asis_ui-source_table.adb-patch14
-rw-r--r--gnatcheck-asis_utilities.adb-patch14
-rw-r--r--gnatcheck-categories.adb-patch14
-rw-r--r--gnatcheck-diagnoses_old.adb-patch25
-rw-r--r--gnatcheck-name_dictionary.adb-patch14
-rw-r--r--gnatcheck-rules-custom_1.adb-patch14
-rw-r--r--gnatcheck-rules-rule_table.adb-patch14
-rw-r--r--gnatcheck-rules-rule_table.ads-patch14
-rw-r--r--gnatcheck-traversal_stack.adb-patch14
-rw-r--r--gnatelim-closure.adb-patch14
-rw-r--r--metrics-source_table.adb-patch14
-rw-r--r--patch-Makefile53
-rw-r--r--patch-a4g-a_opt.adb20
-rw-r--r--patch-a4g-a_opt.ads11
-rw-r--r--patch-a4g-encl_el.adb19
31 files changed, 649 insertions, 159 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 595c9219117..7418941b092 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
# Generated by mksrcinfo v8
-# Sun Jun 5 22:30:11 UTC 2016
+# Fri Jun 16 07:01:50 UTC 2017
pkgbase = asis
pkgdesc = Allows Ada programs access to the syntactic and semantic structure of source code. Also provides extra tools such as gnatpp.
- pkgver = 2016
+ pkgver = 2017
pkgrel = 1
- url = http://libre.adacore.com/tools/
+ url = http://libre.adacore.com/tools
arch = i686
arch = x86_64
groups = gcc-ada
@@ -14,20 +14,56 @@ pkgbase = asis
depends = gnatcoll
provides = asis
conflicts = asis
- source = http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
- source = asis.gpr
- source = patch-Makefile
- source = patch-Makefile.stub
- source = patch-a4g-encl_el.adb
- source = patch-a4g-a_opt.ads
- source = patch-a4g-a_opt.adb
- sha1sums = 25195ea826bb1c790c8f3acfd1971b5fa7772109
- sha1sums = 16101754d8a8887625d15d2ee97ad2ef9b4cd9c7
- sha1sums = 46de83b7fa14aa884eb0f066970f3250a629d28f
- sha1sums = b359b5945dafda8d30f0a6e7265a975e250e5af3
- sha1sums = 6e29d9f5f24d378ae91db783b97776c0069c0d17
- sha1sums = 3c3918f9ef569f783da0cbf55884629051b84b61
- sha1sums = 390c688eb0cca14339a6178213bc6a47ffcec02b
+ source = http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
+ source = Makefile-patch
+ source = Makefile.stub-patch
+ source = a4g-a_elists.ads-patch
+ source = a4g-asis_tables.ads-patch
+ source = a4g-contt-ut.adb-patch
+ source = a4g-contt.adb-patch
+ source = a4g-contt.ads-patch
+ source = a4g-defaults.ads-patch
+ source = asis-data_decomposition-set_get.ads-patch
+ source = asis-extensions-strings.adb-patch
+ source = asis.gpr-patch
+ source = asis_ui-compiler_options.adb-patch
+ source = asis_ui-global_state.adb-patch
+ source = asis_ui-source_table.adb-patch
+ source = gnatcheck-asis_utilities.adb-patch
+ source = gnatcheck-categories.adb-patch
+ source = gnatcheck-diagnoses_old.adb-patch
+ source = gnatcheck-name_dictionary.adb-patch
+ source = gnatcheck-rules-custom_1.adb-patch
+ source = gnatcheck-rules-rule_table.adb-patch
+ source = gnatcheck-rules-rule_table.ads-patch
+ source = gnatcheck-traversal_stack.adb-patch
+ source = gnatelim-closure.adb-patch
+ source = metrics-source_table.adb-patch
+ sha1sums = 369101e6b0d9e777b9bcae821ddb68567138a95f
+ sha1sums = 20452ee87ed5b7a1c10f207e098f29f68f2d18b8
+ sha1sums = 60137197ec26eee43fea570a6fc97563437c1c84
+ sha1sums = c30f18654d474029119a81bc30d48b8b78c7454f
+ sha1sums = cab68c6c9890242f6f547d1a7a6b28909724f494
+ sha1sums = 17e195a0f3283e7cb2e314a2a7fbee3d3e16bf4f
+ sha1sums = ca5270f9426f96aef4d39017e116bf07c87d18eb
+ sha1sums = 900aab3b77f0cb6ab52b1430c4cdb7dc0884adc2
+ sha1sums = e4fa897994072830844b1001f4cf018c4b7ef045
+ sha1sums = a4c96d9f7eba3bda7011f1b8f6fcc5560b5a7305
+ sha1sums = 444099ac59d93e0ac380edc88f581add6fa37e0d
+ sha1sums = f47413c62cb45a6cb608d3ce0e09eb4430a8294b
+ sha1sums = 6a90ea0eb4c3531b8e93b3026a4d882cd780ba1c
+ sha1sums = 138594104b6ccf92449d5d673924b0ae35e64942
+ sha1sums = 914921f22db384439d0ba0eb5022670fd4299cb6
+ sha1sums = 22c177723b7e31de47c043d7519c7f82153b41df
+ sha1sums = d5bc78cf44e743be262218c8eac7d84d76ad6633
+ sha1sums = 0cd3ed84e7ddcb739305927b6a8306a2ca1e2d78
+ sha1sums = e0efa9a3aa89a65717cbfec6b1efd41bd574b3ba
+ sha1sums = a73d7389e09fdb80d17560f29d2e34e3ca01c0b5
+ sha1sums = 0aabd9e44ded38630771539ae883dbb1a4b020a4
+ sha1sums = 5eefb9a65af42809c9d02c872a8bd75745ce6c88
+ sha1sums = 6173adc9dbb5095f58e49eda81beaf63f5fa452e
+ sha1sums = 841d3de56687297d4c561b9c882460a3624b0d82
+ sha1sums = 0f0c91d8fcd0333eb6ddd9b704bf656bf59cb444
pkgname = asis
diff --git a/Makefile-patch b/Makefile-patch
new file mode 100644
index 00000000000..143b3b825ad
--- /dev/null
+++ b/Makefile-patch
@@ -0,0 +1,23 @@
+--- asis-gpl-2017-src/Makefile
++++ asis-gpl-2017-src-new/Makefile
+@@ -9,7 +9,8 @@
+ # ==================================================== build
+
+ .PHONY: all
+-all: setup-snames
++#all: setup-snames
++all:
+ $(GPRBUILD) -p -j0 -XBLD=$(BLD) -XASISOPSYS=$(ASISOPSYS) -XGNSA=$(GNSA) \
+ $(GPRBUILD_FLAGS) -XASIS_COMPONENTS=$(COMPS) build_asis.gpr
+
+@@ -30,7 +31,8 @@
+ # snames.ads". 'cmp' returns true (i.e. 0) if the files are identical.
+
+ .PHONY: setup
+-setup: setup-snames setup-factory
++setup: setup-factory
++#setup: setup-snames setup-factory
+
+ .PHONY: setup-snames
+ setup-snames: gnat/snames.ads-tmpl gnat/snames.adb-tmpl gnat/xutil.ads gnat/xutil.adb
+
diff --git a/patch-Makefile.stub b/Makefile.stub-patch
index af0a5f244b7..469ef3d17fb 100644
--- a/patch-Makefile.stub
+++ b/Makefile.stub-patch
@@ -1,12 +1,15 @@
---- Makefile.stub.orig 2015-06-22 09:23:18 UTC
-+++ Makefile.stub
-@@ -3,8 +3,7 @@ host := $(shell gcc -dumpmachine)
+--- asis-gpl-2017-src/Makefile.stub
++++ asis-gpl-2017-src-new/Makefile.stub
+@@ -3,8 +3,9 @@
# Where Asis library should be installed
# Default is into current GNAT directory
-INSTALL_DIR = $(dir $(shell which gnatls))..
-prefix=$(INSTALL_DIR)
++#INSTALL_DIR = $(dir $(shell which gnatls))..
++#prefix=$(INSTALL_DIR)
+prefix=$(PREFIX)
# System commands
LN = ln -s
+
diff --git a/PKGBUILD b/PKGBUILD
index adb266f2c9b..23bb98e80d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
# Contributor: Rod Kay <charlie5 on #ada at freenode.net>
pkgname=asis
-pkgver=2016
+pkgver=2017
pkgrel=1
pkgdesc="Allows Ada programs access to the syntactic and semantic structure of source code. Also provides extra tools such as gnatpp."
arch=(i686 x86_64)
-url=http://libre.adacore.com/tools/$_pkgname
+url=http://libre.adacore.com/tools
license=(GPL)
groups=(gcc-ada)
@@ -15,21 +15,59 @@ depends=(gcc-ada gnat_util gnatcoll)
provides=($pkgname)
conflicts=($pkgname)
-source=(http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
- asis.gpr
- patch-Makefile
- patch-Makefile.stub
- patch-a4g-encl_el.adb
- patch-a4g-a_opt.ads
- patch-a4g-a_opt.adb)
-
-sha1sums=('25195ea826bb1c790c8f3acfd1971b5fa7772109'
- '16101754d8a8887625d15d2ee97ad2ef9b4cd9c7'
- '46de83b7fa14aa884eb0f066970f3250a629d28f'
- 'b359b5945dafda8d30f0a6e7265a975e250e5af3'
- '6e29d9f5f24d378ae91db783b97776c0069c0d17'
- '3c3918f9ef569f783da0cbf55884629051b84b61'
- '390c688eb0cca14339a6178213bc6a47ffcec02b')
+source=(http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
+ Makefile-patch
+ Makefile.stub-patch
+ a4g-a_elists.ads-patch
+ a4g-asis_tables.ads-patch
+ a4g-contt-ut.adb-patch
+ a4g-contt.adb-patch
+ a4g-contt.ads-patch
+ a4g-defaults.ads-patch
+ asis-data_decomposition-set_get.ads-patch
+ asis-extensions-strings.adb-patch
+ asis.gpr-patch
+ asis_ui-compiler_options.adb-patch
+ asis_ui-global_state.adb-patch
+ asis_ui-source_table.adb-patch
+ gnatcheck-asis_utilities.adb-patch
+ gnatcheck-categories.adb-patch
+ gnatcheck-diagnoses_old.adb-patch
+ gnatcheck-name_dictionary.adb-patch
+ gnatcheck-rules-custom_1.adb-patch
+ gnatcheck-rules-rule_table.adb-patch
+ gnatcheck-rules-rule_table.ads-patch
+ gnatcheck-traversal_stack.adb-patch
+ gnatelim-closure.adb-patch
+ metrics-source_table.adb-patch)
+
+
+
+sha1sums=('369101e6b0d9e777b9bcae821ddb68567138a95f'
+ '20452ee87ed5b7a1c10f207e098f29f68f2d18b8'
+ '60137197ec26eee43fea570a6fc97563437c1c84'
+ 'c30f18654d474029119a81bc30d48b8b78c7454f'
+ 'cab68c6c9890242f6f547d1a7a6b28909724f494'
+ '17e195a0f3283e7cb2e314a2a7fbee3d3e16bf4f'
+ 'ca5270f9426f96aef4d39017e116bf07c87d18eb'
+ '900aab3b77f0cb6ab52b1430c4cdb7dc0884adc2'
+ 'e4fa897994072830844b1001f4cf018c4b7ef045'
+ 'a4c96d9f7eba3bda7011f1b8f6fcc5560b5a7305'
+ '444099ac59d93e0ac380edc88f581add6fa37e0d'
+ 'f47413c62cb45a6cb608d3ce0e09eb4430a8294b'
+ '6a90ea0eb4c3531b8e93b3026a4d882cd780ba1c'
+ '138594104b6ccf92449d5d673924b0ae35e64942'
+ '914921f22db384439d0ba0eb5022670fd4299cb6'
+ '22c177723b7e31de47c043d7519c7f82153b41df'
+ 'd5bc78cf44e743be262218c8eac7d84d76ad6633'
+ '0cd3ed84e7ddcb739305927b6a8306a2ca1e2d78'
+ 'e0efa9a3aa89a65717cbfec6b1efd41bd574b3ba'
+ 'a73d7389e09fdb80d17560f29d2e34e3ca01c0b5'
+ '0aabd9e44ded38630771539ae883dbb1a4b020a4'
+ '5eefb9a65af42809c9d02c872a8bd75745ce6c88'
+ '6173adc9dbb5095f58e49eda81beaf63f5fa452e'
+ '841d3de56687297d4c561b9c882460a3624b0d82'
+ '0f0c91d8fcd0333eb6ddd9b704bf656bf59cb444')
prepare()
@@ -37,19 +75,38 @@ prepare()
WRKSRC=$srcdir/$pkgname-gpl-$pkgver-src
sed -i -e 's|OPSYS|ASISOPSYS|g' \
- -e 's|(prefix)|(DESTDIR)$$(prefix)|g' \
+ -e 's|(prefix)|(DESTDIR)$(prefix)|g' \
${WRKSRC}/Makefile \
${WRKSRC}/Makefile.stub \
${WRKSRC}/common.gpr
- rm -rf ${WRKSRC}/gnat
+ rm -rf ${WRKSRC}/gnat/*
cd $WRKSRC
- patch -p0 -i ../patch-Makefile
- patch -p0 -i ../patch-Makefile.stub
- patch -p0 -i ../patch-a4g-a_opt.ads
- patch -p0 -i ../patch-a4g-a_opt.adb
- patch -p0 -i ../patch-a4g-encl_el.adb
+ patch -p1 -i ../Makefile-patch
+ patch -p1 -i ../Makefile.stub-patch
+ patch -p1 -i ../a4g-a_elists.ads-patch
+ patch -p1 -i ../a4g-asis_tables.ads-patch
+ patch -p1 -i ../a4g-contt-ut.adb-patch
+ patch -p1 -i ../a4g-contt.adb-patch
+ patch -p1 -i ../a4g-contt.ads-patch
+ patch -p1 -i ../a4g-defaults.ads-patch
+ patch -p1 -i ../asis-data_decomposition-set_get.ads-patch
+ patch -p1 -i ../asis-extensions-strings.adb-patch
+ patch -p1 -i ../asis.gpr-patch
+ patch -p1 -i ../asis_ui-compiler_options.adb-patch
+ patch -p1 -i ../asis_ui-global_state.adb-patch
+ patch -p1 -i ../asis_ui-source_table.adb-patch
+ patch -p1 -i ../gnatcheck-asis_utilities.adb-patch
+ patch -p1 -i ../gnatcheck-categories.adb-patch
+ patch -p1 -i ../gnatcheck-diagnoses_old.adb-patch
+ patch -p1 -i ../gnatcheck-name_dictionary.adb-patch
+ patch -p1 -i ../gnatcheck-rules-custom_1.adb-patch
+ patch -p1 -i ../gnatcheck-rules-rule_table.adb-patch
+ patch -p1 -i ../gnatcheck-rules-rule_table.ads-patch
+ patch -p1 -i ../gnatcheck-traversal_stack.adb-patch
+ patch -p1 -i ../gnatelim-closure.adb-patch
+ patch -p1 -i ../metrics-source_table.adb-patch
}
diff --git a/a4g-a_elists.ads-patch b/a4g-a_elists.ads-patch
new file mode 100644
index 00000000000..b772d4f4af8
--- /dev/null
+++ b/a4g-a_elists.ads-patch
@@ -0,0 +1,34 @@
+--- asis-gpl-2017-src/asis/a4g-a_elists.ads
++++ asis-gpl-2017-src-new/asis/a4g-a_elists.ads
+@@ -268,8 +268,8 @@
+ Table_Index_Type => Elist_Id,
+ Table_Low_Bound => First_Elist_Id,
+ Table_Initial => Alloc.Elists_Initial,
+- Table_Increment => Alloc.Elists_Increment,
+- Table_Name => "Elists");
++ Table_Increment => Alloc.Elists_Increment);
++-- Table_Name => "Elists");
+
+ type Elmt_Item is record
+ Unit : Unit_Id;
+@@ -281,12 +281,12 @@
+ Table_Index_Type => Elmt_Id,
+ Table_Low_Bound => First_Elmt_Id,
+ Table_Initial => Alloc.Elmts_Initial,
+- Table_Increment => Alloc.Elmts_Increment,
+- Table_Name => "Elmts");
+-
+- type Saved_Lists is record
+- Saved_Elmts : Elmts.Saved_Table;
+- Saved_Elists : Elists.Saved_Table;
+- end record;
++ Table_Increment => Alloc.Elmts_Increment);
++-- Table_Name => "Elmts");
++
++-- type Saved_Lists is record
++-- Saved_Elmts : Elmts.Saved_Table;
++-- Saved_Elists : Elists.Saved_Table;
++-- end record;
+
+ end A4G.A_Elists;
+
diff --git a/a4g-asis_tables.ads-patch b/a4g-asis_tables.ads-patch
new file mode 100644
index 00000000000..05b5a85775d
--- /dev/null
+++ b/a4g-asis_tables.ads-patch
@@ -0,0 +1,36 @@
+--- asis-gpl-2017-src/asis/a4g-asis_tables.ads
++++ asis-gpl-2017-src-new/asis/a4g-asis_tables.ads
+@@ -54,8 +54,8 @@
+ Table_Index_Type => Asis.ASIS_Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 10,
+- Table_Increment => 100,
+- Table_Name => "Internal Element_List");
++ Table_Increment => 100);
++-- Table_Name => "Internal Element_List");
+
+ -- This table contains ASIS Elements. It is supposed to be used only for
+ -- creating the result Element lists in ASIS structural queries. Note that
+@@ -69,8 +69,8 @@
+ Table_Index_Type => Asis.ASIS_Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 10,
+- Table_Increment => 100,
+- Table_Name => "Element_List");
++ Table_Increment => 100);
++-- Table_Name => "Element_List");
+ -- This table contains ASIS Elements. It is supposed to be used for any
+ -- purpose except creating the result Element lists in ASIS structural
+ -- queries.
+@@ -95,8 +95,8 @@
+ Table_Index_Type => Int,
+ Table_Low_Bound => 0,
+ Table_Initial => 10,
+- Table_Increment => 100,
+- Table_Name => "Node_Trace");
++ Table_Increment => 100);
++-- Table_Name => "Node_Trace");
+ -- This table is used to create the node trace needed to compare elements
+ -- from nested instances
+
+
diff --git a/a4g-contt-ut.adb-patch b/a4g-contt-ut.adb-patch
new file mode 100644
index 00000000000..f5569a8c955
--- /dev/null
+++ b/a4g-contt-ut.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/asis/a4g-contt-ut.adb
++++ asis-gpl-2017-src-new/asis/a4g-contt-ut.adb
+@@ -132,8 +132,8 @@
+ Table_Index_Type => Unit_Id,
+ Table_Low_Bound => First_Unit_Id,
+ Table_Initial => 1000,
+- Table_Increment => 100,
+- Table_Name => "Top Node Cache");
++ Table_Increment => 100);
++-- Table_Name => "Top Node Cache");
+ -- Used to cache the already computed results of the Top function
+
+ package Config_files_Sets is new
+
diff --git a/a4g-contt.adb-patch b/a4g-contt.adb-patch
new file mode 100644
index 00000000000..db9ebb8f496
--- /dev/null
+++ b/a4g-contt.adb-patch
@@ -0,0 +1,54 @@
+--- asis-gpl-2017-src/asis/a4g-contt.adb
++++ asis-gpl-2017-src-new/asis/a4g-contt.adb
+@@ -1938,16 +1938,18 @@
+ procedure Restore_Context (C : Context_Id) is
+ begin
+ pragma Assert (C in Contexts.First .. Contexts.Last);
+- A_Name_Chars.Restore
+- (Contexts.Table (C).Back_Up.Context_Name_Chars);
+- Unit_Table.Restore (Contexts.Table (C).Back_Up.Units);
+- Tree_Table.Restore (Contexts.Table (C).Back_Up.Trees);
++
++ raise Program_Error with "Restore_Context is not implemented";
++-- A_Name_Chars.Restore
++-- (Contexts.Table (C).Back_Up.Context_Name_Chars);
++-- Unit_Table.Restore (Contexts.Table (C).Back_Up.Units);
++-- Tree_Table.Restore (Contexts.Table (C).Back_Up.Trees);
+
+ -- restoring lists tables:
+- A4G.A_Elists.Elmts.Restore
+- (Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elmts);
+- A4G.A_Elists.Elists.Restore
+- (Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elists);
++-- A4G.A_Elists.Elmts.Restore
++-- (Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elmts);
++-- A4G.A_Elists.Elists.Restore
++-- (Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elists);
+ end Restore_Context;
+
+ ------------------
+@@ -1958,15 +1960,16 @@
+ begin
+ if Is_Opened (C) then
+ pragma Assert (C in Contexts.First .. Contexts.Last);
+- Contexts.Table (C).Back_Up.Context_Name_Chars := A_Name_Chars.Save;
+- Contexts.Table (C).Back_Up.Units := Unit_Table.Save;
+- Contexts.Table (C).Back_Up.Trees := Tree_Table.Save;
++ raise Program_Error with "Save_Context is not implemented";
++-- Contexts.Table (C).Back_Up.Context_Name_Chars := A_Name_Chars.Save;
++-- Contexts.Table (C).Back_Up.Units := Unit_Table.Save;
++-- Contexts.Table (C).Back_Up.Trees := Tree_Table.Save;
+
+ -- saving lists tables:
+- Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elmts :=
+- A4G.A_Elists.Elmts.Save;
+- Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elists :=
+- A4G.A_Elists.Elists.Save;
++-- Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elmts :=
++-- A4G.A_Elists.Elmts.Save;
++-- Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elists :=
++-- A4G.A_Elists.Elists.Save;
+ end if;
+ end Save_Context;
+
+
diff --git a/a4g-contt.ads-patch b/a4g-contt.ads-patch
new file mode 100644
index 00000000000..0b582a189ef
--- /dev/null
+++ b/a4g-contt.ads-patch
@@ -0,0 +1,70 @@
+--- asis-gpl-2017-src/asis/a4g-contt.ads
++++ asis-gpl-2017-src-new/asis/a4g-contt.ads
+@@ -387,34 +387,34 @@
+ Table_Index_Type => Int,
+ Table_Low_Bound => 0,
+ Table_Initial => Alloc.Name_Chars_Initial,
+- Table_Increment => Alloc.Name_Chars_Increment,
+- Table_Name => "A_Name_Chars");
++ Table_Increment => Alloc.Name_Chars_Increment);
++-- Table_Name => "A_Name_Chars");
+
+ package Unit_Table is new GNAT.Table (
+ Table_Component_Type => A4G.Unit_Rec.Unit_Record,
+ Table_Index_Type => A4G.A_Types.Unit_Id,
+ Table_Low_Bound => A4G.A_Types.First_Unit_Id,
+ Table_Initial => A4G.A_Alloc.Alloc_ASIS_Units_Initial,
+- Table_Increment => A4G.A_Alloc.Alloc_ASIS_Units_Increment,
+- Table_Name => "ASIS_Compilation_Units");
++ Table_Increment => A4G.A_Alloc.Alloc_ASIS_Units_Increment);
++-- Table_Name => "ASIS_Compilation_Units");
+
+ package Tree_Table is new GNAT.Table (
+ Table_Component_Type => A4G.Tree_Rec.Tree_Record,
+ Table_Index_Type => A4G.A_Types.Tree_Id,
+ Table_Low_Bound => A4G.A_Types.First_Tree_Id,
+ Table_Initial => A4G.A_Alloc.Alloc_ASIS_Trees_Initial,
+- Table_Increment => A4G.A_Alloc.Alloc_ASIS_Trees_Increment,
+- Table_Name => "ASIS_Trees");
++ Table_Increment => A4G.A_Alloc.Alloc_ASIS_Trees_Increment);
++-- Table_Name => "ASIS_Trees");
+
+ subtype Directory_List_Ptr is Argument_List_Access;
+ subtype Tree_File_List_Ptr is Argument_List_Access;
+
+- type Saved_Context is record
+- Context_Name_Chars : A_Name_Chars.Saved_Table;
+- Context_Unit_Lists : A4G.A_Elists.Saved_Lists;
+- Units : Unit_Table.Saved_Table;
+- Trees : Tree_Table.Saved_Table;
+- end record;
++-- type Saved_Context is record
++-- Context_Name_Chars : A_Name_Chars.Saved_Table;
++-- Context_Unit_Lists : A4G.A_Elists.Saved_Lists;
++-- Units : Unit_Table.Saved_Table;
++-- Trees : Tree_Table.Saved_Table;
++-- end record;
+
+ --------------------
+ -- Context Record --
+@@ -502,7 +502,7 @@
+
+ Context_Tree_Files : Tree_File_List_Ptr;
+
+- Back_Up : Saved_Context;
++-- Back_Up : Saved_Context;
+
+ Mode : Context_Mode := All_Trees;
+ Tree_Processing : Tree_Mode := Pre_Created;
+@@ -523,8 +523,8 @@
+ Table_Index_Type => Context_Id,
+ Table_Low_Bound => First_Context_Id,
+ Table_Initial => Alloc_Contexts_Initial,
+- Table_Increment => Alloc_Contexts_Increment,
+- Table_Name => "ASIS_Contexts");
++ Table_Increment => Alloc_Contexts_Increment);
++-- Table_Name => "ASIS_Contexts");
+
+ ------------------------------------------------------
+ -- "Back-Up" Name Buffer for NB_Save and NB_Restore --
+
diff --git a/a4g-defaults.ads-patch b/a4g-defaults.ads-patch
new file mode 100644
index 00000000000..9f0c19ca2bb
--- /dev/null
+++ b/a4g-defaults.ads-patch
@@ -0,0 +1,36 @@
+--- asis-gpl-2017-src/asis/a4g-defaults.ads
++++ asis-gpl-2017-src-new/asis/a4g-defaults.ads
+@@ -60,8 +60,8 @@
+ Table_Index_Type => Dir_Id,
+ Table_Low_Bound => First_Dir_Id,
+ Table_Initial => 12,
+- Table_Increment => 100,
+- Table_Name => "A4G.Defaults.Src_Search_Directories");
++ Table_Increment => 100);
++-- Table_Name => "A4G.Defaults.Src_Search_Directories");
+ -- Table of the names of the directories listed as the value of the
+ -- ADA_INCLUDE_PATH environment variable
+
+@@ -70,8 +70,8 @@
+ Table_Index_Type => Dir_Id,
+ Table_Low_Bound => First_Dir_Id,
+ Table_Initial => 12,
+- Table_Increment => 100,
+- Table_Name => "A4G.Defaults.Lib_Search_Directories");
++ Table_Increment => 100);
++-- Table_Name => "A4G.Defaults.Lib_Search_Directories");
+ -- Table of the names of the directories listed as the value of the
+ -- ADA_OBJECT_PATH environment variable. We are considering object
+ -- and ALI files coming together, so we call them both as library
+@@ -82,8 +82,8 @@
+ Table_Index_Type => Dir_Id,
+ Table_Low_Bound => First_Dir_Id,
+ Table_Initial => 12,
+- Table_Increment => 100,
+- Table_Name => "A4G.Defaults.Lib_Search_Directories");
++ Table_Increment => 100);
++-- Table_Name => "A4G.Defaults.Lib_Search_Directories");
+ -- Table of the names of the directories for dfault trees. Currently
+ -- contains exactly the same information as the table defined by
+ -- ASIS_Lib_Search_Directories, because we consider, that
+
diff --git a/asis-data_decomposition-set_get.ads-patch b/asis-data_decomposition-set_get.ads-patch
new file mode 100644
index 00000000000..1dda2081d14
--- /dev/null
+++ b/asis-data_decomposition-set_get.ads-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/asis/asis-data_decomposition-set_get.ads
++++ asis-gpl-2017-src-new/asis/asis-data_decomposition-set_get.ads
+@@ -57,8 +57,8 @@
+ Table_Index_Type => Asis.ASIS_Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 10,
+- Table_Increment => 100,
+- Table_Name => "Record_Componnet_List");
++ Table_Increment => 100);
++-- Table_Name => "Record_Componnet_List");
+
+ RC_Table : Record_Component_Table.Table_Ptr renames
+ Record_Component_Table.Table;
+
diff --git a/asis-extensions-strings.adb-patch b/asis-extensions-strings.adb-patch
new file mode 100644
index 00000000000..df299915b6e
--- /dev/null
+++ b/asis-extensions-strings.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/asis/asis-extensions-strings.adb
++++ asis-gpl-2017-src-new/asis/asis-extensions-strings.adb
+@@ -62,8 +62,8 @@
+ Table_Index_Type => Integer,
+ Table_Low_Bound => 1,
+ Table_Initial => 10000,
+- Table_Increment => 1000,
+- Table_Name => "character container");
++ Table_Increment => 1000);
++-- Table_Name => "character container");
+
+ Table : Chars.Table_Ptr renames Chars.Table;
+
+
diff --git a/asis.gpr b/asis.gpr
deleted file mode 100644
index 33b259049bb..00000000000
--- a/asis.gpr
+++ /dev/null
@@ -1,12 +0,0 @@
-with "gnat_util";
-Library project Asis is
-
- for Languages use ("Ada");
-
- for Source_Dirs use ("../../include/asis");
- for Library_Dir use "../../lib/asis";
- for Library_Name use "asis";
- for Library_Kind use "static";
- for Externally_Built use "True";
-
-end Asis;
diff --git a/asis.gpr-patch b/asis.gpr-patch
new file mode 100644
index 00000000000..8535dd0515d
--- /dev/null
+++ b/asis.gpr-patch
@@ -0,0 +1,11 @@
+--- asis-gpl-2017-src/asis.gpr
++++ asis-gpl-2017-src-new/asis.gpr
+@@ -22,6 +22,7 @@
+ ------------------------------------------------------------------------------
+
+ with "common";
++with "gnat_util";
+
+ project Asis is
+
+
diff --git a/asis_ui-compiler_options.adb-patch b/asis_ui-compiler_options.adb-patch
new file mode 100644
index 00000000000..87d29aff06d
--- /dev/null
+++ b/asis_ui-compiler_options.adb-patch
@@ -0,0 +1,24 @@
+--- asis-gpl-2017-src/tools/tool_utils/asis_ul-compiler_options.adb
++++ asis-gpl-2017-src-new/tools/tool_utils/asis_ul-compiler_options.adb
+@@ -53,16 +53,16 @@
+ Table_Index_Type => Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 20,
+- Table_Increment => 100,
+- Table_Name => "Compiler options");
++ Table_Increment => 100);
++-- Table_Name => "Compiler options");
+
+ package I_Options is new GNAT.Table (
+ Table_Component_Type => String_Access,
+ Table_Index_Type => Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 20,
+- Table_Increment => 100,
+- Table_Name => "Source search path options");
++ Table_Increment => 100);
++-- Table_Name => "Source search path options");
+
+ function Get_Full_Path_To_RTS (RTS : String) return String;
+ -- Assumes that RTS is a short name of run-time (no path information),
+
diff --git a/asis_ui-global_state.adb-patch b/asis_ui-global_state.adb-patch
new file mode 100644
index 00000000000..7adce8ba951
--- /dev/null
+++ b/asis_ui-global_state.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/tool_utils/asis_ul-global_state.adb
++++ asis-gpl-2017-src-new/tools/tool_utils/asis_ul-global_state.adb
+@@ -138,8 +138,8 @@
+ Table_Index_Type => Scope_Ind_Type,
+ Table_Low_Bound => 1,
+ Table_Initial => 50,
+- Table_Increment => 100,
+- Table_Name => "scope stack table");
++ Table_Increment => 100);
++-- Table_Name => "scope stack table");
+
+ procedure Set_Scope_Level (N : GS_Node_Id; Val : Positive);
+ -- Sets Val as a scope level of N
+
diff --git a/asis_ui-source_table.adb-patch b/asis_ui-source_table.adb-patch
new file mode 100644
index 00000000000..5a93a1b2a3a
--- /dev/null
+++ b/asis_ui-source_table.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/tool_utils/asis_ul-source_table.adb
++++ asis-gpl-2017-src-new/tools/tool_utils/asis_ul-source_table.adb
+@@ -135,8 +135,8 @@
+ Table_Index_Type => SF_Id,
+ Table_Low_Bound => First_SF_Id,
+ Table_Initial => 100,
+- Table_Increment => 100,
+- Table_Name => "Source file table");
++ Table_Increment => 100);
++-- Table_Name => "Source file table");
+
+ Source_Table : Source_File_Table.Table_Ptr renames Source_File_Table.Table;
+
+
diff --git a/gnatcheck-asis_utilities.adb-patch b/gnatcheck-asis_utilities.adb-patch
new file mode 100644
index 00000000000..9581ba4ca2a
--- /dev/null
+++ b/gnatcheck-asis_utilities.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-asis_utilities.adb
++++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-asis_utilities.adb
+@@ -79,8 +79,8 @@
+ Table_Index_Type => Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 100,
+- Table_Increment => 100,
+- Table_Name => "GNATCHECK Element List");
++ Table_Increment => 100);
++-- Table_Name => "GNATCHECK Element List");
+
+ -----------------------
+ -- Local subprograms --
+
diff --git a/gnatcheck-categories.adb-patch b/gnatcheck-categories.adb-patch
new file mode 100644
index 00000000000..88c053e12ec
--- /dev/null
+++ b/gnatcheck-categories.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-categories.adb
++++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-categories.adb
+@@ -48,8 +48,8 @@
+ Table_Index_Type => Category_Id,
+ Table_Low_Bound => Root_Category_Id,
+ Table_Initial => 100,
+- Table_Increment => 100,
+- Table_Name => "Category table");
++ Table_Increment => 100);
++-- Table_Name => "Category table");
+ -- ????
+
+ Categories : All_Categories .Table_Ptr renames All_Categories.Table;
+
diff --git a/gnatcheck-diagnoses_old.adb-patch b/gnatcheck-diagnoses_old.adb-patch
new file mode 100644
index 00000000000..f6e664d0d73
--- /dev/null
+++ b/gnatcheck-diagnoses_old.adb-patch
@@ -0,0 +1,25 @@
+--- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-diagnoses_old.adb
++++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-diagnoses_old.adb
+@@ -124,8 +124,8 @@
+ Table_Index_Type => Diag_Id,
+ Table_Low_Bound => First_Diag,
+ Table_Initial => 10000,
+- Table_Increment => 100,
+- Table_Name => "diagnoses database");
++ Table_Increment => 100);
++-- Table_Name => "diagnoses database");
+
+ Diag_Table : Rule_Violations.Table_Ptr renames Rule_Violations.Table;
+
+@@ -160,8 +160,8 @@
+ Table_Index_Type => SF_Id,
+ Table_Low_Bound => First_SF_Id,
+ Table_Initial => 10000,
+- Table_Increment => 100,
+- Table_Name => "diagnoses mapping database");
++ Table_Increment => 100);
++-- Table_Name => "diagnoses mapping database");
+ -- The Mapping Table. We have to use dynamic table here, because we do not
+ -- know in advance how many needed sources may be added during the rule
+ -- checking
+
diff --git a/gnatcheck-name_dictionary.adb-patch b/gnatcheck-name_dictionary.adb-patch
new file mode 100644
index 00000000000..c32d8903f65
--- /dev/null
+++ b/gnatcheck-name_dictionary.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-name_dictionary.adb
++++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-name_dictionary.adb
+@@ -62,8 +62,8 @@
+ Table_Index_Type => Dictionary_Id,
+ Table_Low_Bound => First_Dictionary_Id,
+ Table_Initial => 100,
+- Table_Increment => 100,
+- Table_Name => "GNATCHECK Name Dictionary");
++ Table_Increment => 100);
++-- Table_Name => "GNATCHECK Name Dictionary");
+
+ package Dictionary_Hash_Table is new
+ ASIS_UL.Misc.String_Hash_Table (Entry_Id => Dictionary_Id);
+
diff --git a/gnatcheck-rules-custom_1.adb-patch b/gnatcheck-rules-custom_1.adb-patch
new file mode 100644
index 00000000000..eb9caf615e7
--- /dev/null
+++ b/gnatcheck-rules-custom_1.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-rules-custom_1.adb
++++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-rules-custom_1.adb
+@@ -8774,8 +8774,8 @@
+ Table_Index_Type => Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 20,
+- Table_Increment => 50,
+- Table_Name => "OUT parameters");
++ Table_Increment => 50);
++-- Table_Name => "OUT parameters");
+
+ procedure Set_OUT_Parameters (El : Asis.Element);
+ -- Supposing that El is a procedure body declaration, sets in
+
diff --git a/gnatcheck-rules-rule_table.adb-patch b/gnatcheck-rules-rule_table.adb-patch
new file mode 100644
index 00000000000..e04fbcfc3db
--- /dev/null
+++ b/gnatcheck-rules-rule_table.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-rules-rule_table.adb
++++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-rules-rule_table.adb
+@@ -58,8 +58,8 @@
+ Table_Index_Type => Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 20,
+- Table_Increment => 100,
+- Table_Name => "Rule file stack");
++ Table_Increment => 100);
++-- Table_Name => "Rule file stack");
+ -- Keeps the names of the "nested" rule files, in the order of the
+ -- macro expansion that is currently performed, is used to detect looping
+ -- in macro expansions
+
diff --git a/gnatcheck-rules-rule_table.ads-patch b/gnatcheck-rules-rule_table.ads-patch
new file mode 100644
index 00000000000..137482c4954
--- /dev/null
+++ b/gnatcheck-rules-rule_table.ads-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-rules-rule_table.ads
++++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-rules-rule_table.ads
+@@ -107,8 +107,8 @@
+ Table_Index_Type => Rule_Id,
+ Table_Low_Bound => First_Rule,
+ Table_Initial => 100,
+- Table_Increment => 100,
+- Table_Name => "Rule table");
++ Table_Increment => 100);
++-- Table_Name => "Rule table");
+
+ function Get_Rule (Rule_Name : String) return Rule_Id;
+ -- Returns the Id for the rule registered under the name Rule_Name or
+
diff --git a/gnatcheck-traversal_stack.adb-patch b/gnatcheck-traversal_stack.adb-patch
new file mode 100644
index 00000000000..a3fdca40228
--- /dev/null
+++ b/gnatcheck-traversal_stack.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-traversal_stack.adb
++++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-traversal_stack.adb
+@@ -58,8 +58,8 @@
+ Table_Index_Type => Elmt_Idx,
+ Table_Low_Bound => 1,
+ Table_Initial => 100,
+- Table_Increment => 100,
+- Table_Name => "Traversal Stack");
++ Table_Increment => 100);
++-- Table_Name => "Traversal Stack");
+
+ Stack : Stack_Table.Table_Ptr renames Stack_Table.Table;
+
+
diff --git a/gnatelim-closure.adb-patch b/gnatelim-closure.adb-patch
new file mode 100644
index 00000000000..756f82cdb1f
--- /dev/null
+++ b/gnatelim-closure.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatelim/gnatelim-closure.adb
++++ asis-gpl-2017-src-new/tools/gnatelim/gnatelim-closure.adb
+@@ -63,8 +63,8 @@
+ Table_Index_Type => Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 20,
+- Table_Increment => 100,
+- Table_Name => "Tool options");
++ Table_Increment => 100);
++-- Table_Name => "Tool options");
+ -- Used to compose a list of switches to call a tool
+
+ -----------------------
+
diff --git a/metrics-source_table.adb-patch b/metrics-source_table.adb-patch
new file mode 100644
index 00000000000..0aad386135b
--- /dev/null
+++ b/metrics-source_table.adb-patch
@@ -0,0 +1,14 @@
+--- asis-gpl-2017-src/tools/gnatmetric/metrics-source_table.adb
++++ asis-gpl-2017-src-new/tools/gnatmetric/metrics-source_table.adb
+@@ -38,8 +38,8 @@
+ Table_Index_Type => SF_Id,
+ Table_Low_Bound => First_SF_Id,
+ Table_Initial => 100,
+- Table_Increment => 100,
+- Table_Name => "Source file metric table");
++ Table_Increment => 100);
++-- Table_Name => "Source file metric table");
+
+ Source_Metric_Table : Source_File_Metric_Table.Table_Ptr renames
+ Source_File_Metric_Table.Table;
+
diff --git a/patch-Makefile b/patch-Makefile
deleted file mode 100644
index 14292d71277..00000000000
--- a/patch-Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-*** Makefile 2016-06-04 13:24:14.729351920 +1000
---- Makefile-new 2016-06-04 13:27:00.459358720 +1000
-***************
-*** 27,50 ****
- # ==================================================== install
-
- install-clean:
-! ifneq (,$(wildcard $(DESTDIR)$$(prefix)/lib/gnat/manifests/asislib))
- -$(GPRINSTALL) --uninstall --prefix=$(DESTDIR)$$(prefix) \
- --project-subdir=lib/gnat asislib
- endif
-
- install: install-clean
-! $(GPRINSTALL) -p -f --prefix=$(DESTDIR)$$(prefix) --sources-subdir=include/asis \
- --lib-subdir=lib/asis --project-subdir=lib/gnat -XBLD=$(BLD) \
- -XASISOPSYS=$(ASISOPSYS) -XASIS_COMPONENTS=lib build_asis.gpr
-
- install-tools-clean:
-! ifneq (,$(wildcard $(DESTDIR)$$(prefix)/lib/gnat/manifests/asistools))
-! -$(GPRINSTALL) --uninstall --prefix=$(DESTDIR)$$(prefix) \
- --project-subdir=lib/gnat asistools
- endif
-
- install-tools: install-tools-clean
-! $(GPRINSTALL) -p -f --prefix=$(DESTDIR)$$(prefix) --sources-subdir=include/asis \
- --lib-subdir=lib/asis --project-subdir=lib/gnat -XBLD=$(BLD) \
- -XASISOPSYS=$(ASISOPSYS) -XASIS_COMPONENTS=tools build_asis.gpr
-
---- 27,50 ----
- # ==================================================== install
-
- install-clean:
-! ifneq (,$(wildcard $(DESTDIR)$(prefix)/lib/gnat/manifests/asislib))
- -$(GPRINSTALL) --uninstall --prefix=$(DESTDIR)$$(prefix) \
- --project-subdir=lib/gnat asislib
- endif
-
- install: install-clean
-! $(GPRINSTALL) -p -f --prefix=$(DESTDIR)$(prefix) --sources-subdir=include/asis \
- --lib-subdir=lib/asis --project-subdir=lib/gnat -XBLD=$(BLD) \
- -XASISOPSYS=$(ASISOPSYS) -XASIS_COMPONENTS=lib build_asis.gpr
-
- install-tools-clean:
-! ifneq (,$(wildcard $(DESTDIR)$(prefix)/lib/gnat/manifests/asistools))
-! -$(GPRINSTALL) --uninstall --prefix=$(DESTDIR)$(prefix) \
- --project-subdir=lib/gnat asistools
- endif
-
- install-tools: install-tools-clean
-! $(GPRINSTALL) -p -f --prefix=$(DESTDIR)$(prefix) --sources-subdir=include/asis \
- --lib-subdir=lib/asis --project-subdir=lib/gnat -XBLD=$(BLD) \
- -XASISOPSYS=$(ASISOPSYS) -XASIS_COMPONENTS=tools build_asis.gpr
-
diff --git a/patch-a4g-a_opt.adb b/patch-a4g-a_opt.adb
deleted file mode 100644
index 5a4e3efb40e..00000000000
--- a/patch-a4g-a_opt.adb
+++ /dev/null
@@ -1,20 +0,0 @@
---- asis/a4g-a_opt.adb-orig 2015-11-04 08:07:22.751223374 +1100
-+++ asis/a4g-a_opt.adb 2015-11-04 08:08:19.197892357 +1100
-@@ -175,7 +175,7 @@
- when 's' =>
-
- if Parameter = "-sv" then
-- Strong_Version_Check := True;
-+ Strong_Version_Check := False;
- else
- Unknown_Parameter := True;
- end if;
-@@ -241,7 +241,7 @@
- begin
- Is_Initialized := False;
- ASIS_Warning_Mode := Normal;
-- Strong_Version_Check := True;
-+ Strong_Version_Check := False;
- Generate_Bug_Box := True;
- Keep_Going := False;
- end Set_Off;
diff --git a/patch-a4g-a_opt.ads b/patch-a4g-a_opt.ads
deleted file mode 100644
index 592b20a6b83..00000000000
--- a/patch-a4g-a_opt.ads
+++ /dev/null
@@ -1,11 +0,0 @@
---- asis/a4g-a_opt.ads-old 2015-11-04 07:49:30.264512698 +1100
-+++ asis/a4g-a_opt.ads 2015-11-04 07:49:54.257847015 +1100
-@@ -59,7 +59,7 @@
- -- treated as an error: ASIS_Failed is raised and the warning message is
- -- sent to an ASIS Diagnosis string.
-
-- Strong_Version_Check : Boolean := True;
-+ Strong_Version_Check : Boolean := False;
- -- Strong version check means that version strings read from the tree and
- -- stored in Gnatvsn are compared. Weak check means comparing ASIS version
- -- numbers. See BA23-002
diff --git a/patch-a4g-encl_el.adb b/patch-a4g-encl_el.adb
deleted file mode 100644
index 349d426f5fd..00000000000
--- a/patch-a4g-encl_el.adb
+++ /dev/null
@@ -1,19 +0,0 @@
-*** asis/a4g-encl_el.adb 2016-05-16 19:17:27.000000000 +1000
---- asis/a4g-encl_el.adb-new 2016-06-04 11:32:33.972410280 +1000
-***************
-*** 2798,2804 ****
-
- if Nkind (Rough_Result_Node) = N_Subprogram_Body
- and then not (Comes_From_Source (Rough_Result_Node))
-! and then Was_Expression_Function (Rough_Result_Node)
- then
- Set_Int_Kind
- (Rough_Result_Element, An_Expression_Function_Declaration);
---- 2798,2804 ----
-
- if Nkind (Rough_Result_Node) = N_Subprogram_Body
- and then not (Comes_From_Source (Rough_Result_Node))
-! and then Sinfo.Was_Expression_Function (Rough_Result_Node)
- then
- Set_Int_Kind
- (Rough_Result_Element, An_Expression_Function_Declaration);