about summary refs log tree commit diff
path: root/arch
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2019-11-01 20:11:08 -0400
committerRich Felker <dalias@aerifal.cx>2019-11-02 18:30:56 -0400
commitc71dbb24c947dc14f43960bfec4da670fccba580 (patch)
treea2430f8fb3c64fcf87a339b63485b51d698a50df /arch
parent38143339646a4ccce8afe298c34467767c899f51 (diff)
downloadmusl-c71dbb24c947dc14f43960bfec4da670fccba580.tar.gz
musl-c71dbb24c947dc14f43960bfec4da670fccba580.tar.xz
musl-c71dbb24c947dc14f43960bfec4da670fccba580.zip
move time64 socket options from arch bits to top-level sys/socket.h
now that all 32-bit archs have 64-bit time types, the values for the
time-related socket option macros can be treated as universal for
32-bit archs. the sys/socket.h mechanism for this predates
arch/generic and is instead in the top-level header.

x32, which does not use the new time64 values of the macros, already
has its own overrides, so this commit does not affect it.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/bits/socket.h5
-rw-r--r--arch/i386/bits/socket.h5
-rw-r--r--arch/m68k/bits/socket.h5
-rw-r--r--arch/microblaze/bits/socket.h5
-rw-r--r--arch/mips/bits/socket.h5
-rw-r--r--arch/mipsn32/bits/socket.h5
-rw-r--r--arch/or1k/bits/socket.h5
-rw-r--r--arch/powerpc/bits/socket.h5
-rw-r--r--arch/sh/bits/socket.h5
9 files changed, 0 insertions, 45 deletions
diff --git a/arch/arm/bits/socket.h b/arch/arm/bits/socket.h
deleted file mode 100644
index 4d1f645b..00000000
--- a/arch/arm/bits/socket.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67
diff --git a/arch/i386/bits/socket.h b/arch/i386/bits/socket.h
deleted file mode 100644
index 4d1f645b..00000000
--- a/arch/i386/bits/socket.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67
diff --git a/arch/m68k/bits/socket.h b/arch/m68k/bits/socket.h
deleted file mode 100644
index 4d1f645b..00000000
--- a/arch/m68k/bits/socket.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67
diff --git a/arch/microblaze/bits/socket.h b/arch/microblaze/bits/socket.h
deleted file mode 100644
index 4d1f645b..00000000
--- a/arch/microblaze/bits/socket.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67
diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h
index 4ffc4d4a..02fbb88b 100644
--- a/arch/mips/bits/socket.h
+++ b/arch/mips/bits/socket.h
@@ -21,11 +21,6 @@
 #define SO_ACCEPTCONN   0x1009
 #define SO_PROTOCOL     0x1028
 #define SO_DOMAIN       0x1029
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67
 
 #define SO_NO_CHECK     11
 #define SO_PRIORITY     12
diff --git a/arch/mipsn32/bits/socket.h b/arch/mipsn32/bits/socket.h
index 4ffc4d4a..02fbb88b 100644
--- a/arch/mipsn32/bits/socket.h
+++ b/arch/mipsn32/bits/socket.h
@@ -21,11 +21,6 @@
 #define SO_ACCEPTCONN   0x1009
 #define SO_PROTOCOL     0x1028
 #define SO_DOMAIN       0x1029
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67
 
 #define SO_NO_CHECK     11
 #define SO_PRIORITY     12
diff --git a/arch/or1k/bits/socket.h b/arch/or1k/bits/socket.h
deleted file mode 100644
index 4d1f645b..00000000
--- a/arch/or1k/bits/socket.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67
diff --git a/arch/powerpc/bits/socket.h b/arch/powerpc/bits/socket.h
index e5fa0f7a..b19ed42b 100644
--- a/arch/powerpc/bits/socket.h
+++ b/arch/powerpc/bits/socket.h
@@ -23,8 +23,3 @@
 #define SO_RCVBUFFORCE  33
 #define SO_PROTOCOL     38
 #define SO_DOMAIN       39
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67
diff --git a/arch/sh/bits/socket.h b/arch/sh/bits/socket.h
deleted file mode 100644
index 4d1f645b..00000000
--- a/arch/sh/bits/socket.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define SO_TIMESTAMP    63
-#define SO_TIMESTAMPNS  64
-#define SO_TIMESTAMPING 65
-#define SO_RCVTIMEO     66
-#define SO_SNDTIMEO     67