From 1f24914a41cd6a8c2025ef2f60052feba8c3dc1f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 4 Feb 2005 05:25:15 +0000 Subject: 2005-02-04 Ralf Corsepius PR 754/rtems * rtems/asm.h: New (relocated from .). * asm.h: Remove (moved to rtems/asm.h). * Makefile.am: Reflect changes above. --- cpukit/score/cpu/unix/ChangeLog | 7 +++++++ cpukit/score/cpu/unix/Makefile.am | 4 ++-- cpukit/score/cpu/unix/asm.h | 36 ------------------------------------ 3 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 cpukit/score/cpu/unix/asm.h (limited to 'cpukit/score/cpu/unix') diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog index fd1e956854..065e73578d 100644 --- a/cpukit/score/cpu/unix/ChangeLog +++ b/cpukit/score/cpu/unix/ChangeLog @@ -1,3 +1,10 @@ +2005-02-04 Ralf Corsepius + + PR 754/rtems + * rtems/asm.h: New (relocated from .). + * asm.h: Remove (moved to rtems/asm.h). + * Makefile.am: Reflect changes above. + 2004-01-28 Ralf Corsepius * asm.h, rtems/score/cpu.h, rtems/score/types.h, rtems/score/unix.h: diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am index 68b786efa5..d0fb9910c7 100644 --- a/cpukit/score/cpu/unix/Makefile.am +++ b/cpukit/score/cpu/unix/Makefile.am @@ -7,7 +7,7 @@ include $(top_srcdir)/automake/compile.am AM_CPPFLAGS += -DCPU_SYNC_IO include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = asm.h +include_rtems_HEADERS = rtems/asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/types.h rtems/score/cpu.h \ @@ -27,7 +27,7 @@ $(PROJECT_INCLUDE)/rtems/$(dirstamp): @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/rtems/asm.h: asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) +$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h diff --git a/cpukit/score/cpu/unix/asm.h b/cpukit/score/cpu/unix/asm.h deleted file mode 100644 index 24abe24387..0000000000 --- a/cpukit/score/cpu/unix/asm.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @file rtems/asm.h - * - * This include file attempts to address the problems - * caused by incompatible flavors of assemblers and - * toolsets. It primarily addresses variations in the - * use of leading underscores on symbols and the requirement - * that register names be preceded by a %. - * - * This file is a "just an incomplete stub" and provided for consistency - * with other ports, only. - */ - -/* - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ASM_H -#define _RTEMS_ASM_H - -/* - * Indicate we are in an assembly file and get the basic CPU definitions. - */ - -#ifndef ASM -#define ASM -#endif - -#include -#include - -#endif -- cgit v1.2.3