* gdb.ada/gnat_ada.gin: Delete, no longer used.
* lib/ada.exp (gdb_compile_ada): Minor adaptation to new project file.
* configure.ac: No longer generate gnat_ada.gpr.
* configure: Regenerate.
* gdb.ada/Makefile.in: Minor adaptations due to new project file.
* gdb.ada/null_record/null_record.adb: Moved here from gdb.ada.
* gdb.ada/null_record/bar.ads: Likewise.
* gdb.ada/null_record/bar.adb: Likewise.
* gdb.ada/fixed_points/fixed_points.adb: Likewise.
* gdb.ada/null_record.exp (testdir): New variable.
(testfile): executable is now in testdir subdirectory.
(srcfile): Use full path to the main compilation unit.
* gdb.ada/fixed_points.exp: Same changes as above.
+2005-02-03 Joel Brobecker <brobecker@adacore.com>
+
+ * gdb.ada/gnat_ada.gpr: New file.
+ * gdb.ada/gnat_ada.gin: Delete, no longer used.
+ * lib/ada.exp (gdb_compile_ada): Minor adaptation to new project file.
+ * configure.ac: No longer generate gnat_ada.gpr.
+ * configure: Regenerate.
+ * gdb.ada/Makefile.in: Minor adaptations due to new project file.
+ * gdb.ada/null_record/null_record.adb: Moved here from gdb.ada.
+ * gdb.ada/null_record/bar.ads: Likewise.
+ * gdb.ada/null_record/bar.adb: Likewise.
+ * gdb.ada/fixed_points/fixed_points.adb: Likewise.
+ * gdb.ada/null_record.exp (testdir): New variable.
+ (testfile): executable is now in testdir subdirectory.
+ (srcfile): Use full path to the main compilation unit.
+ * gdb.ada/fixed_points.exp: Same changes as above.
+
2005-02-03 Nick Roberts <nickrob@snap.net.nz>
* gdb.base/interp.exp: New test.
- ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.ada/gnat_ada.gpr:gdb.ada/gnat_ada.gin gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"
+ ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"gdb.ada/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.ada/Makefile" ;;
- "gdb.ada/gnat_ada.gpr" ) CONFIG_FILES="$CONFIG_FILES gdb.ada/gnat_ada.gpr:gdb.ada/gnat_ada.gin" ;;
"gdb.arch/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.arch/Makefile" ;;
"gdb.asm/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.asm/Makefile" ;;
"gdb.base/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.base/Makefile" ;;
AC_EXEEXT
AC_OUTPUT([Makefile \
- gdb.ada/Makefile gdb.ada/gnat_ada.gpr:gdb.ada/gnat_ada.gin \
+ gdb.ada/Makefile \
gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile \
VPATH = @srcdir@
srcdir = @srcdir@
-EXECUTABLES = null_record
+EXECUTABLES = null_record/null_record fixed_points/fixed_points
MISCELLANEOUS =
@echo "Nothing to be done for $@..."
clean mostlyclean:
- -gnatclean -Pgnat_ada -q $(EXECUTABLES)
+ -find . -name '*.o' -print | xargs rm -f
+ -find . -name '*.ali' -print | xargs rm -f
+ -find . -name 'b~*.ad[sb]' -print | xargs rm -f
+ -rm -f *~ a.out xgdb *.x *.ci *.tmp
-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
-rm -f $(MISCELLANEOUS) twice-tmp.c
distclean maintainer-clean realclean: clean
-rm -f *~ core
- -rm -f Makefile config.status config.log gnat_ada.gpr
+ -rm -f Makefile config.status config.log
-rm -f *-init.exp
-rm -fr *.log summary detail *.plog *.sum *.psum site.*
+++ /dev/null
--- Copyright 2004 Free Software Foundation, Inc.
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-package body Bar is
-
- procedure Do_Nothing is
- begin
- null;
- end Do_Nothing;
-
-end Bar;
+++ /dev/null
--- Copyright 2004 Free Software Foundation, Inc.
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-package Bar is
-
- type Empty is null record;
-
- procedure Do_Nothing;
-
-end Bar;
+++ /dev/null
--- Copyright 2004 Free Software Foundation, Inc.
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-with System;
-
-procedure Fixed_Points is
-
- type Base_Fixed_Point_Type is
- delta 1.0 / 16.0
- range (System.Min_Int / 2) * 1.0 / 16.0 ..
- (System.Max_Int / 2) * 1.0 / 16.0;
-
- subtype Fixed_Point_Subtype is
- Base_Fixed_Point_Type range -50.0 .. 50.0;
-
- type New_Fixed_Point_Type is
- new Base_Fixed_Point_Type range -50.0 .. 50.0;
-
- Base_Object : Base_Fixed_Point_Type := -50.0;
- Subtype_Object : Fixed_Point_Subtype := -50.0;
- New_Type_Object : New_Fixed_Point_Type := -50.0;
-begin
- Base_Object := 1.0/16.0; -- Set breakpoint here
- Subtype_Object := 1.0/16.0;
- New_Type_Object := 1.0/16.0;
-end Fixed_Points;
load_lib "ada.exp"
-set testfile "fixed_points"
-set srcfile ${testfile}.adb
+set testdir "fixed_points"
+set testfile "${testdir}/fixed_points"
+set srcfile ${srcdir}/${subdir}/${testfile}.adb
set binfile ${objdir}/${subdir}/${testfile}
if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-set bp_location [gdb_get_line_number "Set breakpoint here"]
-runto "${srcfile}:$bp_location"
+set bp_location [gdb_get_line_number "Set breakpoint here" ${testdir}/fixed_points.adb]
+runto "fixed_points.adb:$bp_location"
gdb_test "print base_object" \
".* = -50" \
--- /dev/null
+-- Copyright 2004 Free Software Foundation, Inc.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+with System;
+
+procedure Fixed_Points is
+
+ type Base_Fixed_Point_Type is
+ delta 1.0 / 16.0
+ range (System.Min_Int / 2) * 1.0 / 16.0 ..
+ (System.Max_Int / 2) * 1.0 / 16.0;
+
+ subtype Fixed_Point_Subtype is
+ Base_Fixed_Point_Type range -50.0 .. 50.0;
+
+ type New_Fixed_Point_Type is
+ new Base_Fixed_Point_Type range -50.0 .. 50.0;
+
+ Base_Object : Base_Fixed_Point_Type := -50.0;
+ Subtype_Object : Fixed_Point_Subtype := -50.0;
+ New_Type_Object : New_Fixed_Point_Type := -50.0;
+begin
+ Base_Object := 1.0/16.0; -- Set breakpoint here
+ Subtype_Object := 1.0/16.0;
+ New_Type_Object := 1.0/16.0;
+end Fixed_Points;
+++ /dev/null
--- Copyright 2004 Free Software Foundation, Inc.
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
--- This project file allows us to control the location where the
--- compilation artifacts produced when building the Ada examples
--- are stored.
-
-project Gnat_Ada is
-
- for Source_Dirs use ("@srcdir@");
- -- No need to set the Object_Dir, it is set to "." by default
- -- (which means the same directory as this project file).
-
-end Gnat_Ada;
--- /dev/null
+-- Copyright 2004 Free Software Foundation, Inc.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-- This project file allows us to control the location where the
+-- compilation artifacts produced when building the Ada examples
+-- are stored.
+
+project Gnat_Ada is
+
+ for Source_Dirs use (external ("SRC"));
+ for Object_Dir use external ("OBJ");
+
+end Gnat_Ada;
+++ /dev/null
--- Copyright 2004 Free Software Foundation, Inc.
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-with Bar; use Bar;
-
-procedure Null_Record is
-begin
- Do_Nothing;
-end Null_Record;
-
load_lib "ada.exp"
-set testfile "null_record"
-set srcfile ${testfile}.adb
+set testdir "null_record"
+set testfile "${testdir}/null_record"
+set srcfile ${srcdir}/${subdir}/${testfile}.adb
set binfile ${objdir}/${subdir}/${testfile}
if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
--- /dev/null
+-- Copyright 2004 Free Software Foundation, Inc.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+package body Bar is
+
+ procedure Do_Nothing is
+ begin
+ null;
+ end Do_Nothing;
+
+end Bar;
--- /dev/null
+-- Copyright 2004 Free Software Foundation, Inc.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+package Bar is
+
+ type Empty is null record;
+
+ procedure Do_Nothing;
+
+end Bar;
--- /dev/null
+-- Copyright 2004 Free Software Foundation, Inc.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+with Bar; use Bar;
+
+procedure Null_Record is
+begin
+ Do_Nothing;
+end Null_Record;
+
proc gdb_compile_ada {source dest type options} {
+ set srcdir [file dirname $source]
+ set gprdir [file dirname $srcdir]
set objdir [file dirname $dest]
append options " ada"
- append options " additional_flags=-P$objdir/gnat_ada"
+ append options " additional_flags=-P$gprdir/gnat_ada"
+ append options " additional_flags=-XSRC=[file tail $srcdir]"
+ append options " additional_flags=-XOBJ=$objdir"
- set result [target_compile $source $dest $type $options]
+ set result [target_compile [file tail $source] $dest $type $options]
# The Ada build always produces some output, even when the build
# succeeds. Thus, we can not use the output the same way we do in
projects / binutils-gdb.git / commitdiff