The only things you left in the linux-specific file are about strings corresponding to the values that you moved to the sysdeps/i386 file. The string support should be where the bit values are.