summaryrefslogtreecommitdiff
path: root/libada
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2008-08-14 19:00:56 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2008-08-14 19:00:56 +0000
commitddda25955ee583217ccbd7ad5c33c6bb9f304649 (patch)
treeed58c0f92eec5cacc819d56d29106d38a318e9ac /libada
parent04fa393515487bde6dc2a0bc318398d983825365 (diff)
downloadgcc-ddda25955ee583217ccbd7ad5c33c6bb9f304649.tar.gz
2008-08-14 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r139100 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@139113 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libada')
-rw-r--r--libada/ChangeLog5
-rw-r--r--libada/Makefile.in3
2 files changed, 6 insertions, 2 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index e56394e0a40..c95c7342a5d 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06 Thomas Quinot <quinot@adacore.com>
+
+ * Makefile.in: generate s-oscons.ads again, previous change was
+ unneeded.
+
2008-08-06 Samuel Tardieu <sam@rfc1149.net>
* Makefile.in: Pass FLAGS_TO_PASS to sub-make for target
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 211e3eb50f1..01759f36881 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -95,8 +95,7 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile
oscons:
$(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" \
- $(FLAGS_TO_PASS) \
- ada/s-oscons-$(THREAD_KIND).ads
+ $(FLAGS_TO_PASS) ada/s-oscons.ads
# Check uninstalled version.
check: