Merge "glibc: allow use of SO_REUSEPORT" am: 01ea25b951 am: bed46c9109 am: 394f3eb833
Original change: https://android-review.googlesource.com/c/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/+/1673806
Change-Id: I5dbad4c062e3bbcadf87e87b3313004992e213b1
diff --git a/sysroot-patches/glibc-2.17-enable-so-reuse-port.patch b/sysroot-patches/glibc-2.17-enable-so-reuse-port.patch
new file mode 100644
index 0000000..700c6a1
--- /dev/null
+++ b/sysroot-patches/glibc-2.17-enable-so-reuse-port.patch
@@ -0,0 +1,16 @@
+b/159148705 . All of our supported users have Linux 3.9+ at this point, so
+SO_REUSEPORT should be made available to anyone who wants to use it.
+
+diff --git a/sysroot/usr/include/asm-generic/socket.h b/sysroot/usr/include/asm-generic/socket.h
+index 2d32d07..316f06c 100644
+--- a/sysroot/usr/include/asm-generic/socket.h
++++ b/sysroot/usr/include/asm-generic/socket.h
+@@ -22,7 +22,7 @@
+ #define SO_PRIORITY 12
+ #define SO_LINGER 13
+ #define SO_BSDCOMPAT 14
+-/* To add :#define SO_REUSEPORT 15 */
++#define SO_REUSEPORT 15
+
+ #ifndef SO_PASSCRED /* powerpc only differs in these */
+ #define SO_PASSCRED 16
diff --git a/sysroot/usr/include/asm-generic/socket.h b/sysroot/usr/include/asm-generic/socket.h
index 2d32d07..316f06c 100644
--- a/sysroot/usr/include/asm-generic/socket.h
+++ b/sysroot/usr/include/asm-generic/socket.h
@@ -22,7 +22,7 @@
#define SO_PRIORITY 12
#define SO_LINGER 13
#define SO_BSDCOMPAT 14
-/* To add :#define SO_REUSEPORT 15 */
+#define SO_REUSEPORT 15
#ifndef SO_PASSCRED /* powerpc only differs in these */
#define SO_PASSCRED 16
