summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1994-08-19 11:20:11 +0000
committerjkh <jkh@FreeBSD.org>1994-08-19 11:20:11 +0000
commit070c4a2af3f41e7fce7518bd014d79dcb7efb8dc (patch)
tree2d58a80badd871d679d496aa72ffecdcb0eb4348 /sys
parentfd411c4b0968f1c14e35654fe1b872ee4df37423 (diff)
downloadFreeBSD-src-070c4a2af3f41e7fce7518bd014d79dcb7efb8dc.zip
FreeBSD-src-070c4a2af3f41e7fce7518bd014d79dcb7efb8dc.tar.gz
1. Make this idempotent.
2. Hack. Hack is to define RCSID() to null macro so that new msun stuff will compile. This does NOT belong here, and I DON'T want it to stay, I just need to put this here for now to enable msun and we need to talk about what our RCSID story is supposed to be. We talked about supporting RCSID() one day, and everyone seemed to like the idea reasonably well of making it a macro you could just no-op this way, but we never did anything. Now I see that JTCs code has it and I'm loath to remove it or do anything until we've discussed it some more. Well, so how about it? What's our story vis-a-vis RCSID() going to be? Submitted by: jkh
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/include/asmacros.h10
-rw-r--r--sys/i386/include/asmacros.h10
2 files changed, 18 insertions, 2 deletions
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index 3b2fdf9..6b4e27b 100644
--- a/sys/amd64/include/asmacros.h
+++ b/sys/amd64/include/asmacros.h
@@ -30,9 +30,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: asmacros.h,v 1.3 1994/08/02 07:38:40 davidg Exp $
*/
+#ifndef _ASMACROS_H_
+#define _ASMACROS_H_ 1
+
#define ALIGN_DATA .align 2 /* 4 byte alignment, zero filled */
#define ALIGN_TEXT .align 2,0x90 /* 4-byte alignment, nop filled */
#define SUPERALIGN_TEXT .align 4,0x90 /* 16-byte alignment (better for 486), nop filled */
@@ -82,3 +85,8 @@
#define NOP pushl %eax ; inb $0x84,%al ; inb $0x84,%al ; popl %eax
#endif
+#ifndef RCSID
+#define RCSID(a)
+#endif
+
+#endif /* _ASMACROS_H_ */
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index 3b2fdf9..6b4e27b 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -30,9 +30,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: asmacros.h,v 1.3 1994/08/02 07:38:40 davidg Exp $
*/
+#ifndef _ASMACROS_H_
+#define _ASMACROS_H_ 1
+
#define ALIGN_DATA .align 2 /* 4 byte alignment, zero filled */
#define ALIGN_TEXT .align 2,0x90 /* 4-byte alignment, nop filled */
#define SUPERALIGN_TEXT .align 4,0x90 /* 16-byte alignment (better for 486), nop filled */
@@ -82,3 +85,8 @@
#define NOP pushl %eax ; inb $0x84,%al ; inb $0x84,%al ; popl %eax
#endif
+#ifndef RCSID
+#define RCSID(a)
+#endif
+
+#endif /* _ASMACROS_H_ */
OpenPOWER on IntegriCloud