1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
Description: split mmap.s into mmap.s and mmap64.s
Also add an explicit rule for mmap64.o: GNU make takes
mmap.s for mmap64.o by default, but sunmake - mmap64.s (WTF?)
Bug: https://www.illumos.org/issues/2404
Index: b/usr/src/lib/libc/common/sys/mmap.s
===================================================================
--- a/usr/src/lib/libc/common/sys/mmap.s
+++ b/usr/src/lib/libc/common/sys/mmap.s
@@ -31,17 +31,11 @@
#include <sys/asm_linkage.h>
-#if !defined(_LARGEFILE_SOURCE)
- ANSI_PRAGMA_WEAK(mmap,function)
-#else
- ANSI_PRAGMA_WEAK(mmap64,function)
-#endif
+ANSI_PRAGMA_WEAK(mmap,function)
#include "SYS.h"
#include <sys/mman.h> /* Need _MAP_NEW definition */
-#if !defined(_LARGEFILE_SOURCE)
-
/*
* C library -- mmap
* caddr_t mmap(caddr_t addr, size_t len, int prot,
@@ -59,23 +53,3 @@
RET
SET_SIZE(mmap)
-#else
-
-/*
- * C library -- mmap64
- * caddr_t mmap64(caddr_t addr, size_t len, int prot,
- * int flags, int fd, off64_t off)
- */
-
- ENTRY(mmap64)
-#if defined(__sparc)
- /* this depends upon the _MAP_NEW flag being in the top bits */
- sethi %hi(_MAP_NEW), %g1
- or %g1, %o3, %o3
-#endif
- SYSTRAP_RVAL1(mmap64)
- SYSCERROR
- RET
- SET_SIZE(mmap64)
-
-#endif
Index: b/usr/src/lib/libc/common/sys/mmap64.s
===================================================================
--- /dev/null
+++ b/usr/src/lib/libc/common/sys/mmap64.s
@@ -0,0 +1,56 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/* Copyright (c) 1988 AT&T */
+/* All Rights Reserved */
+
+ .file "mmap64.s"
+
+#include <sys/asm_linkage.h>
+
+ANSI_PRAGMA_WEAK(mmap64,function)
+
+#include "SYS.h"
+#include <sys/mman.h> /* Need _MAP_NEW definition */
+
+
+/*
+ * C library -- mmap64
+ * caddr_t mmap64(caddr_t addr, size_t len, int prot,
+ * int flags, int fd, off64_t off)
+ */
+
+ ENTRY(mmap64)
+#if defined(__sparc)
+ /* this depends upon the _MAP_NEW flag being in the top bits */
+ sethi %hi(_MAP_NEW), %g1
+ or %g1, %o3, %o3
+#endif
+ SYSTRAP_RVAL1(mmap64)
+ SYSCERROR
+ RET
+ SET_SIZE(mmap64)
+
Index: b/usr/src/lib/libc/Makefile.targ
===================================================================
--- a/usr/src/lib/libc/Makefile.targ
+++ b/usr/src/lib/libc/Makefile.targ
@@ -103,6 +103,10 @@ pics/%.o: $(LIBCBASE)/../$(TARGET_ARCH)/
# rules to build large file aware objects (xxx64.o from xxx.s or xxx.c)
+pics/mmap64.o: $(LIBCBASE)/../common/sys/mmap64.s
+ $(BUILD.s)
+ $(POST_PROCESS_O)
+
pics/%64.o: $(LIBCBASE)/../common/sys/%.s
$(BUILD.s)
$(POST_PROCESS_O)
|
