diff options
| author | George Burgess IV <gbiv@google.com> | 2021-04-15 17:46:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-15 17:46:32 +0000 |
| commit | 01ea25b951d8f0bfc14bfb6f671a8cf5893bd8bc (patch) | |
| tree | 72fab28769307d4c47d929b8b44554e817a14399 | |
| parent | dfb6e9559b7cd76a5d5f4c9c0822ce1de470a1ff (diff) | |
| parent | 50b8baff4f2fe509d5fcc87b02b27b85f6b2f3bb (diff) | |
| download | x86_64-linux-glibc2.17-4.8-01ea25b951d8f0bfc14bfb6f671a8cf5893bd8bc.tar.gz | |
Merge "glibc: allow use of SO_REUSEPORT"android-s-beta-2android-s-beta-1
| -rw-r--r-- | sysroot-patches/glibc-2.17-enable-so-reuse-port.patch | 16 | ||||
| -rw-r--r-- | sysroot/usr/include/asm-generic/socket.h | 2 |
2 files changed, 17 insertions, 1 deletions
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 |