URL
https://opencores.org/ocsvn/openrisc_me/openrisc_me/trunk
Subversion Repositories openrisc_me
Compare Revisions
- This comparison shows the changes necessary to convert path
/openrisc/trunk/or1ksim/testsuite/test-code-or1k/int-logger
- from Rev 428 to Rev 432
- ↔ Reverse comparison
Rev 428 → Rev 432
/int-logger-level.c
File deleted
int-logger-level.c
Property changes :
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: int-logger-edge.c
===================================================================
--- int-logger-edge.c (revision 428)
+++ int-logger-edge.c (nonexistent)
@@ -1,132 +0,0 @@
-/* int-logger-edge.c. Test of Or1ksim handling of edge triggered interrupts
-
- Copyright (C) 2010 Embecosm Limited
-
- Contributors various OpenCores participants
- Contributor Jeremy Bennett
-
- This file is part of OpenRISC 1000 Architectural Simulator.
-
- 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 3 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, see
int-logger-edge.c
Property changes :
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: Makefile.in
===================================================================
--- Makefile.in (revision 428)
+++ Makefile.in (revision 432)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -58,7 +58,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-check_PROGRAMS = int-logger-edge$(EXEEXT) int-logger-level$(EXEEXT)
+check_PROGRAMS = int-logger$(EXEEXT)
subdir = int-logger
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -72,20 +72,12 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am_int_logger_edge_OBJECTS = int-logger-edge.$(OBJEXT)
-int_logger_edge_OBJECTS = $(am_int_logger_edge_OBJECTS)
-int_logger_edge_DEPENDENCIES = ../except/except.lo \
- ../support/libsupport.la
-int_logger_edge_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+am_int_logger_OBJECTS = int-logger.$(OBJEXT)
+int_logger_OBJECTS = $(am_int_logger_OBJECTS)
+int_logger_DEPENDENCIES = ../except/except.lo ../support/libsupport.la
+int_logger_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(int_logger_edge_LDFLAGS) $(LDFLAGS) -o $@
-am_int_logger_level_OBJECTS = int-logger-level.$(OBJEXT)
-int_logger_level_OBJECTS = $(am_int_logger_level_OBJECTS)
-int_logger_level_DEPENDENCIES = ../except/except.lo \
- ../support/libsupport.la
-int_logger_level_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(int_logger_level_LDFLAGS) $(LDFLAGS) -o $@
+ $(int_logger_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../depcomp
am__depfiles_maybe = depfiles
@@ -99,8 +91,8 @@
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(int_logger_edge_SOURCES) $(int_logger_level_SOURCES)
-DIST_SOURCES = $(int_logger_edge_SOURCES) $(int_logger_level_SOURCES)
+SOURCES = $(int_logger_SOURCES)
+DIST_SOURCES = $(int_logger_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -219,16 +211,11 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-int_logger_edge_SOURCES = int-logger-edge.c
-int_logger_edge_LDFLAGS = -T$(srcdir)/../default.ld
-int_logger_edge_LDADD = ../except/except.lo \
- ../support/libsupport.la
+int_logger_SOURCES = int-logger.c
+int_logger_LDFLAGS = -T$(srcdir)/../default.ld
+int_logger_LDADD = ../except/except.lo \
+ ../support/libsupport.la
-int_logger_level_SOURCES = int-logger-level.c
-int_logger_level_LDFLAGS = -T$(srcdir)/../default.ld
-int_logger_level_LDADD = ../except/except.lo \
- ../support/libsupport.la
-
all: all-am
.SUFFIXES:
@@ -272,12 +259,9 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-int-logger-edge$(EXEEXT): $(int_logger_edge_OBJECTS) $(int_logger_edge_DEPENDENCIES)
- @rm -f int-logger-edge$(EXEEXT)
- $(int_logger_edge_LINK) $(int_logger_edge_OBJECTS) $(int_logger_edge_LDADD) $(LIBS)
-int-logger-level$(EXEEXT): $(int_logger_level_OBJECTS) $(int_logger_level_DEPENDENCIES)
- @rm -f int-logger-level$(EXEEXT)
- $(int_logger_level_LINK) $(int_logger_level_OBJECTS) $(int_logger_level_LDADD) $(LIBS)
+int-logger$(EXEEXT): $(int_logger_OBJECTS) $(int_logger_DEPENDENCIES)
+ @rm -f int-logger$(EXEEXT)
+ $(int_logger_LINK) $(int_logger_OBJECTS) $(int_logger_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -285,8 +269,7 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/int-logger-edge.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/int-logger-level.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/int-logger.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
/Makefile.am
24,21 → 24,12
# ----------------------------------------------------------------------------- |
|
|
# Test programs which report on interrupts received. One for edge triggered, |
# one for level triggered. |
check_PROGRAMS = int-logger-edge \ |
int-logger-level |
# Test program which reports on interrupts received. |
check_PROGRAMS = int-logger |
|
int_logger_edge_SOURCES = int-logger-edge.c |
int_logger_SOURCES = int-logger.c |
|
int_logger_edge_LDFLAGS = -T$(srcdir)/../default.ld |
int_logger_LDFLAGS = -T$(srcdir)/../default.ld |
|
int_logger_edge_LDADD = ../except/except.lo \ |
../support/libsupport.la |
|
int_logger_level_SOURCES = int-logger-level.c |
|
int_logger_level_LDFLAGS = -T$(srcdir)/../default.ld |
|
int_logger_level_LDADD = ../except/except.lo \ |
../support/libsupport.la |
int_logger_LDADD = ../except/except.lo \ |
../support/libsupport.la |